dapr
/
java-sdk
mirror of https://github.com/dapr/java-sdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Cassie Coyle 2024-02-15 15:19:16 -06:00 committed by GitHub
parent 81e6c4d907
commit baef245db6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/validate.yml vendored
View File

@ -38,7 +38,7 @@ jobs:
GOPROXY: https://proxy.golang.org GOPROXY: https://proxy.golang.org
JDK_VER: ${{ matrix.java }} JDK_VER: ${{ matrix.java }}
DAPR_CLI_VER: 1.12.0 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_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.12.0/install/install.sh
DAPR_CLI_REF: DAPR_CLI_REF:
DAPR_REF: DAPR_REF:

2
pom.xml
View File

@ -16,7 +16,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.59.0</grpc.version> <grpc.version>1.59.0</grpc.version>
<protobuf.version>3.17.3</protobuf.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> <dapr.sdk-workflows.version>0.11.0-SNAPSHOT</dapr.sdk-workflows.version>
<os-maven-plugin.version>1.6.2</os-maven-plugin.version> <os-maven-plugin.version>1.6.2</os-maven-plugin.version>
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version> <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>

3
sdk/src/main/java/io/dapr/client/DaprClientGrpc.java
View File

@ -976,9 +976,10 @@ public class DaprClientGrpc extends AbstractDaprClient {
*/ */
@Override @Override
public Mono<Void> shutdown() { public Mono<Void> shutdown() {
DaprProtos.ShutdownRequest shutdownRequest = DaprProtos.ShutdownRequest.newBuilder().build();
return Mono.deferContextual( return Mono.deferContextual(
context -> this.<Empty>createMono( context -> this.<Empty>createMono(
it -> intercept(context, asyncStub).shutdown(Empty.getDefaultInstance(), it)) it -> intercept(context, asyncStub).shutdown(shutdownRequest, it))
).then(); ).then();
} }

6
sdk/src/test/java/io/dapr/client/DaprClientGrpcTest.java
View File

@ -2372,11 +2372,11 @@ public class DaprClientGrpcTest {
@Test @Test
public void shutdownTest() { public void shutdownTest() {
doAnswer((Answer<Void>) invocation -> { doAnswer((Answer<Void>) invocation -> {
StreamObserver<Empty> observer = (StreamObserver<Empty>) invocation.getArguments()[1]; StreamObserver<DaprProtos.ShutdownRequest> observer = (StreamObserver<DaprProtos.ShutdownRequest>) invocation.getArguments()[1];
observer.onNext(Empty.getDefaultInstance()); observer.onNext(DaprProtos.ShutdownRequest.getDefaultInstance());
observer.onCompleted(); observer.onCompleted();
return null; return null;
}).when(daprStub).shutdown(any(Empty.class), any()); }).when(daprStub).shutdown(any(DaprProtos.ShutdownRequest.class), any());
Mono<Void> result = client.shutdown(); Mono<Void> result = client.shutdown();
result.block(); result.block();