update to latest runtime rc and update protos baseurl (#1010)

* update to latest runtime rc and update protos baseurl Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * try fixing protos issue Signed-off-by: Cassandra Coyle <cassie@diagrid.io> --------- Signed-off-by: Cassandra Coyle <cassie@diagrid.io>
dapr · Feb 15, 2024 · baef245 · baef245
1 parent 81e6c4d
commit baef245
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -38,7 +38,7 @@ jobs:
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
       DAPR_CLI_VER: 1.12.0
-      DAPR_RUNTIME_VER: 1.13.0-rc.2
+      DAPR_RUNTIME_VER: 1.13.0-rc.5
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.12.0/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:

diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <grpc.version>1.59.0</grpc.version>
     <protobuf.version>3.17.3</protobuf.version>
-    <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.12.0-rc.2/dapr/proto</dapr.proto.baseurl>
+    <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.13.0-rc.5/dapr/proto</dapr.proto.baseurl>
     <dapr.sdk-workflows.version>0.11.0-SNAPSHOT</dapr.sdk-workflows.version>
     <os-maven-plugin.version>1.6.2</os-maven-plugin.version>
     <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>

diff --git a/sdk/src/main/java/io/dapr/client/DaprClientGrpc.java b/sdk/src/main/java/io/dapr/client/DaprClientGrpc.java
@@ -976,9 +976,10 @@ public void close() throws Exception {
    */
   @Override
   public Mono<Void> shutdown() {
+    DaprProtos.ShutdownRequest shutdownRequest = DaprProtos.ShutdownRequest.newBuilder().build();
     return Mono.deferContextual(
         context -> this.<Empty>createMono(
-            it -> intercept(context, asyncStub).shutdown(Empty.getDefaultInstance(), it))
+            it -> intercept(context, asyncStub).shutdown(shutdownRequest, it))
     ).then();
   }
 

diff --git a/sdk/src/test/java/io/dapr/client/DaprClientGrpcTest.java b/sdk/src/test/java/io/dapr/client/DaprClientGrpcTest.java
@@ -2372,11 +2372,11 @@ public void stateOptionsConcurrencyValuesHaveValidGrpcEnumMappings() {
   @Test
   public void shutdownTest() {
     doAnswer((Answer<Void>) invocation -> {
-      StreamObserver<Empty> observer = (StreamObserver<Empty>) invocation.getArguments()[1];
-      observer.onNext(Empty.getDefaultInstance());
+      StreamObserver<DaprProtos.ShutdownRequest> observer = (StreamObserver<DaprProtos.ShutdownRequest>) invocation.getArguments()[1];
+      observer.onNext(DaprProtos.ShutdownRequest.getDefaultInstance());
       observer.onCompleted();
       return null;
-    }).when(daprStub).shutdown(any(Empty.class), any());
+    }).when(daprStub).shutdown(any(DaprProtos.ShutdownRequest.class), any());
 
     Mono<Void> result = client.shutdown();
     result.block();