Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@ jobs:
GOARCH: amd64
GOPROXY: https://proxy.golang.org
JDK_VER: ${{ matrix.java }}
DAPR_CLI_VER: 1.15.0
DAPR_RUNTIME_VER: 1.16.0-rc.5
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
DAPR_CLI_VER: 1.16.5
DAPR_RUNTIME_VER: 1.17.0-rc.2
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.16.5/install/install.sh
DAPR_CLI_REF:
DAPR_REF:
TOXIPROXY_URL: https://github.com/Shopify/toxiproxy/releases/download/v2.5.0/toxiproxy-server-linux-amd64
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ jobs:
GOARCH: amd64
GOPROXY: https://proxy.golang.org
JDK_VER: ${{ matrix.java }}
DAPR_CLI_VER: 1.15.0
DAPR_RUNTIME_VER: 1.16.0-rc.5
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
DAPR_CLI_VER: 1.16.5
DAPR_RUNTIME_VER: 1.17.0-rc.2
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.16.5/install/install.sh
DAPR_CLI_REF:
DAPR_REF:
steps:
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.69.0</grpc.version>
<protobuf.version>3.25.5</protobuf.version>
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.16.0-rc.5/dapr/proto</dapr.proto.baseurl>
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.17.0-rc.2/dapr/proto</dapr.proto.baseurl>
<durabletask.proto.url>https://raw.githubusercontent.com/dapr/durabletask-protobuf/main/protos/orchestrator_service.proto</durabletask.proto.url>
<dapr.sdk.version>1.17.0-SNAPSHOT</dapr.sdk.version>
<os-maven-plugin.version>1.7.1</os-maven-plugin.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,15 @@

import com.google.protobuf.ByteString;
import io.dapr.client.resiliency.ResiliencyOptions;
import io.dapr.config.Properties;
import io.dapr.exceptions.DaprException;
import io.dapr.internal.grpc.DaprClientGrpcInterceptors;
import io.dapr.internal.resiliency.RetryPolicy;
import io.dapr.internal.resiliency.TimeoutPolicy;
import io.dapr.v1.DaprActorsProtos;
import io.dapr.v1.DaprGrpc;
import io.dapr.v1.DaprProtos;
import io.grpc.CallOptions;
import io.grpc.Channel;
import io.grpc.ClientCall;
import io.grpc.ClientInterceptor;
import io.grpc.ForwardingClientCall;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.stub.StreamObserver;
import reactor.core.publisher.Mono;
import reactor.core.publisher.MonoSink;
import reactor.util.context.ContextView;

import java.util.Map;
import java.util.concurrent.ExecutionException;
Expand Down Expand Up @@ -89,16 +80,16 @@ class DaprClientImpl implements DaprClient {
*/
@Override
public Mono<byte[]> invoke(String actorType, String actorId, String methodName, byte[] jsonPayload) {
DaprProtos.InvokeActorRequest req =
DaprProtos.InvokeActorRequest.newBuilder()
DaprActorsProtos.InvokeActorRequest req =
DaprActorsProtos.InvokeActorRequest.newBuilder()
.setActorType(actorType)
.setActorId(actorId)
.setMethod(methodName)
.putAllMetadata(this.metadata)
.setData(jsonPayload == null ? ByteString.EMPTY : ByteString.copyFrom(jsonPayload))
.build();
return Mono.deferContextual(
context -> this.<DaprProtos.InvokeActorResponse>createMono(
context -> this.<DaprActorsProtos.InvokeActorResponse>createMono(
it -> this.grpcInterceptors.intercept(client, context).invokeActor(req, it)
)
).map(r -> r.getData().toByteArray());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import io.dapr.config.Properties;
import io.dapr.exceptions.DaprException;
import io.dapr.utils.DurationUtils;
import io.dapr.v1.DaprActorsProtos;
import io.dapr.v1.DaprGrpc;
import io.dapr.v1.DaprProtos;
import io.grpc.ManagedChannel;
import io.grpc.stub.StreamObserver;
import reactor.core.publisher.Mono;
Expand Down Expand Up @@ -78,14 +78,14 @@ class DaprClientImpl implements DaprClient {
*/
@Override
public Mono<byte[]> getState(String actorType, String actorId, String keyName) {
DaprProtos.GetActorStateRequest req =
DaprProtos.GetActorStateRequest.newBuilder()
DaprActorsProtos.GetActorStateRequest req =
DaprActorsProtos.GetActorStateRequest.newBuilder()
.setActorType(actorType)
.setActorId(actorId)
.setKey(keyName)
.build();

return Mono.<DaprProtos.GetActorStateResponse>create(it ->
return Mono.<DaprActorsProtos.GetActorStateResponse>create(it ->
client.getActorState(req, createStreamObserver(it))).map(r -> r.getData().toByteArray());
}

Expand All @@ -97,13 +97,13 @@ public Mono<Void> saveStateTransactionally(
String actorType,
String actorId,
List<ActorStateOperation> operations) {
List<DaprProtos.TransactionalActorStateOperation> grpcOps = new ArrayList<>();
List<DaprActorsProtos.TransactionalActorStateOperation> grpcOps = new ArrayList<>();
for (ActorStateOperation op : operations) {
String operationType = op.getOperationType();
String key = op.getKey();
Object value = op.getValue();
DaprProtos.TransactionalActorStateOperation.Builder opBuilder =
DaprProtos.TransactionalActorStateOperation.newBuilder()
DaprActorsProtos.TransactionalActorStateOperation.Builder opBuilder =
DaprActorsProtos.TransactionalActorStateOperation.newBuilder()
.setOperationType(operationType)
.setKey(key);
if (value != null) {
Expand All @@ -126,8 +126,8 @@ public Mono<Void> saveStateTransactionally(
grpcOps.add(opBuilder.build());
}

DaprProtos.ExecuteActorStateTransactionRequest req =
DaprProtos.ExecuteActorStateTransactionRequest.newBuilder()
DaprActorsProtos.ExecuteActorStateTransactionRequest req =
DaprActorsProtos.ExecuteActorStateTransactionRequest.newBuilder()
.setActorType(actorType)
.setActorId(actorId)
.addAllOperations(grpcOps)
Expand All @@ -145,8 +145,8 @@ public Mono<Void> registerReminder(
String actorId,
String reminderName,
ActorReminderParams reminderParams) {
DaprProtos.RegisterActorReminderRequest req =
DaprProtos.RegisterActorReminderRequest.newBuilder()
DaprActorsProtos.RegisterActorReminderRequest req =
DaprActorsProtos.RegisterActorReminderRequest.newBuilder()
.setActorType(actorType)
.setActorId(actorId)
.setName(reminderName)
Expand All @@ -162,8 +162,8 @@ public Mono<Void> registerReminder(
*/
@Override
public Mono<Void> unregisterReminder(String actorType, String actorId, String reminderName) {
DaprProtos.UnregisterActorReminderRequest req =
DaprProtos.UnregisterActorReminderRequest.newBuilder()
DaprActorsProtos.UnregisterActorReminderRequest req =
DaprActorsProtos.UnregisterActorReminderRequest.newBuilder()
.setActorType(actorType)
.setActorId(actorId)
.setName(reminderName)
Expand All @@ -181,8 +181,8 @@ public Mono<Void> registerTimer(
String actorId,
String timerName,
ActorTimerParams timerParams) {
DaprProtos.RegisterActorTimerRequest req =
DaprProtos.RegisterActorTimerRequest.newBuilder()
DaprActorsProtos.RegisterActorTimerRequest req =
DaprActorsProtos.RegisterActorTimerRequest.newBuilder()
.setActorType(actorType)
.setActorId(actorId)
.setName(timerName)
Expand All @@ -200,8 +200,8 @@ public Mono<Void> registerTimer(
*/
@Override
public Mono<Void> unregisterTimer(String actorType, String actorId, String timerName) {
DaprProtos.UnregisterActorTimerRequest req =
DaprProtos.UnregisterActorTimerRequest.newBuilder()
DaprActorsProtos.UnregisterActorTimerRequest req =
DaprActorsProtos.UnregisterActorTimerRequest.newBuilder()
.setActorType(actorType)
.setActorId(actorId)
.setName(timerName)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
package io.dapr.actors.client;

import com.google.protobuf.ByteString;
import io.dapr.v1.DaprActorsProtos;
import io.dapr.v1.DaprGrpc;
import io.dapr.v1.DaprProtos;
import io.grpc.ManagedChannel;
import io.grpc.Status;
import io.grpc.StatusException;
Expand Down Expand Up @@ -60,22 +60,22 @@ public class DaprGrpcClientTest {
mock(DaprGrpc.DaprImplBase.class, delegatesTo(
new DaprGrpc.DaprImplBase() {
@Override
public void invokeActor(DaprProtos.InvokeActorRequest request,
StreamObserver<DaprProtos.InvokeActorResponse> responseObserver) {
public void invokeActor(DaprActorsProtos.InvokeActorRequest request,
StreamObserver<DaprActorsProtos.InvokeActorResponse> responseObserver) {
assertEquals(ACTOR_TYPE, request.getActorType());
assertEquals(METHOD_NAME, request.getMethod());
switch (request.getActorId()) {
case ACTOR_ID_OK:
assertArrayEquals(REQUEST_PAYLOAD, request.getData().toByteArray());
responseObserver.onNext(
DaprProtos.InvokeActorResponse.newBuilder().setData(ByteString.copyFrom(RESPONSE_PAYLOAD))
DaprActorsProtos.InvokeActorResponse.newBuilder().setData(ByteString.copyFrom(RESPONSE_PAYLOAD))
.build());
responseObserver.onCompleted();
return;
case ACTOR_ID_NULL_INPUT:
assertArrayEquals(new byte[0], request.getData().toByteArray());
responseObserver.onNext(
DaprProtos.InvokeActorResponse.newBuilder().setData(ByteString.copyFrom(RESPONSE_PAYLOAD))
DaprActorsProtos.InvokeActorResponse.newBuilder().setData(ByteString.copyFrom(RESPONSE_PAYLOAD))
.build());
responseObserver.onCompleted();
return;
Expand Down
Loading
Loading