Rename builder methods with to bind. Fix #260

Author: slinkydeveloper

examples/src/main/java/my/restate/sdk/examples/Counter.java

@@ -53,7 +53,7 @@ public CounterUpdateResult getAndAdd(ObjectContext ctx, Long request) {
   }
 
   public static void main(String[] args) {
-    RestateHttpEndpointBuilder.builder().with(new Counter()).buildAndListen();
+    RestateHttpEndpointBuilder.builder().bind(new Counter()).buildAndListen();
   }
 
   public static class CounterUpdateResult {

examples/src/main/java/my/restate/sdk/examples/LambdaHandler.java

@@ -22,9 +22,9 @@ public void register(RestateLambdaEndpointBuilder builder) {
                 System.getenv("LAMBDA_FACTORY_SERVICE_CLASS"), Counter.class.getCanonicalName())
             .split(Pattern.quote(","))) {
       if (Counter.class.getCanonicalName().equals(serviceClass)) {
-        builder.with(new Counter());
+        builder.bind(new Counter());
       } else if (CounterKt.class.getCanonicalName().equals(serviceClass)) {
-        builder.with(new CounterKt());
+        builder.bind(new CounterKt());
       } else {
         throw new IllegalArgumentException(
             "Bad \"LAMBDA_FACTORY_SERVICE_CLASS\" env: " + serviceClass);

examples/src/main/java/my/restate/sdk/examples/LoanWorkflow.java

@@ -153,8 +153,8 @@ public void rejectLoan(WorkflowSharedContext ctx) {
 
   public static void main(String[] args) {
     RestateHttpEndpointBuilder.builder()
-        .with(new LoanWorkflow())
-        .with(new MockBank())
+        .bind(new LoanWorkflow())
+        .bind(new MockBank())
         .buildAndListen();
 
     // Register the service in the meantime!

examples/src/main/kotlin/my/restate/sdk/examples/CounterKt.kt

@@ -52,5 +52,5 @@ class CounterKt {
 }
 
 fun main() {
-  RestateHttpEndpointBuilder.builder().with(CounterKt()).buildAndListen()
+  RestateHttpEndpointBuilder.builder().bind(CounterKt()).buildAndListen()
 }

sdk-core/src/main/java/dev/restate/sdk/core/RestateEndpoint.java

@@ -123,7 +123,7 @@ public Builder(DeploymentManifestSchema.ProtocolMode protocolMode) {
       this.protocolMode = protocolMode;
     }
 
-    public <O> Builder with(ComponentDefinition<O> component, O options) {
+    public <O> Builder bind(ComponentDefinition<O> component, O options) {
       this.components.add(new ComponentAndOptions<>(component, options));
       return this;
     }

sdk-core/src/test/java/dev/restate/sdk/core/MockMultiThreaded.java

@@ -48,7 +48,7 @@ public void executeTest(TestDefinitions.TestDefinition definition) {
     // Prepare server
     RestateEndpoint.Builder builder =
         RestateEndpoint.newBuilder(DeploymentManifestSchema.ProtocolMode.BIDI_STREAM)
-            .with(componentDefinition.get(0), bindableComponent.options());
+            .bind(componentDefinition.get(0), bindableComponent.options());
     RestateEndpoint server = builder.build();
 
     // Start invocation

sdk-core/src/test/java/dev/restate/sdk/core/MockSingleThread.java

@@ -46,7 +46,7 @@ public void executeTest(TestDefinition definition) {
     // Prepare server
     RestateEndpoint.Builder builder =
         RestateEndpoint.newBuilder(DeploymentManifestSchema.ProtocolMode.BIDI_STREAM)
-            .with(componentDefinition.get(0), bindableComponent.options());
+            .bind(componentDefinition.get(0), bindableComponent.options());
     RestateEndpoint server = builder.build();
 
     // Start invocation

sdk-http-vertx/src/main/java/dev/restate/sdk/http/vertx/RestateHttpEndpointBuilder.java

@@ -31,7 +31,7 @@
  * <pre>
  * public static void main(String[] args) {
  *   RestateHttpEndpointBuilder.builder()
- *           .with(new Counter())
+ *           .bind(new Counter())
  *           .buildAndListen();
  * }
  * </pre>
@@ -73,31 +73,31 @@ public RestateHttpEndpointBuilder withOptions(HttpServerOptions options) {
    * based on the class name.
    *
    * <p>You can also manually instantiate the {@link BindableComponent} using {@link
-   * #with(BindableComponent)}.
+   * #bind(BindableComponent)}.
    */
-  public RestateHttpEndpointBuilder with(Object component) {
-    return this.with(RestateEndpoint.discoverBindableComponentFactory(component).create(component));
+  public RestateHttpEndpointBuilder bind(Object component) {
+    return this.bind(RestateEndpoint.discoverBindableComponentFactory(component).create(component));
   }
 
   /**
    * Add a Restate bindable component to the endpoint.
    *
-   * <p>To override the options, use {@link #with(BindableComponent, Object)}.
+   * <p>To override the options, use {@link #bind(BindableComponent, Object)}.
    */
-  public RestateHttpEndpointBuilder with(BindableComponent<?> component) {
+  public RestateHttpEndpointBuilder bind(BindableComponent<?> component) {
     for (ComponentDefinition<?> componentDefinition : component.definitions()) {
       //noinspection unchecked
-      this.endpointBuilder.with(
+      this.endpointBuilder.bind(
           (ComponentDefinition<Object>) componentDefinition, component.options());
     }
 
     return this;
   }
 
   /** Add a Restate bindable component to the endpoint, overriding the options. */
-  public <O> RestateHttpEndpointBuilder with(BindableComponent<O> component, O options) {
+  public <O> RestateHttpEndpointBuilder bind(BindableComponent<O> component, O options) {
     for (ComponentDefinition<O> componentDefinition : component.definitions()) {
-      this.endpointBuilder.with(componentDefinition, options);
+      this.endpointBuilder.bind(componentDefinition, options);
     }
 
     return this;

sdk-http-vertx/src/test/kotlin/dev/restate/sdk/http/vertx/HttpVertxTestExecutor.kt

@@ -41,7 +41,7 @@ class HttpVertxTestExecutor(private val vertx: Vertx) : TestExecutor {
       val server =
           RestateHttpEndpointBuilder.builder(vertx)
               .withOptions(HttpServerOptions().setPort(0))
-              .with(definition.component)
+              .bind(definition.component)
               .build()
       server.listen().coAwait()
 

sdk-http-vertx/src/test/kotlin/dev/restate/sdk/http/vertx/RestateHttpEndpointTest.kt

@@ -50,12 +50,12 @@ internal class RestateHttpEndpointTest {
   @Timeout(value = 1, timeUnit = TimeUnit.SECONDS)
   @Test
   fun endpointWithNonBlockingService(vertx: Vertx): Unit =
-      greetTest(vertx, "KtGreeter") { it.with(greeter()) }
+      greetTest(vertx, "KtGreeter") { it.bind(greeter()) }
 
   @Timeout(value = 1, timeUnit = TimeUnit.SECONDS)
   @Test
   fun endpointWithBlockingService(vertx: Vertx): Unit =
-      greetTest(vertx, BlockingGreeter::class.simpleName!!) { it.with(BlockingGreeter()) }
+      greetTest(vertx, BlockingGreeter::class.simpleName!!) { it.bind(BlockingGreeter()) }
 
   private fun greetTest(
       vertx: Vertx,
@@ -153,7 +153,7 @@ internal class RestateHttpEndpointTest {
       runBlocking(vertx.dispatcher()) {
         val endpointPort: Int =
             RestateHttpEndpointBuilder.builder(vertx)
-                .with(BlockingGreeter())
+                .bind(BlockingGreeter())
                 .withOptions(HttpServerOptions().setPort(0))
                 .build()
                 .listen()
@@ -188,7 +188,7 @@ internal class RestateHttpEndpointTest {
       runBlocking(vertx.dispatcher()) {
         val endpointPort: Int =
             RestateHttpEndpointBuilder.builder(vertx)
-                .with(BlockingGreeter())
+                .bind(BlockingGreeter())
                 .withOptions(HttpServerOptions().setPort(0))
                 .build()
                 .listen()