Skip to content

Commit d75b253

Browse files
Quinn-With-Two-NsQuinn-With-Two-Ns
authored
Update Proto API to v1.50.0 (#2581)
Update proto API to v1.50.0
1 parent fd648d1 commit d75b253

File tree

12 files changed

+31
-32
lines changed

12 files changed

+31
-32
lines changed

‎temporal-sdk/src/main/java/io/temporal/failure/DefaultFailureConverter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public RuntimeException failureToException(
7070
return result;
7171
}
7272

73+
@SuppressWarnings("deprecation") // Continue to check operation id for history compatibility
7374
private RuntimeException failureToExceptionImpl(Failure failure, DataConverter dataConverter) {
7475
Exception cause =
7576
failure.hasCause() ? failureToException(failure.getCause(), dataConverter) : null;
@@ -217,6 +218,7 @@ public Failure exceptionToFailure(
217218
}
218219

219220
@Nonnull
221+
@SuppressWarnings("deprecation") // Continue to check operation id for history compatibility
220222
private Failure exceptionToFailure(Throwable throwable) {
221223
if (throwable instanceof CheckedExceptionWrapper) {
222224
return exceptionToFailure(throwable.getCause());

‎temporal-sdk/src/main/java/io/temporal/internal/nexus/NexusTaskHandlerImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ private void cancelOperation(OperationContext context, OperationCancelDetails de
179179
}
180180
}
181181

182+
@SuppressWarnings("deprecation") // Continue to check operation id for history compatibility
182183
private CancelOperationResponse handleCancelledOperation(
183184
OperationContext.Builder ctx, CancelOperationRequest task) {
184185
ctx.setService(task.getService()).setOperation(task.getOperation());
@@ -237,6 +238,7 @@ private OperationStartResult<HandlerResultContent> startOperation(
237238
}
238239
}
239240

241+
@SuppressWarnings("deprecation") // Continue to check operation id for history compatibility
240242
private StartOperationResponse handleStartOperation(
241243
OperationContext.Builder ctx, StartOperationRequest task) {
242244
ctx.setService(task.getService()).setOperation(task.getOperation());

‎temporal-sdk/src/main/java/io/temporal/internal/statemachines/NexusOperationStateMachine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,11 @@ private void cancelNexusOperationCommand() {
160160
completionCallback.apply(Optional.empty(), failure);
161161
}
162162

163+
@SuppressWarnings("deprecation") // Continue to check operation id for history compatibility
163164
private void notifyStarted() {
164165
async = true;
165166
String operationToken =
166167
currentEvent.getNexusOperationStartedEventAttributes().getOperationToken();
167-
// TODO(#2423) Remove support for operationId
168168
String operationId = currentEvent.getNexusOperationStartedEventAttributes().getOperationId();
169169
startedCallback.apply(
170170
Optional.of(operationToken.isEmpty() ? operationId : operationToken), null);

‎temporal-sdk/src/test/java/io/temporal/internal/nexus/NexusTaskHandlerImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public void startAsyncSyncOperation() throws TimeoutException {
156156
Assert.assertNull(result.getHandlerError());
157157
Assert.assertNotNull(result.getResponse());
158158
Assert.assertEquals(
159-
"test id", result.getResponse().getStartOperation().getAsyncSuccess().getOperationId());
159+
"test id", result.getResponse().getStartOperation().getAsyncSuccess().getOperationToken());
160160
}
161161

162162
@ServiceImpl(service = TestNexusServices.TestNexusService1.class)

‎temporal-sdk/src/test/java/io/temporal/internal/statemachines/CancelNexusOperationStateMachineTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ protected void buildWorkflow(AsyncWorkflowBuilder<Void> builder) {
105105
NexusOperationStartedEventAttributes.newBuilder()
106106
.setScheduledEventId(scheduledEventId)
107107
.setRequestId("requestId")
108-
.setOperationId(OPERATION_ID)
108+
.setOperationToken(OPERATION_ID)
109109
.build())
110110
.addWorkflowTask();
111111
long cancelRequestedEventId =
@@ -196,7 +196,7 @@ protected void buildWorkflow(AsyncWorkflowBuilder<Void> builder) {
196196
NexusOperationStartedEventAttributes.newBuilder()
197197
.setScheduledEventId(scheduledEventId)
198198
.setRequestId("requestId")
199-
.setOperationId(OPERATION_ID)
199+
.setOperationToken(OPERATION_ID)
200200
.build())
201201
.addWorkflowTask();
202202
long cancelRequestedEventId =

‎temporal-sdk/src/test/java/io/temporal/internal/statemachines/NexusOperationStateMachineTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ public void buildWorkflow(AsyncWorkflowBuilder<Void> builder) {
461461
NexusOperationStartedEventAttributes.newBuilder()
462462
.setScheduledEventId(scheduledEventId)
463463
.setRequestId("requestId")
464-
.setOperationId(OPERATION_ID)
464+
.setOperationToken(OPERATION_ID)
465465
.build());
466466
h.addWorkflowTask();
467467
h.add(
@@ -553,7 +553,7 @@ public void buildWorkflow(AsyncWorkflowBuilder<Void> builder) {
553553
NexusOperationStartedEventAttributes.newBuilder()
554554
.setScheduledEventId(scheduledEventId)
555555
.setRequestId("requestId")
556-
.setOperationId(OPERATION_ID)
556+
.setOperationToken(OPERATION_ID)
557557
.build());
558558
h.addWorkflowTask();
559559
h.add(
@@ -645,7 +645,7 @@ public void buildWorkflow(AsyncWorkflowBuilder<Void> builder) {
645645
NexusOperationStartedEventAttributes.newBuilder()
646646
.setScheduledEventId(scheduledEventId)
647647
.setRequestId("requestId")
648-
.setOperationId(OPERATION_ID)
648+
.setOperationToken(OPERATION_ID)
649649
.build());
650650
h.addWorkflowTask();
651651
h.add(
@@ -737,7 +737,7 @@ public void buildWorkflow(AsyncWorkflowBuilder<Void> builder) {
737737
NexusOperationStartedEventAttributes.newBuilder()
738738
.setScheduledEventId(scheduledEventId)
739739
.setRequestId("requestId")
740-
.setOperationId(OPERATION_ID)
740+
.setOperationToken(OPERATION_ID)
741741
.build());
742742
h.addWorkflowTask();
743743
h.add(

‎temporal-sdk/src/test/java/io/temporal/workflow/updateTest/UpdateTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ public void testUpdateResets() {
268268
assertEquals("Execute-Hello Update", workflow.update(0, "Hello Update"));
269269

270270
// Reset the workflow
271+
@SuppressWarnings("deprecation")
271272
ResetWorkflowExecutionResponse resetResponse =
272273
workflowClient
273274
.getWorkflowServiceStubs()

‎temporal-serviceclient/src/main/proto

‎temporal-test-server/src/main/java/io/temporal/internal/testservice/StateMachines.java

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ static final class NexusOperationData {
315315
// Timeout for an individual Start or Cancel Operation request.
316316
final Duration requestTimeout = Durations.fromSeconds(10);
317317

318-
String operationId = "";
318+
String operationToken = "";
319319
Endpoint endpoint;
320320
NexusOperationScheduledEventAttributes scheduledEvent;
321321
TestWorkflowStore.NexusTask nexusTask;
@@ -739,7 +739,6 @@ private static void startNexusOperation(
739739
.setEventType(EventType.EVENT_TYPE_NEXUS_OPERATION_STARTED)
740740
.setNexusOperationStartedEventAttributes(
741741
NexusOperationStartedEventAttributes.newBuilder()
742-
.setOperationId(resp.getOperationId())
743742
.setOperationToken(resp.getOperationToken())
744743
.setScheduledEventId(data.scheduledEventId)
745744
.setRequestId(data.scheduledEvent.getRequestId()));
@@ -753,7 +752,7 @@ private static void startNexusOperation(
753752
}
754753

755754
ctx.addEvent(event.build());
756-
ctx.onCommit(historySize -> data.operationId = resp.getOperationId());
755+
ctx.onCommit(historySize -> data.operationToken = resp.getOperationToken());
757756
}
758757

759758
private static void completeNexusOperation(
@@ -784,7 +783,7 @@ private static void timeoutNexusOperation(
784783
.setEndpoint(data.scheduledEvent.getEndpoint())
785784
.setService(data.scheduledEvent.getService())
786785
.setOperation(data.scheduledEvent.getOperation())
787-
.setOperationId(data.operationId)
786+
.setOperationToken(data.operationToken)
788787
.setScheduledEventId(data.scheduledEventId))
789788
.setCause(
790789
Failure.newBuilder()
@@ -823,7 +822,7 @@ private static State failNexusOperation(
823822
.setEndpoint(data.scheduledEvent.getEndpoint())
824823
.setService(data.scheduledEvent.getService())
825824
.setOperation(data.scheduledEvent.getOperation())
826-
.setOperationId(data.operationId)
825+
.setOperationToken(data.operationToken)
827826
.setScheduledEventId(data.scheduledEventId)
828827
.build())
829828
.build()))
@@ -838,7 +837,7 @@ private static State failNexusOperation(
838837
// operation's schedule-to-close timeout, so do not fail the operation here and allow
839838
// it to be timed out by the timer set in
840839
// io.temporal.internal.testservice.TestWorkflowMutableStateImpl.timeoutNexusOperation
841-
return (Strings.isNullOrEmpty(data.operationId)) ? INITIATED : STARTED;
840+
return (Strings.isNullOrEmpty(data.operationToken)) ? INITIATED : STARTED;
842841
}
843842

844843
Failure wrapped =
@@ -849,7 +848,7 @@ private static State failNexusOperation(
849848
.setEndpoint(data.scheduledEvent.getEndpoint())
850849
.setService(data.scheduledEvent.getService())
851850
.setOperation(data.scheduledEvent.getOperation())
852-
.setOperationId(data.operationId)
851+
.setOperationToken(data.operationToken)
853852
.setScheduledEventId(data.scheduledEventId))
854853
.setCause(failure)
855854
.build();
@@ -953,7 +952,7 @@ private static void requestCancelNexusOperation(
953952
io.temporal.api.nexus.v1.Request.newBuilder()
954953
.setCancelOperation(
955954
CancelOperationRequest.newBuilder()
956-
.setOperationId(data.operationId)
955+
.setOperationToken(data.operationToken)
957956
.setOperation(data.scheduledEvent.getOperation())
958957
.setService(data.scheduledEvent.getService())));
959958

@@ -986,7 +985,7 @@ private static void reportNexusOperationCancellation(
986985
.setEndpoint(data.scheduledEvent.getEndpoint())
987986
.setService(data.scheduledEvent.getService())
988987
.setOperation(data.scheduledEvent.getOperation())
989-
.setOperationId(data.operationId)
988+
.setOperationToken(data.operationToken)
990989
.setScheduledEventId(data.scheduledEventId));
991990
if (failure != null) {
992991
wrapped.setCause(failure);
@@ -1128,7 +1127,6 @@ private static void initiateChildWorkflow(
11281127
long workflowTaskCompletedEventId) {
11291128
StartChildWorkflowExecutionInitiatedEventAttributes.Builder a =
11301129
StartChildWorkflowExecutionInitiatedEventAttributes.newBuilder()
1131-
.setControl(d.getControl())
11321130
.setInput(d.getInput())
11331131
.setWorkflowTaskCompletedEventId(workflowTaskCompletedEventId)
11341132
.setNamespace(d.getNamespace().isEmpty() ? ctx.getNamespace() : d.getNamespace())
@@ -1371,6 +1369,7 @@ private static void completeWorkflow(
13711369
ctx.addEvent(event);
13721370
}
13731371

1372+
@SuppressWarnings("deprecation")
13741373
private static void continueAsNewWorkflow(
13751374
RequestContext ctx,
13761375
WorkflowData data,
@@ -2389,7 +2388,6 @@ private static void initiateExternalSignal(
23892388
SignalExternalWorkflowExecutionInitiatedEventAttributes.Builder a =
23902389
SignalExternalWorkflowExecutionInitiatedEventAttributes.newBuilder()
23912390
.setWorkflowTaskCompletedEventId(workflowTaskCompletedEventId)
2392-
.setControl(d.getControl())
23932391
.setInput(d.getInput())
23942392
.setNamespace(d.getNamespace())
23952393
.setChildWorkflowOnly(d.getChildWorkflowOnly())
@@ -2419,7 +2417,6 @@ private static void failExternalSignal(
24192417
SignalExternalWorkflowExecutionFailedEventAttributes.newBuilder()
24202418
.setInitiatedEventId(data.initiatedEventId)
24212419
.setWorkflowExecution(initiatedEvent.getWorkflowExecution())
2422-
.setControl(initiatedEvent.getControl())
24232420
.setCause(cause)
24242421
.setNamespace(initiatedEvent.getNamespace());
24252422
HistoryEvent event =
@@ -2439,7 +2436,6 @@ private static void completeExternalSignal(
24392436
ExternalWorkflowExecutionSignaledEventAttributes.newBuilder()
24402437
.setInitiatedEventId(data.initiatedEventId)
24412438
.setWorkflowExecution(signaledExecution)
2442-
.setControl(initiatedEvent.getControl())
24432439
.setNamespace(initiatedEvent.getNamespace());
24442440
HistoryEvent event =
24452441
HistoryEvent.newBuilder()
@@ -2457,7 +2453,6 @@ private static void initiateExternalCancellation(
24572453
RequestCancelExternalWorkflowExecutionInitiatedEventAttributes.Builder a =
24582454
RequestCancelExternalWorkflowExecutionInitiatedEventAttributes.newBuilder()
24592455
.setWorkflowTaskCompletedEventId(workflowTaskCompletedEventId)
2460-
.setControl(d.getControl())
24612456
.setNamespace(d.getNamespace())
24622457
.setChildWorkflowOnly(d.getChildWorkflowOnly())
24632458
.setWorkflowExecution(
@@ -2511,7 +2506,6 @@ private static void failExternalCancellation(
25112506
RequestCancelExternalWorkflowExecutionFailedEventAttributes.newBuilder()
25122507
.setInitiatedEventId(data.initiatedEventId)
25132508
.setWorkflowExecution(initiatedEvent.getWorkflowExecution())
2514-
.setControl(initiatedEvent.getControl())
25152509
.setCause(cause)
25162510
.setNamespace(initiatedEvent.getNamespace());
25172511
HistoryEvent event =

‎temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowMutableStateImpl.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2358,7 +2358,7 @@ public void completeNexusOperation(NexusOperationRef ref, Payload result) {
23582358
public void completeAsyncNexusOperation(
23592359
NexusOperationRef ref,
23602360
Payload result,
2361-
String operationID,
2361+
String operationToken,
23622362
io.temporal.api.nexus.v1.Link startLink) {
23632363
update(
23642364
ctx -> {
@@ -2368,7 +2368,7 @@ public void completeAsyncNexusOperation(
23682368
// Received completion before start, so fabricate started event.
23692369
StartOperationResponse.Async start =
23702370
StartOperationResponse.Async.newBuilder()
2371-
.setOperationId(operationID)
2371+
.setOperationToken(operationToken)
23722372
.addLinks(startLink)
23732373
.build();
23742374
operation.action(Action.START, ctx, start, 0);
@@ -2487,7 +2487,7 @@ private void retryNexusTask(RequestContext ctx, StateMachine<NexusOperationData>
24872487

24882488
LockHandle lockHandle =
24892489
timerService.lockTimeSkipping(
2490-
"nexusOperationRetryTimer " + operation.getData().operationId);
2490+
"nexusOperationRetryTimer " + operation.getData().operationToken);
24912491
boolean unlockTimer = false;
24922492
data.isBackingOff = false;
24932493

@@ -2506,7 +2506,7 @@ private void retryNexusTask(RequestContext ctx, StateMachine<NexusOperationData>
25062506
} finally {
25072507
if (unlockTimer) {
25082508
// Allow time skipping when waiting for an operation retry
2509-
lockHandle.unlock("nexusOperationRetryTimer " + operation.getData().operationId);
2509+
lockHandle.unlock("nexusOperationRetryTimer " + operation.getData().operationToken);
25102510
}
25112511
}
25122512
},
@@ -3361,7 +3361,7 @@ private static PendingNexusOperationInfo constructPendingNexusOperationInfo(
33613361
.setEndpoint(data.scheduledEvent.getEndpoint())
33623362
.setService(data.scheduledEvent.getService())
33633363
.setOperation(data.scheduledEvent.getOperation())
3364-
.setOperationId(data.operationId)
3364+
.setOperationToken(data.operationToken)
33653365
.setScheduledEventId(data.scheduledEventId)
33663366
.setScheduleToCloseTimeout(data.scheduledEvent.getScheduleToCloseTimeout())
33673367
.setState(convertNexusOperationState(sm.getState(), data))

0 commit comments

Comments
 (0)