Do not add accepted/rejected request to messages (#1787)

Avoids including the full initial request in the Acceptance and
Rejection messages from the update protocol. Server has been updated to
not expect these fields.

Author: Matt McShane

temporal-sdk/src/main/java/io/temporal/internal/statemachines/UpdateProtocolStateMachine.java

@@ -30,6 +30,7 @@
 import io.temporal.api.failure.v1.Failure;
 import io.temporal.api.protocol.v1.Message;
 import io.temporal.api.update.v1.Acceptance;
+import io.temporal.api.update.v1.Meta;
 import io.temporal.api.update.v1.Outcome;
 import io.temporal.api.update.v1.Rejection;
 import io.temporal.api.update.v1.Request;
@@ -77,7 +78,7 @@ enum State {
   private String protoInstanceID;
   private String requestMsgId;
   private long requestSeqID;
-  private Request initialRequest;
+  private Meta meta;
   private String messageId;
 
   public static final StateMachineDefinition<State, ExplicitEvent, UpdateProtocolStateMachine>
@@ -174,7 +175,7 @@ void triggerUpdate() {
     requestMsgId = this.currentMessage.getId();
     requestSeqID = this.currentMessage.getEventId();
     try {
-      initialRequest = this.currentMessage.getBody().unpack(Request.class);
+      meta = this.currentMessage.getBody().unpack(Request.class).getMeta();
     } catch (InvalidProtocolBufferException e) {
       throw new IllegalArgumentException("Current message not an update:" + this.currentMessage);
     }
@@ -198,7 +199,6 @@ public void accept() {
         Acceptance.newBuilder()
             .setAcceptedRequestMessageId(requestMsgId)
             .setAcceptedRequestSequencingEventId(requestSeqID)
-            .setAcceptedRequest(initialRequest)
             .build();
 
     messageId = requestMsgId + "/accept";
@@ -216,7 +216,6 @@ public void reject(Failure failure) {
         Rejection.newBuilder()
             .setRejectedRequestMessageId(requestMsgId)
             .setRejectedRequestSequencingEventId(requestSeqID)
-            .setRejectedRequest(initialRequest)
             .setFailure(failure)
             .build();
 
@@ -238,8 +237,7 @@ public void complete(Optional<Payloads> payload, Failure failure) {
       outcome = outcome.setSuccess(payload.isPresent() ? payload.get() : null);
     }
 
-    Response outcomeResponse =
-        Response.newBuilder().setOutcome(outcome).setMeta(initialRequest.getMeta()).build();
+    Response outcomeResponse = Response.newBuilder().setOutcome(outcome).setMeta(meta).build();
 
     messageId = requestMsgId + "/complete";
     sendHandle.apply(

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

@@ -430,12 +430,15 @@ static final class UpdateWorkflowExecutionData {
     final String id;
     final CompletableFuture<UpdateWorkflowExecutionResponse> acceptance;
     final CompletableFuture<UpdateWorkflowExecutionResponse> complete;
+    final Request initialRequest;
 
     public UpdateWorkflowExecutionData(
         String id,
+        Request initialRequest,
         CompletableFuture<UpdateWorkflowExecutionResponse> acceptance,
         CompletableFuture<UpdateWorkflowExecutionResponse> complete) {
       this.id = id;
+      this.initialRequest = initialRequest;
       this.acceptance = acceptance;
       this.complete = complete;
     }
@@ -561,9 +564,11 @@ public static StateMachine<ChildWorkflowData> newChildWorkflowStateMachine(
 
   public static StateMachine<UpdateWorkflowExecutionData> newUpdateWorkflowExecution(
       String updateId,
+      Request initialRequest,
       CompletableFuture<UpdateWorkflowExecutionResponse> acceptance,
       CompletableFuture<UpdateWorkflowExecutionResponse> complete) {
-    return new StateMachine<>(new UpdateWorkflowExecutionData(updateId, acceptance, complete))
+    return new StateMachine<>(
+            new UpdateWorkflowExecutionData(updateId, initialRequest, acceptance, complete))
         .add(NONE, START, STARTED, StateMachines::acceptUpdate)
         .add(STARTED, COMPLETE, COMPLETED, StateMachines::completeUpdate);
   }
@@ -1771,7 +1776,7 @@ private static void acceptUpdate(
               .setAcceptedRequestSequencingEventId(workflowTaskCompletedEventId - 1)
               .setProtocolInstanceId(msg.getProtocolInstanceId())
               .setAcceptedRequestMessageId(acceptance.getAcceptedRequestMessageId())
-              .setAcceptedRequest(acceptance.getAcceptedRequest())
+              .setAcceptedRequest(data.initialRequest)
               .build();
 
       HistoryEvent event =

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

@@ -1595,7 +1595,7 @@ private void processAcceptanceMessage(
 
     update =
         StateMachines.newUpdateWorkflowExecution(
-            protocolInstanceId, u.getAcceptance(), u.getCompletion());
+            protocolInstanceId, u.getRequest().getRequest(), u.getAcceptance(), u.getCompletion());
     updates.put(protocolInstanceId, update);
     update.action(StateMachines.Action.START, ctx, msg, workflowTaskCompletedId);
   }