Skip to content

Commit d275f94

Browse files
javier-aliagajavier-aliaga
committed
chore: Refator Proto classes
Signed-off-by: Javier Aliaga <[email protected]>
1 parent f177ad3 commit d275f94

File tree

15 files changed

+1246
-1238
lines changed

15 files changed

+1246
-1238
lines changed

‎pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<grpc.version>1.69.0</grpc.version>
1818
<protobuf.version>3.25.5</protobuf.version>
19-
<dapr.proto.baseurl>https://raw.githubusercontent.com/javier-aliaga/dapr/fix-dapr-proto-java-class/dapr/proto
20-
</dapr.proto.baseurl>
19+
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.17.0-rc.1/dapr/proto</dapr.proto.baseurl>
2120
<durabletask.proto.url>https://raw.githubusercontent.com/dapr/durabletask-protobuf/main/protos/orchestrator_service.proto</durabletask.proto.url>
2221
<dapr.sdk.version>1.17.0-SNAPSHOT</dapr.sdk.version>
2322
<os-maven-plugin.version>1.7.1</os-maven-plugin.version>

‎sdk-actors/src/main/java/io/dapr/actors/client/DaprClientImpl.java‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,15 @@
1515

1616
import com.google.protobuf.ByteString;
1717
import io.dapr.client.resiliency.ResiliencyOptions;
18-
import io.dapr.config.Properties;
1918
import io.dapr.exceptions.DaprException;
2019
import io.dapr.internal.grpc.DaprClientGrpcInterceptors;
2120
import io.dapr.internal.resiliency.RetryPolicy;
2221
import io.dapr.internal.resiliency.TimeoutPolicy;
22+
import io.dapr.v1.DaprActorsProtos;
2323
import io.dapr.v1.DaprGrpc;
24-
import io.dapr.v1.DaprProtos;
25-
import io.grpc.CallOptions;
26-
import io.grpc.Channel;
27-
import io.grpc.ClientCall;
28-
import io.grpc.ClientInterceptor;
29-
import io.grpc.ForwardingClientCall;
30-
import io.grpc.Metadata;
31-
import io.grpc.MethodDescriptor;
3224
import io.grpc.stub.StreamObserver;
3325
import reactor.core.publisher.Mono;
3426
import reactor.core.publisher.MonoSink;
35-
import reactor.util.context.ContextView;
3627

3728
import java.util.Map;
3829
import java.util.concurrent.ExecutionException;
@@ -89,16 +80,16 @@ class DaprClientImpl implements DaprClient {
8980
*/
9081
@Override
9182
public Mono<byte[]> invoke(String actorType, String actorId, String methodName, byte[] jsonPayload) {
92-
DaprProtos.InvokeActorRequest req =
93-
DaprProtos.InvokeActorRequest.newBuilder()
83+
DaprActorsProtos.InvokeActorRequest req =
84+
DaprActorsProtos.InvokeActorRequest.newBuilder()
9485
.setActorType(actorType)
9586
.setActorId(actorId)
9687
.setMethod(methodName)
9788
.putAllMetadata(this.metadata)
9889
.setData(jsonPayload == null ? ByteString.EMPTY : ByteString.copyFrom(jsonPayload))
9990
.build();
10091
return Mono.deferContextual(
101-
context -> this.<DaprProtos.InvokeActorResponse>createMono(
92+
context -> this.<DaprActorsProtos.InvokeActorResponse>createMono(
10293
it -> this.grpcInterceptors.intercept(client, context).invokeActor(req, it)
10394
)
10495
).map(r -> r.getData().toByteArray());

‎sdk-actors/src/main/java/io/dapr/actors/runtime/DaprClientImpl.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import io.dapr.config.Properties;
2121
import io.dapr.exceptions.DaprException;
2222
import io.dapr.utils.DurationUtils;
23+
import io.dapr.v1.DaprActorsProtos;
2324
import io.dapr.v1.DaprGrpc;
24-
import io.dapr.v1.DaprProtos;
2525
import io.grpc.ManagedChannel;
2626
import io.grpc.stub.StreamObserver;
2727
import reactor.core.publisher.Mono;
@@ -78,14 +78,14 @@ class DaprClientImpl implements DaprClient {
7878
*/
7979
@Override
8080
public Mono<byte[]> getState(String actorType, String actorId, String keyName) {
81-
DaprProtos.GetActorStateRequest req =
82-
DaprProtos.GetActorStateRequest.newBuilder()
81+
DaprActorsProtos.GetActorStateRequest req =
82+
DaprActorsProtos.GetActorStateRequest.newBuilder()
8383
.setActorType(actorType)
8484
.setActorId(actorId)
8585
.setKey(keyName)
8686
.build();
8787

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

@@ -97,13 +97,13 @@ public Mono<Void> saveStateTransactionally(
9797
String actorType,
9898
String actorId,
9999
List<ActorStateOperation> operations) {
100-
List<DaprProtos.TransactionalActorStateOperation> grpcOps = new ArrayList<>();
100+
List<DaprActorsProtos.TransactionalActorStateOperation> grpcOps = new ArrayList<>();
101101
for (ActorStateOperation op : operations) {
102102
String operationType = op.getOperationType();
103103
String key = op.getKey();
104104
Object value = op.getValue();
105-
DaprProtos.TransactionalActorStateOperation.Builder opBuilder =
106-
DaprProtos.TransactionalActorStateOperation.newBuilder()
105+
DaprActorsProtos.TransactionalActorStateOperation.Builder opBuilder =
106+
DaprActorsProtos.TransactionalActorStateOperation.newBuilder()
107107
.setOperationType(operationType)
108108
.setKey(key);
109109
if (value != null) {
@@ -126,8 +126,8 @@ public Mono<Void> saveStateTransactionally(
126126
grpcOps.add(opBuilder.build());
127127
}
128128

129-
DaprProtos.ExecuteActorStateTransactionRequest req =
130-
DaprProtos.ExecuteActorStateTransactionRequest.newBuilder()
129+
DaprActorsProtos.ExecuteActorStateTransactionRequest req =
130+
DaprActorsProtos.ExecuteActorStateTransactionRequest.newBuilder()
131131
.setActorType(actorType)
132132
.setActorId(actorId)
133133
.addAllOperations(grpcOps)
@@ -145,8 +145,8 @@ public Mono<Void> registerReminder(
145145
String actorId,
146146
String reminderName,
147147
ActorReminderParams reminderParams) {
148-
DaprProtos.RegisterActorReminderRequest req =
149-
DaprProtos.RegisterActorReminderRequest.newBuilder()
148+
DaprActorsProtos.RegisterActorReminderRequest req =
149+
DaprActorsProtos.RegisterActorReminderRequest.newBuilder()
150150
.setActorType(actorType)
151151
.setActorId(actorId)
152152
.setName(reminderName)
@@ -162,8 +162,8 @@ public Mono<Void> registerReminder(
162162
*/
163163
@Override
164164
public Mono<Void> unregisterReminder(String actorType, String actorId, String reminderName) {
165-
DaprProtos.UnregisterActorReminderRequest req =
166-
DaprProtos.UnregisterActorReminderRequest.newBuilder()
165+
DaprActorsProtos.UnregisterActorReminderRequest req =
166+
DaprActorsProtos.UnregisterActorReminderRequest.newBuilder()
167167
.setActorType(actorType)
168168
.setActorId(actorId)
169169
.setName(reminderName)
@@ -181,8 +181,8 @@ public Mono<Void> registerTimer(
181181
String actorId,
182182
String timerName,
183183
ActorTimerParams timerParams) {
184-
DaprProtos.RegisterActorTimerRequest req =
185-
DaprProtos.RegisterActorTimerRequest.newBuilder()
184+
DaprActorsProtos.RegisterActorTimerRequest req =
185+
DaprActorsProtos.RegisterActorTimerRequest.newBuilder()
186186
.setActorType(actorType)
187187
.setActorId(actorId)
188188
.setName(timerName)
@@ -200,8 +200,8 @@ public Mono<Void> registerTimer(
200200
*/
201201
@Override
202202
public Mono<Void> unregisterTimer(String actorType, String actorId, String timerName) {
203-
DaprProtos.UnregisterActorTimerRequest req =
204-
DaprProtos.UnregisterActorTimerRequest.newBuilder()
203+
DaprActorsProtos.UnregisterActorTimerRequest req =
204+
DaprActorsProtos.UnregisterActorTimerRequest.newBuilder()
205205
.setActorType(actorType)
206206
.setActorId(actorId)
207207
.setName(timerName)

‎sdk-actors/src/test/java/io/dapr/actors/client/DaprGrpcClientTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
package io.dapr.actors.client;
1515

1616
import com.google.protobuf.ByteString;
17+
import io.dapr.v1.DaprActorsProtos;
1718
import io.dapr.v1.DaprGrpc;
18-
import io.dapr.v1.DaprProtos;
1919
import io.grpc.ManagedChannel;
2020
import io.grpc.Status;
2121
import io.grpc.StatusException;
@@ -60,22 +60,22 @@ public class DaprGrpcClientTest {
6060
mock(DaprGrpc.DaprImplBase.class, delegatesTo(
6161
new DaprGrpc.DaprImplBase() {
6262
@Override
63-
public void invokeActor(DaprProtos.InvokeActorRequest request,
64-
StreamObserver<DaprProtos.InvokeActorResponse> responseObserver) {
63+
public void invokeActor(DaprActorsProtos.InvokeActorRequest request,
64+
StreamObserver<DaprActorsProtos.InvokeActorResponse> responseObserver) {
6565
assertEquals(ACTOR_TYPE, request.getActorType());
6666
assertEquals(METHOD_NAME, request.getMethod());
6767
switch (request.getActorId()) {
6868
case ACTOR_ID_OK:
6969
assertArrayEquals(REQUEST_PAYLOAD, request.getData().toByteArray());
7070
responseObserver.onNext(
71-
DaprProtos.InvokeActorResponse.newBuilder().setData(ByteString.copyFrom(RESPONSE_PAYLOAD))
71+
DaprActorsProtos.InvokeActorResponse.newBuilder().setData(ByteString.copyFrom(RESPONSE_PAYLOAD))
7272
.build());
7373
responseObserver.onCompleted();
7474
return;
7575
case ACTOR_ID_NULL_INPUT:
7676
assertArrayEquals(new byte[0], request.getData().toByteArray());
7777
responseObserver.onNext(
78-
DaprProtos.InvokeActorResponse.newBuilder().setData(ByteString.copyFrom(RESPONSE_PAYLOAD))
78+
DaprActorsProtos.InvokeActorResponse.newBuilder().setData(ByteString.copyFrom(RESPONSE_PAYLOAD))
7979
.build());
8080
responseObserver.onCompleted();
8181
return;

0 commit comments

Comments
 (0)