From 7cf5f8b354ac82164a5c9746d993652f731e68cd Mon Sep 17 00:00:00 2001 From: Artur Souza Date: Thu, 30 Apr 2020 16:50:13 -0700 Subject: [PATCH] Update for proto from dapr runtime version 0.7 (#273) --- .github/workflows/build.yml | 12 +- .gitignore | 1 + .../invoke/grpc/HelloWorldService.java | 12 +- .../io/dapr/examples/invoke/grpc/README.md | 4 +- pom.xml | 3 +- sdk-autogen/pom.xml | 31 ++- .../src/test/java/io/dapr/it/DaprRun.java | 20 +- .../it/binding/http/InputBindingService.java | 2 +- .../http/MethodInvokeService.java | 2 +- .../it/pubsub/http/SubscriberService.java | 2 +- .../io/dapr/it/state/HelloWorldClientIT.java | 4 +- .../it/state/HelloWorldGrpcStateService.java | 8 +- .../io/dapr/client/DaprClientBuilder.java | 2 +- .../java/io/dapr/client/DaprClientGrpc.java | 48 ++-- .../io/dapr/client/DaprClientGrpcTest.java | 241 +++++++++--------- 15 files changed, 224 insertions(+), 168 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ebd9124d..3bd6b6bc6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,10 +22,10 @@ jobs: GOARCH: amd64 GOPROXY: https://proxy.golang.org JDK_VER: 13.0.x - DAPR_RUNTIME_VER: 0.4.0-rc.1 + DAPR_RUNTIME_VER: 0.6.0 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/f84566fb2bf5a599252ab9d6bd82fc78faf94dba/install/install.sh - DAPR_CLI_REF: 60fd705fcd47cd50135162ea70a567234414d7db - DAPR_REF: 643fcda6b7694e0e73b52c59f538598a8b3b3830 + DAPR_CLI_REF: 2e607cb6de0bd69770b244020eecd668fcded19b + DAPR_REF: 7d6e111a181d9d3fdd7537e5c7f6c02764064846 OSSRH_USER_TOKEN: ${{ secrets.OSSRH_USER_TOKEN }} OSSRH_PWD_TOKEN: ${{ secrets.OSSRH_PWD_TOKEN }} GPG_KEY: ${{ secrets.GPG_KEY }} @@ -76,6 +76,12 @@ jobs: make sudo cp dist/linux_amd64/release/daprd /usr/local/bin/daprd cd .. + - name: Override placement service. + if: env.DAPR_REF != '' + run: | + docker stop dapr_placement + cd dapr + ./dist/linux_amd64/release/placement & - name: Install Local kafka using docker-compose run: | docker-compose -f ./sdk-tests/deploy/local-test-kafka.yml up -d diff --git a/.gitignore b/.gitignore index d39d713b8..e44d2c1ab 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,7 @@ hs_err_pid* **/components/redis_messagebus.yaml **/components/statestore.yaml **/components/messagebus.yaml +**/components/pubsub.yaml /docs/dapr-sdk-actors /docs/dapr-sdk-autogen /docs/dapr-sdk diff --git a/examples/src/main/java/io/dapr/examples/invoke/grpc/HelloWorldService.java b/examples/src/main/java/io/dapr/examples/invoke/grpc/HelloWorldService.java index fe79731ec..92c8a206f 100644 --- a/examples/src/main/java/io/dapr/examples/invoke/grpc/HelloWorldService.java +++ b/examples/src/main/java/io/dapr/examples/invoke/grpc/HelloWorldService.java @@ -6,8 +6,9 @@ package io.dapr.examples.invoke.grpc; import com.google.protobuf.Any; -import io.dapr.DaprClientGrpc; -import io.dapr.DaprClientProtos; +import io.dapr.v1.CommonProtos; +import io.dapr.v1.DaprClientGrpc; +import io.dapr.v1.DaprClientProtos; import io.grpc.Server; import io.grpc.ServerBuilder; import io.grpc.stub.StreamObserver; @@ -95,13 +96,16 @@ public class HelloWorldService { * @param responseObserver Dapr envelope response. */ @Override - public void onInvoke(DaprClientProtos.InvokeEnvelope request, StreamObserver responseObserver) { + public void onInvoke(CommonProtos.InvokeRequest request, + StreamObserver responseObserver) { try { if ("say".equals(request.getMethod())) { SayRequest sayRequest = SayRequest.newBuilder().setMessage(request.getData().getValue().toStringUtf8()).build(); SayResponse sayResponse = this.say(sayRequest); - responseObserver.onNext(Any.pack(sayResponse)); + CommonProtos.InvokeResponse.Builder responseBuilder = CommonProtos.InvokeResponse.newBuilder(); + responseBuilder.setData(Any.pack(sayResponse)); + responseObserver.onNext(responseBuilder.build()); } } finally { responseObserver.onCompleted(); diff --git a/examples/src/main/java/io/dapr/examples/invoke/grpc/README.md b/examples/src/main/java/io/dapr/examples/invoke/grpc/README.md index e4174b08b..1f57e2e57 100644 --- a/examples/src/main/java/io/dapr/examples/invoke/grpc/README.md +++ b/examples/src/main/java/io/dapr/examples/invoke/grpc/README.md @@ -53,7 +53,9 @@ private static class GrpcHelloWorldDaprService extends DaprClientGrpc.DaprClient SayRequest sayRequest = SayRequest.newBuilder().setMessage(request.getData().getValue().toStringUtf8()).build(); SayResponse sayResponse = this.say(sayRequest); - responseObserver.onNext(Any.pack(sayResponse)); + CommonProtos.InvokeResponse.Builder responseBuilder = CommonProtos.InvokeResponse.newBuilder(); + responseBuilder.setData(Any.pack(sayResponse)); + responseObserver.onNext(responseBuilder.build()); } } finally { responseObserver.onCompleted(); diff --git a/pom.xml b/pom.xml index 98764e7c2..94f12b00d 100644 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,7 @@ 1.25.0 3.11.0 3.10.0 - https://raw.githubusercontent.com/dapr/dapr/3b792de734594463f6a16ce8c952fe2ed96c0dc0/pkg/proto/dapr/dapr.proto - https://raw.githubusercontent.com/dapr/dapr/3b792de734594463f6a16ce8c952fe2ed96c0dc0/pkg/proto/daprclient/daprclient.proto + https://raw.githubusercontent.com/dapr/dapr/89aab21ee86d2f65066bbe530809ee73ac75e921/dapr/proto 1.6.2 3.1.1 1.8 diff --git a/sdk-autogen/pom.xml b/sdk-autogen/pom.xml index f9bb65796..7f162d74e 100644 --- a/sdk-autogen/pom.xml +++ b/sdk-autogen/pom.xml @@ -52,6 +52,11 @@ protoc-jar-maven-plugin 3.10.1 + + io.grpc + grpc-stub + 1.25.0 + @@ -61,6 +66,20 @@ download-maven-plugin 1.3.0 + + getCommonProto + + initialize + + wget + + + ${dapr.proto.baseurl}/common/v1/common.proto + common.proto + + ${protobuf.input.directory}/dapr/proto/common/v1 + + getDaprProto @@ -69,10 +88,10 @@ wget - ${dapr.proto.url} + ${dapr.proto.baseurl}/dapr/v1/dapr.proto dapr.proto - ${protobuf.input.directory}/dapr + ${protobuf.input.directory} @@ -83,10 +102,10 @@ wget - ${dapr.client.proto.url} + ${dapr.proto.baseurl}/daprclient/v1/daprclient.proto daprclient.proto - ${protobuf.input.directory}/daprclient + ${protobuf.input.directory} @@ -107,8 +126,8 @@ direct true - ${protobuf.input.directory}/dapr - ${protobuf.input.directory}/daprclient + ${protobuf.input.directory}/dapr/proto/common/v1 + ${protobuf.input.directory} diff --git a/sdk-tests/src/test/java/io/dapr/it/DaprRun.java b/sdk-tests/src/test/java/io/dapr/it/DaprRun.java index 818f0e002..41b71c17c 100644 --- a/sdk-tests/src/test/java/io/dapr/it/DaprRun.java +++ b/sdk-tests/src/test/java/io/dapr/it/DaprRun.java @@ -58,15 +58,27 @@ public class DaprRun { long start = System.currentTimeMillis(); // First, try to stop previous run (if left running). this.stop(); - // Wait for some time in case the previous run did not kill the process on time. - Thread.sleep(10000); + // Wait for the previous run to kill the prior process. + long timeLeft = this.maxWaitMilliseconds - (System.currentTimeMillis() - start); + callWithRetry(() -> { + System.out.println("Checking if previous run for Dapr application has stopped ..."); + try { + this.listCommand.run(); + throw new RuntimeException("Previous run for app has not stopped yet!"); + } catch (IllegalStateException e) { + // Success because we the list command did not find the app id. + } catch (Exception e) { + throw new RuntimeException(e); + } + }, timeLeft); + System.out.println("Starting dapr application ..."); this.startCommand.run(); this.started.set(true); - long timeLeft = this.maxWaitMilliseconds - (System.currentTimeMillis() - start); + timeLeft = this.maxWaitMilliseconds - (System.currentTimeMillis() - start); callWithRetry(() -> { - System.out.println("Checking if Dapr is listening on HTTP port ..."); + System.out.println("Checking if Dapr application has started ..."); try { this.listCommand.run(); } catch (Exception e) { diff --git a/sdk-tests/src/test/java/io/dapr/it/binding/http/InputBindingService.java b/sdk-tests/src/test/java/io/dapr/it/binding/http/InputBindingService.java index 7f1e55775..8e26678ba 100644 --- a/sdk-tests/src/test/java/io/dapr/it/binding/http/InputBindingService.java +++ b/sdk-tests/src/test/java/io/dapr/it/binding/http/InputBindingService.java @@ -11,7 +11,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class InputBindingService { - public static final String SUCCESS_MESSAGE = "dapr initialized. Status: Running. Init Elapsed"; + public static final String SUCCESS_MESSAGE = "You're up and running!"; public static void main(String[] args) throws Exception { // If port string is not valid, it will throw an exception. diff --git a/sdk-tests/src/test/java/io/dapr/it/methodinvoke/http/MethodInvokeService.java b/sdk-tests/src/test/java/io/dapr/it/methodinvoke/http/MethodInvokeService.java index 70817bc56..f3af69dde 100644 --- a/sdk-tests/src/test/java/io/dapr/it/methodinvoke/http/MethodInvokeService.java +++ b/sdk-tests/src/test/java/io/dapr/it/methodinvoke/http/MethodInvokeService.java @@ -15,7 +15,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class MethodInvokeService { - public static final String SUCCESS_MESSAGE = "dapr initialized. Status: Running. Init Elapsed"; + public static final String SUCCESS_MESSAGE = "You're up and running!"; public static void main(String[] args) { int port = Integer.parseInt(args[0]); diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/SubscriberService.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/SubscriberService.java index 169a2028d..e27af0e29 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/SubscriberService.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/SubscriberService.java @@ -16,7 +16,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication(scanBasePackages = {"io.dapr.springboot", "io.dapr.it.pubsub.http"}) public class SubscriberService { - public static final String SUCCESS_MESSAGE = "dapr initialized. Status: Running. Init Elapsed"; + public static final String SUCCESS_MESSAGE = "You're up and running!"; public static void main(String[] args) throws Exception { int port = Integer.parseInt(args[0]); diff --git a/sdk-tests/src/test/java/io/dapr/it/state/HelloWorldClientIT.java b/sdk-tests/src/test/java/io/dapr/it/state/HelloWorldClientIT.java index b73de45af..b3cfe62aa 100644 --- a/sdk-tests/src/test/java/io/dapr/it/state/HelloWorldClientIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/state/HelloWorldClientIT.java @@ -5,10 +5,10 @@ package io.dapr.it.state; -import io.dapr.DaprGrpc; -import io.dapr.DaprProtos; import io.dapr.it.BaseIT; import io.dapr.it.DaprRun; +import io.dapr.v1.DaprGrpc; +import io.dapr.v1.DaprProtos; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; import org.junit.Assert; diff --git a/sdk-tests/src/test/java/io/dapr/it/state/HelloWorldGrpcStateService.java b/sdk-tests/src/test/java/io/dapr/it/state/HelloWorldGrpcStateService.java index af29ce893..e63113e08 100644 --- a/sdk-tests/src/test/java/io/dapr/it/state/HelloWorldGrpcStateService.java +++ b/sdk-tests/src/test/java/io/dapr/it/state/HelloWorldGrpcStateService.java @@ -7,10 +7,10 @@ package io.dapr.it.state; import com.google.protobuf.Any; import com.google.protobuf.ByteString; -import io.dapr.DaprGrpc; -import io.dapr.DaprGrpc.DaprBlockingStub; -import io.dapr.DaprProtos.SaveStateEnvelope; -import io.dapr.DaprProtos.StateRequest; +import io.dapr.v1.DaprGrpc; +import io.dapr.v1.DaprGrpc.DaprBlockingStub; +import io.dapr.v1.DaprProtos.SaveStateEnvelope; +import io.dapr.v1.DaprProtos.StateRequest; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; diff --git a/sdk/src/main/java/io/dapr/client/DaprClientBuilder.java b/sdk/src/main/java/io/dapr/client/DaprClientBuilder.java index c91afc1ea..8cc014fd2 100644 --- a/sdk/src/main/java/io/dapr/client/DaprClientBuilder.java +++ b/sdk/src/main/java/io/dapr/client/DaprClientBuilder.java @@ -5,11 +5,11 @@ package io.dapr.client; -import io.dapr.DaprGrpc; import io.dapr.serializer.DaprObjectSerializer; import io.dapr.serializer.DefaultObjectSerializer; import io.dapr.utils.Constants; import io.dapr.utils.Properties; +import io.dapr.v1.DaprGrpc; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; import okhttp3.OkHttpClient; diff --git a/sdk/src/main/java/io/dapr/client/DaprClientGrpc.java b/sdk/src/main/java/io/dapr/client/DaprClientGrpc.java index 2d0a43730..137ba9424 100644 --- a/sdk/src/main/java/io/dapr/client/DaprClientGrpc.java +++ b/sdk/src/main/java/io/dapr/client/DaprClientGrpc.java @@ -10,12 +10,13 @@ import com.google.protobuf.Any; import com.google.protobuf.ByteString; import com.google.protobuf.Duration; import com.google.protobuf.Empty; -import io.dapr.DaprGrpc; -import io.dapr.DaprProtos; import io.dapr.client.domain.State; import io.dapr.client.domain.StateOptions; import io.dapr.client.domain.Verb; import io.dapr.serializer.DaprObjectSerializer; +import io.dapr.v1.CommonProtos; +import io.dapr.v1.DaprGrpc; +import io.dapr.v1.DaprProtos; import reactor.core.publisher.Mono; import java.io.IOException; @@ -26,7 +27,7 @@ import java.util.Map; /** * An adapter for the GRPC Client. * - * @see io.dapr.DaprGrpc + * @see io.dapr.v1.DaprGrpc * @see io.dapr.client.DaprClient */ public class DaprClientGrpc implements DaprClient { @@ -34,7 +35,7 @@ public class DaprClientGrpc implements DaprClient { /** * The GRPC client to be used. * - * @see io.dapr.DaprGrpc.DaprFutureStub + * @see io.dapr.v1.DaprGrpc.DaprFutureStub */ private DaprGrpc.DaprFutureStub client; @@ -108,10 +109,11 @@ public class DaprClientGrpc implements DaprClient { Map metadata, Class clazz) { try { - DaprProtos.InvokeServiceEnvelope envelope = buildInvokeServiceEnvelope(verb.toString(), appId, method, request); + DaprProtos.InvokeServiceRequest envelope = buildInvokeServiceRequest(verb.toString(), appId, method, request); return Mono.fromCallable(() -> { - ListenableFuture futureResponse = + ListenableFuture futureResponse = client.invokeService(envelope); + return objectSerializer.deserialize(futureResponse.get().getData().getValue().toByteArray(), clazz); }); } catch (Exception ex) { @@ -311,12 +313,12 @@ public class DaprClientGrpc implements DaprClient { stateBuilder.setValue(data); } stateBuilder.setKey(state.getKey()); - DaprProtos.StateRequestOptions.Builder optionBuilder = null; + DaprProtos.StateOptions.Builder optionBuilder = null; if (state.getOptions() != null) { StateOptions options = state.getOptions(); - DaprProtos.StateRetryPolicy.Builder retryPolicyBuilder = null; + DaprProtos.RetryPolicy.Builder retryPolicyBuilder = null; if (options.getRetryPolicy() != null) { - retryPolicyBuilder = DaprProtos.StateRetryPolicy.newBuilder(); + retryPolicyBuilder = DaprProtos.RetryPolicy.newBuilder(); StateOptions.RetryPolicy retryPolicy = options.getRetryPolicy(); if (options.getRetryPolicy().getInterval() != null) { Duration.Builder durationBuilder = Duration.newBuilder() @@ -332,7 +334,7 @@ public class DaprClientGrpc implements DaprClient { } } - optionBuilder = DaprProtos.StateRequestOptions.newBuilder(); + optionBuilder = DaprProtos.StateOptions.newBuilder(); if (options.getConcurrency() != null) { optionBuilder.setConcurrency(options.getConcurrency().getValue()); } @@ -445,7 +447,7 @@ public class DaprClientGrpc implements DaprClient { } /** - * Builds the object io.dapr.{@link DaprProtos.InvokeServiceEnvelope} to be send based on the parameters. + * Builds the object io.dapr.{@link DaprProtos.InvokeServiceRequest} to be send based on the parameters. * * @param verb String that must match HTTP Methods * @param appId The application id to be invoked @@ -455,19 +457,29 @@ public class DaprClientGrpc implements DaprClient { * @return The object to be sent as part of the invokation. * @throws IOException If there's an issue serializing the request. */ - private DaprProtos.InvokeServiceEnvelope buildInvokeServiceEnvelope( + private DaprProtos.InvokeServiceRequest buildInvokeServiceRequest( String verb, String appId, String method, K request) throws IOException { - DaprProtos.InvokeServiceEnvelope.Builder envelopeBuilder = DaprProtos.InvokeServiceEnvelope.newBuilder() - .setId(appId) - .setMethod(method) - .putMetadata("http.verb", verb); + CommonProtos.InvokeRequest.Builder requestBuilder = CommonProtos.InvokeRequest.newBuilder(); + requestBuilder.setMethod(method); if (request != null) { byte[] byteRequest = objectSerializer.serialize(request); Any data = Any.newBuilder().setValue(ByteString.copyFrom(byteRequest)).build(); - envelopeBuilder.setData(data); + requestBuilder.setData(data); } else { - envelopeBuilder.setData(Any.newBuilder().build()); + requestBuilder.setData(Any.newBuilder().build()); } + + CommonProtos.HTTPExtension.Builder httpExtensionBuilder = CommonProtos.HTTPExtension.newBuilder(); + if ((verb != null) && !verb.isEmpty()) { + httpExtensionBuilder.setVerb(CommonProtos.HTTPExtension.Verb.valueOf(verb.toUpperCase())); + } else { + httpExtensionBuilder.setVerb(CommonProtos.HTTPExtension.Verb.NONE); + } + requestBuilder.setHttpExtension(httpExtensionBuilder.build()); + + DaprProtos.InvokeServiceRequest.Builder envelopeBuilder = DaprProtos.InvokeServiceRequest.newBuilder() + .setId(appId) + .setMessage(requestBuilder.build()); return envelopeBuilder.build(); } diff --git a/sdk/src/test/java/io/dapr/client/DaprClientGrpcTest.java b/sdk/src/test/java/io/dapr/client/DaprClientGrpcTest.java index 24efeb9b8..978a08a66 100644 --- a/sdk/src/test/java/io/dapr/client/DaprClientGrpcTest.java +++ b/sdk/src/test/java/io/dapr/client/DaprClientGrpcTest.java @@ -10,12 +10,13 @@ import com.google.common.util.concurrent.SettableFuture; import com.google.protobuf.Any; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; -import io.dapr.DaprGrpc; -import io.dapr.DaprProtos; import io.dapr.client.domain.State; import io.dapr.client.domain.StateOptions; import io.dapr.client.domain.Verb; import io.dapr.serializer.DefaultObjectSerializer; +import io.dapr.v1.CommonProtos; +import io.dapr.v1.DaprGrpc; +import io.dapr.v1.DaprProtos; import java.util.Collections; import org.checkerframework.checker.nullness.compatqual.NullableDecl; import org.junit.Before; @@ -117,7 +118,7 @@ public class DaprClientGrpcTest { @Test(expected = RuntimeException.class) public void invokeBindingExceptionThrownTest() { - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenThrow(RuntimeException.class); Mono result = adapter.invokeBinding("BindingName", "request"); result.block(); @@ -182,7 +183,7 @@ public class DaprClientGrpcTest { @Test(expected = RuntimeException.class) public void invokeServiceVoidExceptionThrownTest() { - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenThrow(RuntimeException.class); Mono result = adapter.invokeService(Verb.GET, "appId", "method", "request"); result.block(); @@ -190,13 +191,13 @@ public class DaprClientGrpcTest { @Test(expected = RuntimeException.class) public void invokeServiceVoidCallbackExceptionThrownTest() { - SettableFuture settableFuture = SettableFuture.create(); + SettableFuture settableFuture = SettableFuture.create(); RuntimeException ex = new RuntimeException("An Exception"); - MockCallback callback = - new MockCallback(ex); + MockCallback callback = + new MockCallback(ex); addCallback(settableFuture, callback, directExecutor()); settableFuture.setException(ex); - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenReturn(settableFuture); Mono result = adapter.invokeService(Verb.GET, "appId", "method", "request"); result.block(); @@ -204,40 +205,40 @@ public class DaprClientGrpcTest { @Test public void invokeServiceVoidTest() throws Exception { - SettableFuture settableFuture = SettableFuture.create(); + SettableFuture settableFuture = SettableFuture.create(); - MockCallback callback = - new MockCallback(DaprProtos.InvokeServiceResponseEnvelope.newBuilder() + MockCallback callback = + new MockCallback(CommonProtos.InvokeResponse.newBuilder() .setData(getAny("Value")).build()); addCallback(settableFuture, callback, directExecutor()); - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenReturn(settableFuture); Mono result = adapter.invokeService(Verb.GET, "appId", "method", "request"); - settableFuture.set(DaprProtos.InvokeServiceResponseEnvelope.newBuilder().setData(getAny("Value")).build()); + settableFuture.set(CommonProtos.InvokeResponse.newBuilder().setData(getAny("Value")).build()); result.block(); assertTrue(callback.wasCalled); } @Test public void invokeServiceVoidObjectTest() throws Exception { - SettableFuture settableFuture = SettableFuture.create(); + SettableFuture settableFuture = SettableFuture.create(); - MockCallback callback = - new MockCallback(DaprProtos.InvokeServiceResponseEnvelope.newBuilder() + MockCallback callback = + new MockCallback(CommonProtos.InvokeResponse.newBuilder() .setData(getAny("Value")).build()); addCallback(settableFuture, callback, directExecutor()); - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenReturn(settableFuture); MyObject request = new MyObject(1, "Event"); Mono result = adapter.invokeService(Verb.GET, "appId", "method", request); - settableFuture.set(DaprProtos.InvokeServiceResponseEnvelope.newBuilder().setData(getAny("Value")).build()); + settableFuture.set(CommonProtos.InvokeResponse.newBuilder().setData(getAny("Value")).build()); result.block(); assertTrue(callback.wasCalled); } @Test(expected = RuntimeException.class) public void invokeServiceExceptionThrownTest() { - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenThrow(RuntimeException.class); Mono result = adapter.invokeService(Verb.GET, "appId", "method", "request", null, String.class); result.block(); @@ -245,12 +246,12 @@ public class DaprClientGrpcTest { @Test(expected = RuntimeException.class) public void invokeServiceCallbackExceptionThrownTest() { - SettableFuture settableFuture = SettableFuture.create(); + SettableFuture settableFuture = SettableFuture.create(); RuntimeException ex = new RuntimeException("An Exception"); - MockCallback callback = - new MockCallback(ex); + MockCallback callback = + new MockCallback(ex); addCallback(settableFuture, callback, directExecutor()); - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenReturn(settableFuture); Mono result = adapter.invokeService(Verb.GET, "appId", "method", "request", null, String.class); settableFuture.setException(ex); @@ -260,13 +261,13 @@ public class DaprClientGrpcTest { @Test public void invokeServiceTest() throws Exception { String expected = "Value"; - SettableFuture settableFuture = SettableFuture.create(); - MockCallback callback = - new MockCallback(DaprProtos.InvokeServiceResponseEnvelope.newBuilder() + SettableFuture settableFuture = SettableFuture.create(); + MockCallback callback = + new MockCallback(CommonProtos.InvokeResponse.newBuilder() .setData(getAny(expected)).build()); addCallback(settableFuture, callback, directExecutor()); - settableFuture.set(DaprProtos.InvokeServiceResponseEnvelope.newBuilder().setData(getAny(expected)).build()); - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + settableFuture.set(CommonProtos.InvokeResponse.newBuilder().setData(getAny(expected)).build()); + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenReturn(settableFuture); Mono result = adapter.invokeService(Verb.GET, "appId", "method", "request", null, String.class); String strOutput = result.block(); @@ -276,13 +277,13 @@ public class DaprClientGrpcTest { @Test public void invokeServiceObjectTest() throws Exception { MyObject object = new MyObject(1, "Value"); - SettableFuture settableFuture = SettableFuture.create(); - MockCallback callback = - new MockCallback(DaprProtos.InvokeServiceResponseEnvelope.newBuilder() + SettableFuture settableFuture = SettableFuture.create(); + MockCallback callback = + new MockCallback(CommonProtos.InvokeResponse.newBuilder() .setData(getAny(object)).build()); addCallback(settableFuture, callback, directExecutor()); - settableFuture.set(DaprProtos.InvokeServiceResponseEnvelope.newBuilder().setData(getAny(object)).build()); - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + settableFuture.set(CommonProtos.InvokeResponse.newBuilder().setData(getAny(object)).build()); + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenReturn(settableFuture); Mono result = adapter.invokeService(Verb.GET, "appId", "method", "request", null, MyObject.class); MyObject resultObject = result.block(); @@ -292,7 +293,7 @@ public class DaprClientGrpcTest { @Test(expected = RuntimeException.class) public void invokeServiceNoRequestBodyExceptionThrownTest() { - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenThrow(RuntimeException.class); Mono result = adapter.invokeService(Verb.GET, "appId", "method", null, String.class); result.block(); @@ -300,12 +301,12 @@ public class DaprClientGrpcTest { @Test(expected = RuntimeException.class) public void invokeServiceNoRequestCallbackExceptionThrownTest() { - SettableFuture settableFuture = SettableFuture.create(); + SettableFuture settableFuture = SettableFuture.create(); RuntimeException ex = new RuntimeException("An Exception"); - MockCallback callback = - new MockCallback(ex); + MockCallback callback = + new MockCallback(ex); addCallback(settableFuture, callback, directExecutor()); - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenReturn(settableFuture); Mono result = adapter.invokeService(Verb.GET, "appId", "method", null, String.class); settableFuture.setException(ex); @@ -315,14 +316,14 @@ public class DaprClientGrpcTest { @Test public void invokeServiceNoRequestBodyTest() throws Exception { String expected = "Value"; - SettableFuture settableFuture = SettableFuture.create(); + SettableFuture settableFuture = SettableFuture.create(); - MockCallback callback = - new MockCallback(DaprProtos.InvokeServiceResponseEnvelope.newBuilder() + MockCallback callback = + new MockCallback(CommonProtos.InvokeResponse.newBuilder() .setData(getAny(expected)).build()); addCallback(settableFuture, callback, directExecutor()); - settableFuture.set(DaprProtos.InvokeServiceResponseEnvelope.newBuilder().setData(getAny(expected)).build()); - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + settableFuture.set(CommonProtos.InvokeResponse.newBuilder().setData(getAny(expected)).build()); + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenReturn(settableFuture); Mono result = adapter.invokeService(Verb.GET, "appId", "method", null, String.class); String strOutput = result.block(); @@ -332,14 +333,14 @@ public class DaprClientGrpcTest { @Test public void invokeServiceNoRequestBodyObjectTest() throws Exception { MyObject object = new MyObject(1, "Value"); - SettableFuture settableFuture = SettableFuture.create(); + SettableFuture settableFuture = SettableFuture.create(); - MockCallback callback = - new MockCallback(DaprProtos.InvokeServiceResponseEnvelope.newBuilder() + MockCallback callback = + new MockCallback(CommonProtos.InvokeResponse.newBuilder() .setData(getAny(object)).build()); addCallback(settableFuture, callback, directExecutor()); - settableFuture.set(DaprProtos.InvokeServiceResponseEnvelope.newBuilder().setData(getAny(object)).build()); - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + settableFuture.set(CommonProtos.InvokeResponse.newBuilder().setData(getAny(object)).build()); + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenReturn(settableFuture); Mono result = adapter.invokeService(Verb.GET, "appId", "method", null, MyObject.class); MyObject resultObject = result.block(); @@ -349,7 +350,7 @@ public class DaprClientGrpcTest { @Test(expected = RuntimeException.class) public void invokeServiceByteRequestExceptionThrownTest() throws IOException { - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenThrow(RuntimeException.class); String request = "Request"; byte[] byteRequest = serializer.serialize(request); @@ -359,12 +360,12 @@ public class DaprClientGrpcTest { @Test(expected = RuntimeException.class) public void invokeServiceByteRequestCallbackExceptionThrownTest() throws IOException { - SettableFuture settableFuture = SettableFuture.create(); + SettableFuture settableFuture = SettableFuture.create(); RuntimeException ex = new RuntimeException("An Exception"); - MockCallback callback = - new MockCallback(ex); + MockCallback callback = + new MockCallback(ex); addCallback(settableFuture, callback, directExecutor()); - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenReturn(settableFuture); String request = "Request"; byte[] byteRequest = serializer.serialize(request); @@ -377,13 +378,13 @@ public class DaprClientGrpcTest { @Test public void invokeByteRequestServiceTest() throws Exception { String expected = "Value"; - SettableFuture settableFuture = SettableFuture.create(); - MockCallback callback = - new MockCallback(DaprProtos.InvokeServiceResponseEnvelope.newBuilder() + SettableFuture settableFuture = SettableFuture.create(); + MockCallback callback = + new MockCallback(CommonProtos.InvokeResponse.newBuilder() .setData(getAny(expected)).build()); addCallback(settableFuture, callback, directExecutor()); - settableFuture.set(DaprProtos.InvokeServiceResponseEnvelope.newBuilder().setData(getAny(expected)).build()); - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + settableFuture.set(CommonProtos.InvokeResponse.newBuilder().setData(getAny(expected)).build()); + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenReturn(settableFuture); String request = "Request"; byte[] byteRequest = serializer.serialize(request); @@ -397,13 +398,13 @@ public class DaprClientGrpcTest { @Test public void invokeServiceByteRequestObjectTest() throws Exception { MyObject resultObj = new MyObject(1, "Value"); - SettableFuture settableFuture = SettableFuture.create(); - MockCallback callback = - new MockCallback(DaprProtos.InvokeServiceResponseEnvelope.newBuilder() + SettableFuture settableFuture = SettableFuture.create(); + MockCallback callback = + new MockCallback(CommonProtos.InvokeResponse.newBuilder() .setData(getAny(resultObj)).build()); addCallback(settableFuture, callback, directExecutor()); - settableFuture.set(DaprProtos.InvokeServiceResponseEnvelope.newBuilder().setData(getAny(resultObj)).build()); - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + settableFuture.set(CommonProtos.InvokeResponse.newBuilder().setData(getAny(resultObj)).build()); + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenReturn(settableFuture); String request = "Request"; byte[] byteRequest = serializer.serialize(request); @@ -414,7 +415,7 @@ public class DaprClientGrpcTest { @Test(expected = RuntimeException.class) public void invokeServiceNoRequestNoClassBodyExceptionThrownTest() { - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenThrow(RuntimeException.class); Mono result = adapter.invokeService(Verb.GET, "appId", "method", null); result.block(); @@ -422,12 +423,12 @@ public class DaprClientGrpcTest { @Test(expected = RuntimeException.class) public void invokeServiceNoRequestNoClassCallbackExceptionThrownTest() { - SettableFuture settableFuture = SettableFuture.create(); + SettableFuture settableFuture = SettableFuture.create(); RuntimeException ex = new RuntimeException("An Exception"); - MockCallback callback = - new MockCallback(ex); + MockCallback callback = + new MockCallback(ex); addCallback(settableFuture, callback, directExecutor()); - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenReturn(settableFuture); Mono result = adapter.invokeService(Verb.GET, "appId", "method", null); settableFuture.setException(ex); @@ -437,15 +438,15 @@ public class DaprClientGrpcTest { @Test public void invokeServiceNoRequestNoClassBodyTest() throws Exception { String expected = "Value"; - SettableFuture settableFuture = SettableFuture.create(); - MockCallback callback = - new MockCallback(DaprProtos.InvokeServiceResponseEnvelope.newBuilder() + SettableFuture settableFuture = SettableFuture.create(); + MockCallback callback = + new MockCallback(CommonProtos.InvokeResponse.newBuilder() .setData(getAny(expected)).build()); addCallback(settableFuture, callback, directExecutor()); - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenReturn(settableFuture); Mono result = adapter.invokeService(Verb.GET, "appId", "method", null); - settableFuture.set(DaprProtos.InvokeServiceResponseEnvelope.newBuilder().setData(getAny(expected)).build()); + settableFuture.set(CommonProtos.InvokeResponse.newBuilder().setData(getAny(expected)).build()); result.block(); assertTrue(callback.wasCalled); } @@ -453,14 +454,14 @@ public class DaprClientGrpcTest { @Test public void invokeServiceNoRequestNoHotMono() throws Exception { String expected = "Value"; - SettableFuture settableFuture = SettableFuture.create(); - MockCallback callback = - new MockCallback(DaprProtos.InvokeServiceResponseEnvelope.newBuilder() + SettableFuture settableFuture = SettableFuture.create(); + MockCallback callback = + new MockCallback(CommonProtos.InvokeResponse.newBuilder() .setData(getAny(expected)).build()); addCallback(settableFuture, callback, directExecutor()); - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenAnswer(c -> { - settableFuture.set(DaprProtos.InvokeServiceResponseEnvelope.newBuilder().setData(getAny(expected)).build()); + settableFuture.set(CommonProtos.InvokeResponse.newBuilder().setData(getAny(expected)).build()); return settableFuture; }); adapter.invokeService(Verb.GET, "appId", "method", null); @@ -471,14 +472,14 @@ public class DaprClientGrpcTest { @Test public void invokeServiceNoRequestNoClassBodyObjectTest() throws Exception { MyObject resultObj = new MyObject(1, "Value"); - SettableFuture settableFuture = SettableFuture.create(); + SettableFuture settableFuture = SettableFuture.create(); - MockCallback callback = - new MockCallback(DaprProtos.InvokeServiceResponseEnvelope.newBuilder() + MockCallback callback = + new MockCallback(CommonProtos.InvokeResponse.newBuilder() .setData(getAny(resultObj)).build()); addCallback(settableFuture, callback, directExecutor()); - settableFuture.set(DaprProtos.InvokeServiceResponseEnvelope.newBuilder().setData(getAny(resultObj)).build()); - when(client.invokeService(any(DaprProtos.InvokeServiceEnvelope.class))) + settableFuture.set(CommonProtos.InvokeResponse.newBuilder().setData(getAny(resultObj)).build()); + when(client.invokeService(any(DaprProtos.InvokeServiceRequest.class))) .thenReturn(settableFuture); Mono result = adapter.invokeService(Verb.GET, "appId", "method", null); result.block(); @@ -487,7 +488,7 @@ public class DaprClientGrpcTest { @Test(expected = RuntimeException.class) public void getStateExceptionThrownTest() { - when(client.getState(any(io.dapr.DaprProtos.GetStateEnvelope.class))).thenThrow(RuntimeException.class); + when(client.getState(any(io.dapr.v1.DaprProtos.GetStateEnvelope.class))).thenThrow(RuntimeException.class); State key = buildStateKey(null, "Key1", "ETag1", null); Mono> result = adapter.getState(STATE_STORE_NAME, key, String.class); result.block(); @@ -500,7 +501,7 @@ public class DaprClientGrpcTest { MockCallback callback = new MockCallback<>(ex); addCallback(settableFuture, callback, directExecutor()); - when(client.getState(any(io.dapr.DaprProtos.GetStateEnvelope.class))) + when(client.getState(any(io.dapr.v1.DaprProtos.GetStateEnvelope.class))) .thenReturn(settableFuture); State key = buildStateKey(null, "Key1", "ETag1", null); Mono> result = adapter.getState(STATE_STORE_NAME, key, String.class); @@ -518,7 +519,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(responseEnvelope); addCallback(settableFuture, callback, directExecutor()); - when(client.getState(any(io.dapr.DaprProtos.GetStateEnvelope.class))) + when(client.getState(any(io.dapr.v1.DaprProtos.GetStateEnvelope.class))) .thenReturn(settableFuture); State keyRequest = buildStateKey(null, key, etag, null); Mono> result = adapter.getState(STATE_STORE_NAME, keyRequest, String.class); @@ -536,7 +537,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(responseEnvelope); addCallback(settableFuture, callback, directExecutor()); - when(client.getState(any(io.dapr.DaprProtos.GetStateEnvelope.class))) + when(client.getState(any(io.dapr.v1.DaprProtos.GetStateEnvelope.class))) .thenAnswer(c -> { settableFuture.set(responseEnvelope); return settableFuture; @@ -563,7 +564,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(responseEnvelope); addCallback(settableFuture, callback, directExecutor()); - when(client.getState(any(io.dapr.DaprProtos.GetStateEnvelope.class))) + when(client.getState(any(io.dapr.v1.DaprProtos.GetStateEnvelope.class))) .thenReturn(settableFuture); Mono> result = adapter.getState(STATE_STORE_NAME, keyRequest, MyObject.class); settableFuture.set(responseEnvelope); @@ -586,7 +587,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(responseEnvelope); addCallback(settableFuture, callback, directExecutor()); - when(client.getState(any(io.dapr.DaprProtos.GetStateEnvelope.class))) + when(client.getState(any(io.dapr.v1.DaprProtos.GetStateEnvelope.class))) .thenReturn(settableFuture); Mono> result = adapter.getState(STATE_STORE_NAME, keyRequest, MyObject.class); settableFuture.set(responseEnvelope); @@ -595,7 +596,7 @@ public class DaprClientGrpcTest { @Test(expected = RuntimeException.class) public void deleteStateExceptionThrowTest() { - when(client.deleteState(any(io.dapr.DaprProtos.DeleteStateEnvelope.class))).thenThrow(RuntimeException.class); + when(client.deleteState(any(io.dapr.v1.DaprProtos.DeleteStateEnvelope.class))).thenThrow(RuntimeException.class); State key = buildStateKey(null, "Key1", "ETag1", null); Mono result = adapter.deleteState(STATE_STORE_NAME, key.getKey(), key.getEtag(), key.getOptions()); result.block(); @@ -608,7 +609,7 @@ public class DaprClientGrpcTest { MockCallback callback = new MockCallback(ex); addCallback(settableFuture, callback, directExecutor()); - when(client.deleteState(any(io.dapr.DaprProtos.DeleteStateEnvelope.class))) + when(client.deleteState(any(io.dapr.v1.DaprProtos.DeleteStateEnvelope.class))) .thenReturn(settableFuture); State key = buildStateKey(null, "Key1", "ETag1", null); Mono result = adapter.deleteState(STATE_STORE_NAME, key.getKey(), key.getEtag(), key.getOptions()); @@ -623,7 +624,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(Empty.newBuilder().build()); addCallback(settableFuture, callback, directExecutor()); - when(client.deleteState(any(io.dapr.DaprProtos.DeleteStateEnvelope.class))) + when(client.deleteState(any(io.dapr.v1.DaprProtos.DeleteStateEnvelope.class))) .thenReturn(settableFuture); State stateKey = buildStateKey(null, key, etag, null); Mono result = adapter.deleteState(STATE_STORE_NAME, stateKey.getKey(), stateKey.getEtag(), @@ -642,7 +643,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(Empty.newBuilder().build()); addCallback(settableFuture, callback, directExecutor()); - when(client.deleteState(any(io.dapr.DaprProtos.DeleteStateEnvelope.class))) + when(client.deleteState(any(io.dapr.v1.DaprProtos.DeleteStateEnvelope.class))) .thenReturn(settableFuture); State stateKey = buildStateKey(null, key, etag, options); Mono result = adapter.deleteState(STATE_STORE_NAME, stateKey.getKey(), stateKey.getEtag(), @@ -661,7 +662,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(Empty.newBuilder().build()); addCallback(settableFuture, callback, directExecutor()); - when(client.deleteState(any(io.dapr.DaprProtos.DeleteStateEnvelope.class))) + when(client.deleteState(any(io.dapr.v1.DaprProtos.DeleteStateEnvelope.class))) .thenAnswer(c -> { settableFuture.set(Empty.newBuilder().build()); return settableFuture; @@ -682,7 +683,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(Empty.newBuilder().build()); addCallback(settableFuture, callback, directExecutor()); - when(client.deleteState(any(io.dapr.DaprProtos.DeleteStateEnvelope.class))) + when(client.deleteState(any(io.dapr.v1.DaprProtos.DeleteStateEnvelope.class))) .thenReturn(settableFuture); State stateKey = buildStateKey(null, key, etag, options); Mono result = adapter.deleteState(STATE_STORE_NAME, stateKey.getKey(), stateKey.getEtag(), @@ -701,7 +702,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(Empty.newBuilder().build()); addCallback(settableFuture, callback, directExecutor()); - when(client.deleteState(any(io.dapr.DaprProtos.DeleteStateEnvelope.class))) + when(client.deleteState(any(io.dapr.v1.DaprProtos.DeleteStateEnvelope.class))) .thenReturn(settableFuture); State stateKey = buildStateKey(null, key, etag, options); Mono result = adapter.deleteState(STATE_STORE_NAME, stateKey.getKey(), stateKey.getEtag(), @@ -720,7 +721,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(Empty.newBuilder().build()); addCallback(settableFuture, callback, directExecutor()); - when(client.deleteState(any(io.dapr.DaprProtos.DeleteStateEnvelope.class))) + when(client.deleteState(any(io.dapr.v1.DaprProtos.DeleteStateEnvelope.class))) .thenReturn(settableFuture); State stateKey = buildStateKey(null, key, etag, options); Mono result = adapter.deleteState(STATE_STORE_NAME, stateKey.getKey(), stateKey.getEtag(), @@ -739,7 +740,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(Empty.newBuilder().build()); addCallback(settableFuture, callback, directExecutor()); - when(client.deleteState(any(io.dapr.DaprProtos.DeleteStateEnvelope.class))) + when(client.deleteState(any(io.dapr.v1.DaprProtos.DeleteStateEnvelope.class))) .thenReturn(settableFuture); State stateKey = buildStateKey(null, key, etag, options); Mono result = adapter.deleteState(STATE_STORE_NAME, stateKey.getKey(), stateKey.getEtag(), @@ -758,7 +759,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(Empty.newBuilder().build()); addCallback(settableFuture, callback, directExecutor()); - when(client.deleteState(any(io.dapr.DaprProtos.DeleteStateEnvelope.class))) + when(client.deleteState(any(io.dapr.v1.DaprProtos.DeleteStateEnvelope.class))) .thenReturn(settableFuture); State stateKey = buildStateKey(null, key, etag, options); Mono result = adapter.deleteState(STATE_STORE_NAME, stateKey.getKey(), stateKey.getEtag(), @@ -777,7 +778,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(Empty.newBuilder().build()); addCallback(settableFuture, callback, directExecutor()); - when(client.deleteState(any(io.dapr.DaprProtos.DeleteStateEnvelope.class))) + when(client.deleteState(any(io.dapr.v1.DaprProtos.DeleteStateEnvelope.class))) .thenReturn(settableFuture); State stateKey = buildStateKey(null, key, etag, options); Mono result = adapter.deleteState(STATE_STORE_NAME, stateKey.getKey(), stateKey.getEtag(), @@ -792,7 +793,7 @@ public class DaprClientGrpcTest { String key = "key1"; String etag = "ETag1"; String value = "State value"; - when(client.saveState(any(io.dapr.DaprProtos.SaveStateEnvelope.class))).thenThrow(RuntimeException.class); + when(client.saveState(any(io.dapr.v1.DaprProtos.SaveStateEnvelope.class))).thenThrow(RuntimeException.class); Mono result = adapter.saveState(STATE_STORE_NAME, key, etag, value, null); result.block(); } @@ -806,7 +807,7 @@ public class DaprClientGrpcTest { RuntimeException ex = new RuntimeException("An Exception"); MockCallback callback = new MockCallback<>(ex); addCallback(settableFuture, callback, directExecutor()); - when(client.saveState(any(io.dapr.DaprProtos.SaveStateEnvelope.class))).thenReturn(settableFuture); + when(client.saveState(any(io.dapr.v1.DaprProtos.SaveStateEnvelope.class))).thenReturn(settableFuture); Mono result = adapter.saveState(STATE_STORE_NAME, key, etag, value, null); settableFuture.setException(ex); result.block(); @@ -820,7 +821,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(Empty.newBuilder().build()); addCallback(settableFuture, callback, directExecutor()); - when(client.saveState(any(io.dapr.DaprProtos.SaveStateEnvelope.class))).thenReturn(settableFuture); + when(client.saveState(any(io.dapr.v1.DaprProtos.SaveStateEnvelope.class))).thenReturn(settableFuture); Mono result = adapter.saveState(STATE_STORE_NAME, key, etag, value, null); settableFuture.set(Empty.newBuilder().build()); result.block(); @@ -835,7 +836,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(Empty.newBuilder().build()); addCallback(settableFuture, callback, directExecutor()); - when(client.saveState(any(io.dapr.DaprProtos.SaveStateEnvelope.class))).thenReturn(settableFuture); + when(client.saveState(any(io.dapr.v1.DaprProtos.SaveStateEnvelope.class))).thenReturn(settableFuture); StateOptions options = buildStateOptions(StateOptions.Consistency.STRONG, StateOptions.Concurrency.FIRST_WRITE, Duration.ofDays(100), 1, StateOptions.RetryPolicy.Pattern.LINEAR); Mono result = adapter.saveState(STATE_STORE_NAME, key, etag, value, options); @@ -852,7 +853,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(Empty.newBuilder().build()); addCallback(settableFuture, callback, directExecutor()); - when(client.saveState(any(io.dapr.DaprProtos.SaveStateEnvelope.class))).thenAnswer(c -> { + when(client.saveState(any(io.dapr.v1.DaprProtos.SaveStateEnvelope.class))).thenAnswer(c -> { settableFuture.set(Empty.newBuilder().build()); return settableFuture; }); @@ -871,7 +872,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(Empty.newBuilder().build()); addCallback(settableFuture, callback, directExecutor()); - when(client.saveState(any(io.dapr.DaprProtos.SaveStateEnvelope.class))).thenReturn(settableFuture); + when(client.saveState(any(io.dapr.v1.DaprProtos.SaveStateEnvelope.class))).thenReturn(settableFuture); StateOptions options = buildStateOptions(null, StateOptions.Concurrency.FIRST_WRITE, Duration.ofDays(100), 1, StateOptions.RetryPolicy.Pattern.LINEAR); Mono result = adapter.saveState(STATE_STORE_NAME, key, etag, value, options); @@ -888,7 +889,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(Empty.newBuilder().build()); addCallback(settableFuture, callback, directExecutor()); - when(client.saveState(any(io.dapr.DaprProtos.SaveStateEnvelope.class))).thenReturn(settableFuture); + when(client.saveState(any(io.dapr.v1.DaprProtos.SaveStateEnvelope.class))).thenReturn(settableFuture); StateOptions options = buildStateOptions(StateOptions.Consistency.STRONG, null, Duration.ofDays(100), 1, StateOptions.RetryPolicy.Pattern.LINEAR); Mono result = adapter.saveState(STATE_STORE_NAME, key, etag, value, options); @@ -905,7 +906,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(Empty.newBuilder().build()); addCallback(settableFuture, callback, directExecutor()); - when(client.saveState(any(io.dapr.DaprProtos.SaveStateEnvelope.class))).thenReturn(settableFuture); + when(client.saveState(any(io.dapr.v1.DaprProtos.SaveStateEnvelope.class))).thenReturn(settableFuture); StateOptions options = buildStateOptions(StateOptions.Consistency.STRONG, StateOptions.Concurrency.FIRST_WRITE, null, null, null); Mono result = adapter.saveState(STATE_STORE_NAME, key, etag, value, options); @@ -922,7 +923,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(Empty.newBuilder().build()); addCallback(settableFuture, callback, directExecutor()); - when(client.saveState(any(io.dapr.DaprProtos.SaveStateEnvelope.class))).thenReturn(settableFuture); + when(client.saveState(any(io.dapr.v1.DaprProtos.SaveStateEnvelope.class))).thenReturn(settableFuture); StateOptions options = buildStateOptions(StateOptions.Consistency.STRONG, StateOptions.Concurrency.FIRST_WRITE, null, 1, StateOptions.RetryPolicy.Pattern.LINEAR); Mono result = adapter.saveState(STATE_STORE_NAME, key, etag, value, options); @@ -939,7 +940,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(Empty.newBuilder().build()); addCallback(settableFuture, callback, directExecutor()); - when(client.saveState(any(io.dapr.DaprProtos.SaveStateEnvelope.class))).thenReturn(settableFuture); + when(client.saveState(any(io.dapr.v1.DaprProtos.SaveStateEnvelope.class))).thenReturn(settableFuture); StateOptions options = buildStateOptions(StateOptions.Consistency.STRONG, StateOptions.Concurrency.FIRST_WRITE, Duration.ofDays(100), null, StateOptions.RetryPolicy.Pattern.LINEAR); Mono result = adapter.saveState(STATE_STORE_NAME, key, etag, value, options); @@ -956,7 +957,7 @@ public class DaprClientGrpcTest { SettableFuture settableFuture = SettableFuture.create(); MockCallback callback = new MockCallback<>(Empty.newBuilder().build()); addCallback(settableFuture, callback, directExecutor()); - when(client.saveState(any(io.dapr.DaprProtos.SaveStateEnvelope.class))).thenReturn(settableFuture); + when(client.saveState(any(io.dapr.v1.DaprProtos.SaveStateEnvelope.class))).thenReturn(settableFuture); StateOptions options = buildStateOptions(StateOptions.Consistency.STRONG, StateOptions.Concurrency.FIRST_WRITE, Duration.ofDays(100), 1, null); Mono result = adapter.saveState(STATE_STORE_NAME, key, etag, value, options); @@ -1010,7 +1011,7 @@ public class DaprClientGrpcTest { SettableFuture settableFutureDelete = SettableFuture.create(); MockCallback callbackDelete = new MockCallback<>(Empty.newBuilder().build()); addCallback(settableFutureDelete, callbackDelete, directExecutor()); - when(client.deleteState(any(io.dapr.DaprProtos.DeleteStateEnvelope.class))) + when(client.deleteState(any(io.dapr.v1.DaprProtos.DeleteStateEnvelope.class))) .thenReturn(settableFutureDelete); Mono resultDelete = adapter.deleteState(STATE_STORE_NAME, keyRequest2.getKey(), keyRequest2.getEtag(), keyRequest2.getOptions()); @@ -1034,9 +1035,9 @@ public class DaprClientGrpcTest { addCallback(settableFuture, callback, directExecutor()); settableFuture.set(responseEnvelope); - when(client.getSecret(any(io.dapr.DaprProtos.GetSecretEnvelope.class))) + when(client.getSecret(any(io.dapr.v1.DaprProtos.GetSecretEnvelope.class))) .thenAnswer(context -> { - io.dapr.DaprProtos.GetSecretEnvelope req = context.getArgument(0); + io.dapr.v1.DaprProtos.GetSecretEnvelope req = context.getArgument(0); assertEquals("key", req.getKey()); assertEquals(SECRET_STORE_NAME, req.getStoreName()); assertEquals(0, req.getMetadataCount()); @@ -1057,9 +1058,9 @@ public class DaprClientGrpcTest { addCallback(settableFuture, callback, directExecutor()); settableFuture.set(responseEnvelope); - when(client.getSecret(any(io.dapr.DaprProtos.GetSecretEnvelope.class))) + when(client.getSecret(any(io.dapr.v1.DaprProtos.GetSecretEnvelope.class))) .thenAnswer(context -> { - io.dapr.DaprProtos.GetSecretEnvelope req = context.getArgument(0); + io.dapr.v1.DaprProtos.GetSecretEnvelope req = context.getArgument(0); assertEquals("key", req.getKey()); assertEquals(SECRET_STORE_NAME, req.getStoreName()); assertEquals(0, req.getMetadataCount()); @@ -1078,9 +1079,9 @@ public class DaprClientGrpcTest { addCallback(settableFuture, callback, directExecutor()); settableFuture.setException(new RuntimeException()); - when(client.getSecret(any(io.dapr.DaprProtos.GetSecretEnvelope.class))) + when(client.getSecret(any(io.dapr.v1.DaprProtos.GetSecretEnvelope.class))) .thenAnswer(context -> { - io.dapr.DaprProtos.GetSecretEnvelope req = context.getArgument(0); + io.dapr.v1.DaprProtos.GetSecretEnvelope req = context.getArgument(0); assertEquals("key", req.getKey()); assertEquals(SECRET_STORE_NAME, req.getStoreName()); assertEquals(0, req.getMetadataCount()); @@ -1102,9 +1103,9 @@ public class DaprClientGrpcTest { addCallback(settableFuture, callback, directExecutor()); settableFuture.set(responseEnvelope); - when(client.getSecret(any(io.dapr.DaprProtos.GetSecretEnvelope.class))) + when(client.getSecret(any(io.dapr.v1.DaprProtos.GetSecretEnvelope.class))) .thenAnswer(context -> { - io.dapr.DaprProtos.GetSecretEnvelope req = context.getArgument(0); + io.dapr.v1.DaprProtos.GetSecretEnvelope req = context.getArgument(0); assertEquals("key", req.getKey()); assertEquals(SECRET_STORE_NAME, req.getStoreName()); assertEquals("metavalue", req.getMetadataMap().get("metakey"));