From c24f60f1dfa92573d5f821fc79c585e7082cca4e Mon Sep 17 00:00:00 2001 From: slinkydeveloper Date: Fri, 31 May 2024 19:18:00 +0200 Subject: [PATCH] Rename the ingress client and the connect method --- .../my/restate/sdk/examples/LoanWorkflow.java | 2 +- .../src/main/resources/templates/Client.hbs | 30 +++++++++---------- .../java/dev/restate/sdk/CodegenTest.java | 6 ++-- .../src/main/resources/templates/Client.hbs | 20 ++++++------- .../dev/restate/sdk/kotlin/CodegenTest.kt | 6 ++-- .../kotlin/dev/restate/sdk/kotlin/ingress.kt | 18 +++++------ .../{IngressClient.java => Client.java} | 10 +++---- ...tIngressClient.java => DefaultClient.java} | 9 ++++-- .../sdk/testing/BaseRestateRunner.java | 14 ++++----- ...eIngressClient.java => RestateClient.java} | 5 ++-- .../restate/sdk/testing/RestateRunner.java | 4 +-- .../dev/restate/sdk/testing/CounterTest.java | 6 ++-- 12 files changed, 68 insertions(+), 62 deletions(-) rename sdk-common/src/main/java/dev/restate/sdk/client/{IngressClient.java => Client.java} (96%) rename sdk-common/src/main/java/dev/restate/sdk/client/{DefaultIngressClient.java => DefaultClient.java} (98%) rename sdk-testing/src/main/java/dev/restate/sdk/testing/{RestateIngressClient.java => RestateClient.java} (80%) diff --git a/examples/src/main/java/my/restate/sdk/examples/LoanWorkflow.java b/examples/src/main/java/my/restate/sdk/examples/LoanWorkflow.java index 6665d24f..5a15778a 100644 --- a/examples/src/main/java/my/restate/sdk/examples/LoanWorkflow.java +++ b/examples/src/main/java/my/restate/sdk/examples/LoanWorkflow.java @@ -176,7 +176,7 @@ public static void main(String[] args) { // To invoke the workflow: LoanWorkflowClient.IngressClient client = - LoanWorkflowClient.fromIngress("http://127.0.0.1:8080", "my-loan"); + LoanWorkflowClient.connect("http://127.0.0.1:8080", "my-loan"); var state = client.submit( diff --git a/sdk-api-gen/src/main/resources/templates/Client.hbs b/sdk-api-gen/src/main/resources/templates/Client.hbs index 24c345f1..c57063ff 100644 --- a/sdk-api-gen/src/main/resources/templates/Client.hbs +++ b/sdk-api-gen/src/main/resources/templates/Client.hbs @@ -14,12 +14,12 @@ public class {{generatedClassSimpleName}} { return new ContextClient(ctx{{#isKeyed}}, key{{/isKeyed}}); } - public static IngressClient fromIngress(dev.restate.sdk.client.IngressClient ingressClient{{#isKeyed}}, String key{{/isKeyed}}) { - return new IngressClient(ingressClient{{#isKeyed}}, key{{/isKeyed}}); + public static IngressClient fromClient(dev.restate.sdk.client.Client client{{#isKeyed}}, String key{{/isKeyed}}) { + return new IngressClient(client{{#isKeyed}}, key{{/isKeyed}}); } - public static IngressClient fromIngress(String baseUri{{#isKeyed}}, String key{{/isKeyed}}) { - return new IngressClient(dev.restate.sdk.client.IngressClient.defaultClient(baseUri){{#isKeyed}}, key{{/isKeyed}}); + public static IngressClient connect(String baseUri{{#isKeyed}}, String key{{/isKeyed}}) { + return new IngressClient(dev.restate.sdk.client.Client.connect(baseUri){{#isKeyed}}, key{{/isKeyed}}); } public static class ContextClient { @@ -70,17 +70,17 @@ public class {{generatedClassSimpleName}} { public static class IngressClient { - private final dev.restate.sdk.client.IngressClient ingressClient; + private final dev.restate.sdk.client.Client client; {{#isKeyed}}private final String key;{{/isKeyed}} - public IngressClient(dev.restate.sdk.client.IngressClient ingressClient{{#isKeyed}}, String key{{/isKeyed}}) { - this.ingressClient = ingressClient; + public IngressClient(dev.restate.sdk.client.Client client{{#isKeyed}}, String key{{/isKeyed}}) { + this.client = client; {{#isKeyed}}this.key = key;{{/isKeyed}} } {{#handlers}}{{#if isWorkflow}} - public dev.restate.sdk.client.IngressClient.WorkflowHandle<{{{boxedOutputFqcn}}}> workflowHandle() { - return IngressClient.this.ingressClient.workflowHandle( + public dev.restate.sdk.client.Client.WorkflowHandle<{{{boxedOutputFqcn}}}> workflowHandle() { + return IngressClient.this.client.workflowHandle( {{generatedClassSimpleNamePrefix}}Definitions.SERVICE_NAME, this.key, {{outputSerdeRef}}); @@ -93,7 +93,7 @@ public class {{generatedClassSimpleName}} { } public dev.restate.sdk.client.SendResponse submit({{^inputEmpty}}{{{inputFqcn}}} req, {{/inputEmpty}}dev.restate.sdk.client.RequestOptions requestOptions) { - return IngressClient.this.ingressClient.send( + return IngressClient.this.client.send( {{{targetExpr this "this.key"}}}, {{inputSerdeRef}}, {{#if inputEmpty}}null{{else}}req{{/if}}, @@ -108,7 +108,7 @@ public class {{generatedClassSimpleName}} { } public java.util.concurrent.CompletableFuture submitAsync({{^inputEmpty}}{{{inputFqcn}}} req, {{/inputEmpty}}dev.restate.sdk.client.RequestOptions requestOptions) { - return IngressClient.this.ingressClient.sendAsync( + return IngressClient.this.client.sendAsync( {{{targetExpr this "this.key"}}}, {{inputSerdeRef}}, {{#if inputEmpty}}null{{else}}req{{/if}}, @@ -123,7 +123,7 @@ public class {{generatedClassSimpleName}} { } public {{#if outputEmpty}}void{{else}}{{{outputFqcn}}}{{/if}} {{methodName}}({{^inputEmpty}}{{{inputFqcn}}} req, {{/inputEmpty}}dev.restate.sdk.client.CallRequestOptions requestOptions) { - {{^outputEmpty}}return {{/outputEmpty}}this.ingressClient.call( + {{^outputEmpty}}return {{/outputEmpty}}this.client.call( {{{targetExpr this "this.key"}}}, {{inputSerdeRef}}, {{outputSerdeRef}}, @@ -138,7 +138,7 @@ public class {{generatedClassSimpleName}} { } public {{#if outputEmpty}}java.util.concurrent.CompletableFuture{{else}}java.util.concurrent.CompletableFuture<{{{boxedOutputFqcn}}}>{{/if}} {{methodName}}Async({{^inputEmpty}}{{{inputFqcn}}} req, {{/inputEmpty}}dev.restate.sdk.client.CallRequestOptions requestOptions) { - return this.ingressClient.callAsync( + return this.client.callAsync( {{{targetExpr this "this.key"}}}, {{inputSerdeRef}}, {{outputSerdeRef}}, @@ -170,7 +170,7 @@ public class {{generatedClassSimpleName}} { } public dev.restate.sdk.client.SendResponse {{methodName}}({{^inputEmpty}}{{{inputFqcn}}} req, {{/inputEmpty}}dev.restate.sdk.client.CallRequestOptions requestOptions) { - return IngressClient.this.ingressClient.send( + return IngressClient.this.client.send( {{{targetExpr this "IngressClient.this.key"}}}, {{inputSerdeRef}}, {{#if inputEmpty}}null{{else}}req{{/if}}, @@ -185,7 +185,7 @@ public class {{generatedClassSimpleName}} { } public java.util.concurrent.CompletableFuture {{methodName}}Async({{^inputEmpty}}{{{inputFqcn}}} req, {{/inputEmpty}}dev.restate.sdk.client.CallRequestOptions requestOptions) { - return IngressClient.this.ingressClient.sendAsync( + return IngressClient.this.client.sendAsync( {{{targetExpr this "IngressClient.this.key"}}}, {{inputSerdeRef}}, {{#if inputEmpty}}null{{else}}req{{/if}}, diff --git a/sdk-api-gen/src/test/java/dev/restate/sdk/CodegenTest.java b/sdk-api-gen/src/test/java/dev/restate/sdk/CodegenTest.java index 8946418b..ee4123d7 100644 --- a/sdk-api-gen/src/test/java/dev/restate/sdk/CodegenTest.java +++ b/sdk-api-gen/src/test/java/dev/restate/sdk/CodegenTest.java @@ -118,9 +118,9 @@ public String run(WorkflowContext context, String request) { public String submit(SharedWorkflowContext context, String request) { // Just needs to compile String ignored = - CodegenTestWorkflowCornerCasesClient.fromIngress("invalid", request)._submit("my_send"); - CodegenTestWorkflowCornerCasesClient.fromIngress("invalid", request).submit("my_send"); - return CodegenTestWorkflowCornerCasesClient.fromIngress("invalid", request) + CodegenTestWorkflowCornerCasesClient.connect("invalid", request)._submit("my_send"); + CodegenTestWorkflowCornerCasesClient.connect("invalid", request).submit("my_send"); + return CodegenTestWorkflowCornerCasesClient.connect("invalid", request) .workflowHandle() .getOutput(); } diff --git a/sdk-api-kotlin-gen/src/main/resources/templates/Client.hbs b/sdk-api-kotlin-gen/src/main/resources/templates/Client.hbs index c0ae7dcd..bfc88977 100644 --- a/sdk-api-kotlin-gen/src/main/resources/templates/Client.hbs +++ b/sdk-api-kotlin-gen/src/main/resources/templates/Client.hbs @@ -15,12 +15,12 @@ object {{generatedClassSimpleName}} { return ContextClient(ctx{{#isKeyed}}, key{{/isKeyed}}) } - fun fromIngress(ingressClient: dev.restate.sdk.client.IngressClient{{#isKeyed}}, key: String{{/isKeyed}}): IngressClient { - return IngressClient(ingressClient{{#isKeyed}}, key{{/isKeyed}}); + fun fromClient(client: dev.restate.sdk.client.Client{{#isKeyed}}, key: String{{/isKeyed}}): IngressClient { + return IngressClient(client{{#isKeyed}}, key{{/isKeyed}}); } - fun fromIngress(baseUri: String{{#isKeyed}}, key: String{{/isKeyed}}): IngressClient { - return IngressClient(dev.restate.sdk.client.IngressClient.defaultClient(baseUri){{#isKeyed}}, key{{/isKeyed}}); + fun connect(baseUri: String{{#isKeyed}}, key: String{{/isKeyed}}): IngressClient { + return IngressClient(dev.restate.sdk.client.Client.connect(baseUri){{#isKeyed}}, key{{/isKeyed}}); } class ContextClient(private val ctx: Context{{#isKeyed}}, private val key: String{{/isKeyed}}){ @@ -49,18 +49,18 @@ object {{generatedClassSimpleName}} { } } - class IngressClient(private val ingressClient: dev.restate.sdk.client.IngressClient{{#isKeyed}}, private val key: String{{/isKeyed}}) { + class IngressClient(private val client: dev.restate.sdk.client.Client{{#isKeyed}}, private val key: String{{/isKeyed}}) { {{#handlers}}{{#if isWorkflow}} - fun workflowHandle(): dev.restate.sdk.client.IngressClient.WorkflowHandle<{{{boxedOutputFqcn}}}> { - return this@IngressClient.ingressClient.workflowHandle( + fun workflowHandle(): dev.restate.sdk.client.Client.WorkflowHandle<{{{boxedOutputFqcn}}}> { + return this@IngressClient.client.workflowHandle( {{generatedClassSimpleNamePrefix}}Definitions.SERVICE_NAME, this.key, {{outputSerdeRef}}); } suspend fun submit({{^inputEmpty}}req: {{{inputFqcn}}}, {{/inputEmpty}}requestOptions: dev.restate.sdk.client.RequestOptions = dev.restate.sdk.client.RequestOptions.DEFAULT): dev.restate.sdk.client.SendResponse { - return this@IngressClient.ingressClient.sendSuspend( + return this@IngressClient.client.sendSuspend( {{{targetExpr this "this.key"}}}, {{inputSerdeRef}}, {{#if inputEmpty}}Unit{{else}}req{{/if}}, @@ -69,7 +69,7 @@ object {{generatedClassSimpleName}} { } {{else}} suspend fun {{methodName}}({{^inputEmpty}}req: {{{inputFqcn}}}, {{/inputEmpty}}requestOptions: dev.restate.sdk.client.CallRequestOptions = dev.restate.sdk.client.CallRequestOptions.DEFAULT): {{{boxedOutputFqcn}}} { - return this@IngressClient.ingressClient.callSuspend( + return this@IngressClient.client.callSuspend( {{{targetExpr this "this.key"}}}, {{inputSerdeRef}}, {{outputSerdeRef}}, @@ -85,7 +85,7 @@ object {{generatedClassSimpleName}} { inner class Send(private val delay: Duration) { {{#handlers}}{{^isWorkflow}} suspend fun {{methodName}}({{^inputEmpty}}req: {{{inputFqcn}}}, {{/inputEmpty}}requestOptions: dev.restate.sdk.client.CallRequestOptions = dev.restate.sdk.client.CallRequestOptions.DEFAULT): dev.restate.sdk.client.SendResponse { - return this@IngressClient.ingressClient.sendSuspend( + return this@IngressClient.client.sendSuspend( {{{targetExpr this "this@IngressClient.key"}}}, {{inputSerdeRef}}, {{#if inputEmpty}}Unit{{else}}req{{/if}}, diff --git a/sdk-api-kotlin-gen/src/test/kotlin/dev/restate/sdk/kotlin/CodegenTest.kt b/sdk-api-kotlin-gen/src/test/kotlin/dev/restate/sdk/kotlin/CodegenTest.kt index d83298ba..4ad5dc89 100644 --- a/sdk-api-kotlin-gen/src/test/kotlin/dev/restate/sdk/kotlin/CodegenTest.kt +++ b/sdk-api-kotlin-gen/src/test/kotlin/dev/restate/sdk/kotlin/CodegenTest.kt @@ -116,9 +116,9 @@ class CodegenTest : TestDefinitions.TestSuite { suspend fun submit(context: SharedWorkflowContext, request: String): String { // Just needs to compile val ignored: String = - CodegenTestWorkflowCornerCasesClient.fromIngress("invalid", request)._submit("my_send") - CodegenTestWorkflowCornerCasesClient.fromIngress("invalid", request).submit("my_send") - return CodegenTestWorkflowCornerCasesClient.fromIngress("invalid", request) + CodegenTestWorkflowCornerCasesClient.connect("invalid", request)._submit("my_send") + CodegenTestWorkflowCornerCasesClient.connect("invalid", request).submit("my_send") + return CodegenTestWorkflowCornerCasesClient.connect("invalid", request) .workflowHandle() .output } diff --git a/sdk-api-kotlin/src/main/kotlin/dev/restate/sdk/kotlin/ingress.kt b/sdk-api-kotlin/src/main/kotlin/dev/restate/sdk/kotlin/ingress.kt index 6f7d3175..86cfa758 100644 --- a/sdk-api-kotlin/src/main/kotlin/dev/restate/sdk/kotlin/ingress.kt +++ b/sdk-api-kotlin/src/main/kotlin/dev/restate/sdk/kotlin/ingress.kt @@ -8,7 +8,7 @@ // https://github.com/restatedev/sdk-java/blob/main/LICENSE package dev.restate.sdk.kotlin -import dev.restate.sdk.client.IngressClient +import dev.restate.sdk.client.Client import dev.restate.sdk.client.RequestOptions import dev.restate.sdk.client.SendResponse import dev.restate.sdk.common.Serde @@ -19,7 +19,7 @@ import kotlinx.coroutines.future.await // Extension methods for the IngressClient -suspend fun IngressClient.callSuspend( +suspend fun Client.callSuspend( target: Target, reqSerde: Serde, resSerde: Serde, @@ -29,7 +29,7 @@ suspend fun IngressClient.callSuspend( return this.callAsync(target, reqSerde, resSerde, req, options).await() } -suspend fun IngressClient.sendSuspend( +suspend fun Client.sendSuspend( target: Target, reqSerde: Serde, req: Req, @@ -39,7 +39,7 @@ suspend fun IngressClient.sendSuspend( return this.sendAsync(target, reqSerde, req, delay.toJavaDuration(), options).await() } -suspend fun IngressClient.AwakeableHandle.resolveSuspend( +suspend fun Client.AwakeableHandle.resolveSuspend( serde: Serde, payload: T, options: RequestOptions = RequestOptions.DEFAULT @@ -47,32 +47,32 @@ suspend fun IngressClient.AwakeableHandle.resolveSuspend( this.resolveAsync(serde, payload, options).await() } -suspend fun IngressClient.AwakeableHandle.rejectSuspend( +suspend fun Client.AwakeableHandle.rejectSuspend( reason: String, options: RequestOptions = RequestOptions.DEFAULT ) { this.rejectAsync(reason, options).await() } -suspend fun IngressClient.InvocationHandle.attachSuspend( +suspend fun Client.InvocationHandle.attachSuspend( options: RequestOptions = RequestOptions.DEFAULT ) { this.attachAsync(options).await() } -suspend fun IngressClient.InvocationHandle.getOutputSuspend( +suspend fun Client.InvocationHandle.getOutputSuspend( options: RequestOptions = RequestOptions.DEFAULT ) { this.getOutputAsync(options).await() } -suspend fun IngressClient.WorkflowHandle.attachSuspend( +suspend fun Client.WorkflowHandle.attachSuspend( options: RequestOptions = RequestOptions.DEFAULT ) { this.attachAsync(options).await() } -suspend fun IngressClient.WorkflowHandle.getOutputSuspend( +suspend fun Client.WorkflowHandle.getOutputSuspend( options: RequestOptions = RequestOptions.DEFAULT ) { this.getOutputAsync(options).await() diff --git a/sdk-common/src/main/java/dev/restate/sdk/client/IngressClient.java b/sdk-common/src/main/java/dev/restate/sdk/client/Client.java similarity index 96% rename from sdk-common/src/main/java/dev/restate/sdk/client/IngressClient.java rename to sdk-common/src/main/java/dev/restate/sdk/client/Client.java index e02e1e5e..d46f2858 100644 --- a/sdk-common/src/main/java/dev/restate/sdk/client/IngressClient.java +++ b/sdk-common/src/main/java/dev/restate/sdk/client/Client.java @@ -19,7 +19,7 @@ import org.jspecify.annotations.NonNull; import org.jspecify.annotations.Nullable; -public interface IngressClient { +public interface Client { CompletableFuture callAsync( Target target, Serde reqSerde, Serde resSerde, Req req, RequestOptions options); @@ -257,11 +257,11 @@ default Res getOutput() throws IngressException { } } - static IngressClient defaultClient(String baseUri) { - return defaultClient(baseUri, Collections.emptyMap()); + static Client connect(String baseUri) { + return connect(baseUri, Collections.emptyMap()); } - static IngressClient defaultClient(String baseUri, Map headers) { - return new DefaultIngressClient(HttpClient.newHttpClient(), baseUri, headers); + static Client connect(String baseUri, Map headers) { + return new DefaultClient(HttpClient.newHttpClient(), baseUri, headers); } } diff --git a/sdk-common/src/main/java/dev/restate/sdk/client/DefaultIngressClient.java b/sdk-common/src/main/java/dev/restate/sdk/client/DefaultClient.java similarity index 98% rename from sdk-common/src/main/java/dev/restate/sdk/client/DefaultIngressClient.java rename to sdk-common/src/main/java/dev/restate/sdk/client/DefaultClient.java index 33a92f3f..4729995b 100644 --- a/sdk-common/src/main/java/dev/restate/sdk/client/DefaultIngressClient.java +++ b/sdk-common/src/main/java/dev/restate/sdk/client/DefaultClient.java @@ -27,7 +27,7 @@ import java.util.concurrent.CompletableFuture; import org.jspecify.annotations.NonNull; -public class DefaultIngressClient implements IngressClient { +public class DefaultClient implements Client { private static final JsonFactory JSON_FACTORY = new JsonFactory(); @@ -35,7 +35,7 @@ public class DefaultIngressClient implements IngressClient { private final URI baseUri; private final Map headers; - public DefaultIngressClient(HttpClient httpClient, String baseUri, Map headers) { + DefaultClient(HttpClient httpClient, String baseUri, Map headers) { this.httpClient = httpClient; this.baseUri = URI.create(baseUri); this.headers = headers; @@ -475,4 +475,9 @@ private static Map findStringFieldsInJsonObject( return resultMap; } + + public static DefaultClient of( + HttpClient httpClient, String baseUri, Map headers) { + return new DefaultClient(httpClient, baseUri, headers); + } } diff --git a/sdk-testing/src/main/java/dev/restate/sdk/testing/BaseRestateRunner.java b/sdk-testing/src/main/java/dev/restate/sdk/testing/BaseRestateRunner.java index c51d1dc3..1e1d2337 100644 --- a/sdk-testing/src/main/java/dev/restate/sdk/testing/BaseRestateRunner.java +++ b/sdk-testing/src/main/java/dev/restate/sdk/testing/BaseRestateRunner.java @@ -9,7 +9,7 @@ package dev.restate.sdk.testing; import dev.restate.admin.client.ApiClient; -import dev.restate.sdk.client.IngressClient; +import dev.restate.sdk.client.Client; import java.net.URL; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ExtensionContext.Namespace; @@ -28,8 +28,8 @@ public boolean supportsParameter( throws ParameterResolutionException { return (parameterContext.isAnnotated(RestateAdminClient.class) && ApiClient.class.isAssignableFrom(parameterContext.getParameter().getType())) - || (parameterContext.isAnnotated(RestateIngressClient.class) - && IngressClient.class.isAssignableFrom(parameterContext.getParameter().getType())) + || (parameterContext.isAnnotated(RestateClient.class) + && Client.class.isAssignableFrom(parameterContext.getParameter().getType())) || (parameterContext.isAnnotated(RestateURL.class) && (String.class.isAssignableFrom(parameterContext.getParameter().getType()) || URL.class.isAssignableFrom(parameterContext.getParameter().getType()))); @@ -41,8 +41,8 @@ public Object resolveParameter( throws ParameterResolutionException { if (parameterContext.isAnnotated(RestateAdminClient.class)) { return getDeployer(extensionContext).getAdminClient(); - } else if (parameterContext.isAnnotated(RestateIngressClient.class)) { - return resolveIngressClient(extensionContext); + } else if (parameterContext.isAnnotated(RestateClient.class)) { + return resolveClient(extensionContext); } else if (parameterContext.isAnnotated(RestateURL.class)) { URL url = getDeployer(extensionContext).getIngressUrl(); if (parameterContext.getParameter().getType().equals(String.class)) { @@ -53,9 +53,9 @@ public Object resolveParameter( throw new ParameterResolutionException("The parameter is not supported"); } - private IngressClient resolveIngressClient(ExtensionContext extensionContext) { + private Client resolveClient(ExtensionContext extensionContext) { URL url = getDeployer(extensionContext).getIngressUrl(); - return IngressClient.defaultClient(url.toString()); + return Client.connect(url.toString()); } private ManualRestateRunner getDeployer(ExtensionContext extensionContext) { diff --git a/sdk-testing/src/main/java/dev/restate/sdk/testing/RestateIngressClient.java b/sdk-testing/src/main/java/dev/restate/sdk/testing/RestateClient.java similarity index 80% rename from sdk-testing/src/main/java/dev/restate/sdk/testing/RestateIngressClient.java rename to sdk-testing/src/main/java/dev/restate/sdk/testing/RestateClient.java index 3d16bbd6..806f6895 100644 --- a/sdk-testing/src/main/java/dev/restate/sdk/testing/RestateIngressClient.java +++ b/sdk-testing/src/main/java/dev/restate/sdk/testing/RestateClient.java @@ -8,12 +8,13 @@ // https://github.com/restatedev/sdk-java/blob/main/LICENSE package dev.restate.sdk.testing; +import dev.restate.sdk.client.Client; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** Inject a {@link dev.restate.sdk.client.IngressClient} to interact with the deployed runtime. */ +/** Inject a {@link Client} to interact with the deployed runtime. */ @Target(value = ElementType.PARAMETER) @Retention(RetentionPolicy.RUNTIME) -public @interface RestateIngressClient {} +public @interface RestateClient {} diff --git a/sdk-testing/src/main/java/dev/restate/sdk/testing/RestateRunner.java b/sdk-testing/src/main/java/dev/restate/sdk/testing/RestateRunner.java index 588191ac..10f7c3c3 100644 --- a/sdk-testing/src/main/java/dev/restate/sdk/testing/RestateRunner.java +++ b/sdk-testing/src/main/java/dev/restate/sdk/testing/RestateRunner.java @@ -27,8 +27,8 @@ *

This extension is scoped per test class, meaning that the restate runner will be shared among * test methods. * - *

Use the annotations {@link RestateIngressClient}, {@link RestateURL} and {@link - * RestateAdminClient} to interact with the deployed runtime: + *

Use the annotations {@link RestateClient}, {@link RestateURL} and {@link RestateAdminClient} + * to interact with the deployed runtime: * * 

{@code
  * {@literal @}Test
diff --git a/sdk-testing/src/test/java/dev/restate/sdk/testing/CounterTest.java b/sdk-testing/src/test/java/dev/restate/sdk/testing/CounterTest.java
index d5cd1fa8..4ba4e058 100644
--- a/sdk-testing/src/test/java/dev/restate/sdk/testing/CounterTest.java
+++ b/sdk-testing/src/test/java/dev/restate/sdk/testing/CounterTest.java
@@ -10,7 +10,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import dev.restate.sdk.client.IngressClient;
+import dev.restate.sdk.client.Client;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -27,8 +27,8 @@ class CounterTest {
 
   @Test
   @Timeout(value = 10)
-  void testGreet(@RestateIngressClient IngressClient ingressClient) {
-    var client = CounterClient.fromIngress(ingressClient, "my-counter");
+  void testGreet(@RestateClient Client ingressClient) {
+    var client = CounterClient.fromClient(ingressClient, "my-counter");
     long response = client.get();
 
     assertThat(response).isEqualTo(0L);