Skip to content

Commit 8fda1c2

Browse files
fix: adapt to durabletask-protobuf proto file split (#1702)
The dapr/durabletask-protobuf#32 PR refactored protos by concept, splitting orchestrator_service.proto into orchestration.proto, history_events.proto, and orchestrator_actions.proto. This broke the build because only the single file was being downloaded. - Download all 4 proto files in durabletask-client/pom.xml - Replace single-file URL property with base URL in parent pom - Update Java type references from OrchestratorService.* to the correct new outer classes: Orchestration, HistoryEvents, OrchestratorActions Signed-off-by: Javier Aliaga <javier@diagrid.io>
1 parent 8f304f6 commit 8fda1c2

11 files changed

Lines changed: 209 additions & 167 deletions

durabletask-client/pom.xml

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,18 +110,57 @@
110110
<version>${download-maven-plugin.version}</version>
111111
<executions>
112112
<execution>
113-
<id>getDaprProto</id>
113+
<id>getOrchestratorServiceProto</id>
114114
<phase>initialize</phase>
115115
<goals>
116116
<goal>wget</goal>
117117
</goals>
118118
<configuration>
119119
<skipCache>true</skipCache>
120-
<url>${durabletask.proto.url}</url>
120+
<url>${durabletask.proto.baseurl}/orchestrator_service.proto</url>
121121
<outputFileName>orchestrator_service.proto</outputFileName>
122122
<outputDirectory>${protobuf.input.directory}</outputDirectory>
123123
</configuration>
124124
</execution>
125+
<execution>
126+
<id>getOrchestrationProto</id>
127+
<phase>initialize</phase>
128+
<goals>
129+
<goal>wget</goal>
130+
</goals>
131+
<configuration>
132+
<skipCache>true</skipCache>
133+
<url>${durabletask.proto.baseurl}/orchestration.proto</url>
134+
<outputFileName>orchestration.proto</outputFileName>
135+
<outputDirectory>${protobuf.input.directory}</outputDirectory>
136+
</configuration>
137+
</execution>
138+
<execution>
139+
<id>getHistoryEventsProto</id>
140+
<phase>initialize</phase>
141+
<goals>
142+
<goal>wget</goal>
143+
</goals>
144+
<configuration>
145+
<skipCache>true</skipCache>
146+
<url>${durabletask.proto.baseurl}/history_events.proto</url>
147+
<outputFileName>history_events.proto</outputFileName>
148+
<outputDirectory>${protobuf.input.directory}</outputDirectory>
149+
</configuration>
150+
</execution>
151+
<execution>
152+
<id>getOrchestratorActionsProto</id>
153+
<phase>initialize</phase>
154+
<goals>
155+
<goal>wget</goal>
156+
</goals>
157+
<configuration>
158+
<skipCache>true</skipCache>
159+
<url>${durabletask.proto.baseurl}/orchestrator_actions.proto</url>
160+
<outputFileName>orchestrator_actions.proto</outputFileName>
161+
<outputDirectory>${protobuf.input.directory}</outputDirectory>
162+
</configuration>
163+
</execution>
125164
</executions>
126165
</plugin>
127166
<plugin>

durabletask-client/src/main/java/io/dapr/durabletask/DurableTaskGrpcWorker.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
package io.dapr.durabletask;
1515

16+
import io.dapr.durabletask.implementation.protobuf.Orchestration;
1617
import io.dapr.durabletask.implementation.protobuf.OrchestratorService;
1718
import io.dapr.durabletask.implementation.protobuf.TaskHubSidecarServiceGrpc;
1819
import io.dapr.durabletask.orchestration.TaskOrchestrationFactories;
@@ -279,7 +280,7 @@ private Context extractTraceContext(OrchestratorService.ActivityRequest activity
279280
return Context.current();
280281
}
281282

282-
OrchestratorService.TraceContext traceContext = activityRequest.getParentTraceContext();
283+
Orchestration.TraceContext traceContext = activityRequest.getParentTraceContext();
283284
String traceParent = traceContext.getTraceParent();
284285

285286
if (traceParent.isEmpty()) {

durabletask-client/src/main/java/io/dapr/durabletask/FailureDetails.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
package io.dapr.durabletask;
1515

1616
import com.google.protobuf.StringValue;
17-
import io.dapr.durabletask.implementation.protobuf.OrchestratorService.TaskFailureDetails;
17+
import io.dapr.durabletask.implementation.protobuf.Orchestration.TaskFailureDetails;
1818

1919
import javax.annotation.Nonnull;
2020
import javax.annotation.Nullable;

durabletask-client/src/main/java/io/dapr/durabletask/OrchestrationMetadata.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
package io.dapr.durabletask;
1515

16+
import io.dapr.durabletask.implementation.protobuf.Orchestration.OrchestrationState;
1617
import io.dapr.durabletask.implementation.protobuf.OrchestratorService;
17-
import io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationState;
1818

1919
import java.time.Instant;
2020

durabletask-client/src/main/java/io/dapr/durabletask/OrchestrationRuntimeStatus.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313

1414
package io.dapr.durabletask;
1515

16-
import io.dapr.durabletask.implementation.protobuf.OrchestratorService;
16+
import io.dapr.durabletask.implementation.protobuf.Orchestration;
1717

18-
import static io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationStatus.ORCHESTRATION_STATUS_CANCELED;
19-
import static io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationStatus.ORCHESTRATION_STATUS_COMPLETED;
20-
import static io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationStatus.ORCHESTRATION_STATUS_CONTINUED_AS_NEW;
21-
import static io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationStatus.ORCHESTRATION_STATUS_FAILED;
22-
import static io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationStatus.ORCHESTRATION_STATUS_PENDING;
23-
import static io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationStatus.ORCHESTRATION_STATUS_RUNNING;
24-
import static io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationStatus.ORCHESTRATION_STATUS_SUSPENDED;
25-
import static io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationStatus.ORCHESTRATION_STATUS_TERMINATED;
18+
import static io.dapr.durabletask.implementation.protobuf.Orchestration.OrchestrationStatus.ORCHESTRATION_STATUS_CANCELED;
19+
import static io.dapr.durabletask.implementation.protobuf.Orchestration.OrchestrationStatus.ORCHESTRATION_STATUS_COMPLETED;
20+
import static io.dapr.durabletask.implementation.protobuf.Orchestration.OrchestrationStatus.ORCHESTRATION_STATUS_CONTINUED_AS_NEW;
21+
import static io.dapr.durabletask.implementation.protobuf.Orchestration.OrchestrationStatus.ORCHESTRATION_STATUS_FAILED;
22+
import static io.dapr.durabletask.implementation.protobuf.Orchestration.OrchestrationStatus.ORCHESTRATION_STATUS_PENDING;
23+
import static io.dapr.durabletask.implementation.protobuf.Orchestration.OrchestrationStatus.ORCHESTRATION_STATUS_RUNNING;
24+
import static io.dapr.durabletask.implementation.protobuf.Orchestration.OrchestrationStatus.ORCHESTRATION_STATUS_SUSPENDED;
25+
import static io.dapr.durabletask.implementation.protobuf.Orchestration.OrchestrationStatus.ORCHESTRATION_STATUS_TERMINATED;
2626

2727
/**
2828
* Enum describing the runtime status of the orchestration.
@@ -75,7 +75,7 @@ public enum OrchestrationRuntimeStatus {
7575
*/
7676
STALLED;
7777

78-
static OrchestrationRuntimeStatus fromProtobuf(OrchestratorService.OrchestrationStatus status) {
78+
static OrchestrationRuntimeStatus fromProtobuf(Orchestration.OrchestrationStatus status) {
7979
switch (status) {
8080
case ORCHESTRATION_STATUS_RUNNING:
8181
return RUNNING;
@@ -100,7 +100,7 @@ static OrchestrationRuntimeStatus fromProtobuf(OrchestratorService.Orchestration
100100
}
101101
}
102102

103-
static OrchestratorService.OrchestrationStatus toProtobuf(OrchestrationRuntimeStatus status) {
103+
static Orchestration.OrchestrationStatus toProtobuf(OrchestrationRuntimeStatus status) {
104104
switch (status) {
105105
case RUNNING:
106106
return ORCHESTRATION_STATUS_RUNNING;

0 commit comments

Comments
 (0)