Revert upgrade thrift file (#393)

Author: andrewjdawson2016

src/main/java/com/uber/cadence/client/WorkflowOptions.java

@@ -25,6 +25,7 @@
 import com.cronutils.model.definition.CronDefinitionBuilder;
 import com.cronutils.parser.CronParser;
 import com.google.common.base.Strings;
+import com.uber.cadence.ChildPolicy;
 import com.uber.cadence.WorkflowIdReusePolicy;
 import com.uber.cadence.common.CronSchedule;
 import com.uber.cadence.common.MethodRetry;
@@ -59,6 +60,7 @@ public static WorkflowOptions merge(
             OptionsUtils.merge(
                 a.executionStartToCloseTimeoutSeconds(), o.getExecutionStartToCloseTimeout()))
         .setTaskList(OptionsUtils.merge(a.taskList(), o.getTaskList(), String.class))
+        .setChildPolicy(o.getChildPolicy())
         .setRetryOptions(RetryOptions.merge(methodRetry, o.getRetryOptions()))
         .setCronSchedule(OptionsUtils.merge(cronAnnotation, o.getCronSchedule(), String.class))
         .setMemo(o.getMemo())
@@ -78,6 +80,8 @@ public static final class Builder {
 
     private String taskList;
 
+    private ChildPolicy childPolicy;
+
     private RetryOptions retryOptions;
 
     private String cronSchedule;
@@ -97,6 +101,7 @@ public Builder(WorkflowOptions o) {
       this.taskStartToCloseTimeout = o.taskStartToCloseTimeout;
       this.executionStartToCloseTimeout = o.executionStartToCloseTimeout;
       this.taskList = o.taskList;
+      this.childPolicy = o.childPolicy;
       this.retryOptions = o.retryOptions;
       this.cronSchedule = o.cronSchedule;
       this.memo = o.memo;
@@ -169,6 +174,12 @@ public Builder setTaskList(String taskList) {
       return this;
     }
 
+    /** Specifies how children of this workflow react to this workflow death. */
+    public Builder setChildPolicy(ChildPolicy childPolicy) {
+      this.childPolicy = childPolicy;
+      return this;
+    }
+
     public Builder setRetryOptions(RetryOptions retryOptions) {
       this.retryOptions = retryOptions;
       return this;
@@ -204,6 +215,7 @@ public WorkflowOptions build() {
           executionStartToCloseTimeout,
           taskStartToCloseTimeout,
           taskList,
+          childPolicy,
           retryOptions,
           cronSchedule,
           memo,
@@ -250,6 +262,7 @@ public WorkflowOptions validateBuildWithDefaults() {
           roundUpToSeconds(
               taskStartToCloseTimeout, OptionsUtils.DEFAULT_TASK_START_TO_CLOSE_TIMEOUT),
           taskList,
+          childPolicy,
           retryOptions,
           cronSchedule,
           memo,
@@ -267,6 +280,8 @@ public WorkflowOptions validateBuildWithDefaults() {
 
   private final String taskList;
 
+  private final ChildPolicy childPolicy;
+
   private RetryOptions retryOptions;
 
   private String cronSchedule;
@@ -281,6 +296,7 @@ private WorkflowOptions(
       Duration executionStartToCloseTimeout,
       Duration taskStartToCloseTimeout,
       String taskList,
+      ChildPolicy childPolicy,
       RetryOptions retryOptions,
       String cronSchedule,
       Map<String, Object> memo,
@@ -290,6 +306,7 @@ private WorkflowOptions(
     this.executionStartToCloseTimeout = executionStartToCloseTimeout;
     this.taskStartToCloseTimeout = taskStartToCloseTimeout;
     this.taskList = taskList;
+    this.childPolicy = childPolicy;
     this.retryOptions = retryOptions;
     this.cronSchedule = cronSchedule;
     this.memo = memo;
@@ -316,6 +333,10 @@ public String getTaskList() {
     return taskList;
   }
 
+  public ChildPolicy getChildPolicy() {
+    return childPolicy;
+  }
+
   public RetryOptions getRetryOptions() {
     return retryOptions;
   }
@@ -342,6 +363,7 @@ public boolean equals(Object o) {
         && Objects.equals(executionStartToCloseTimeout, that.executionStartToCloseTimeout)
         && Objects.equals(taskStartToCloseTimeout, that.taskStartToCloseTimeout)
         && Objects.equals(taskList, that.taskList)
+        && childPolicy == that.childPolicy
         && Objects.equals(retryOptions, that.retryOptions)
         && Objects.equals(cronSchedule, that.cronSchedule)
         && Objects.equals(memo, that.memo)
@@ -356,6 +378,7 @@ public int hashCode() {
         executionStartToCloseTimeout,
         taskStartToCloseTimeout,
         taskList,
+        childPolicy,
         retryOptions,
         cronSchedule,
         memo,
@@ -377,6 +400,8 @@ public String toString() {
         + ", taskList='"
         + taskList
         + '\''
+        + ", childPolicy="
+        + childPolicy
         + ", retryOptions="
         + retryOptions
         + ", cronSchedule='"

src/main/java/com/uber/cadence/internal/common/StartWorkflowExecutionParameters.java

@@ -17,6 +17,7 @@
 
 package com.uber.cadence.internal.common;
 
+import com.uber.cadence.ChildPolicy;
 import com.uber.cadence.WorkflowIdReusePolicy;
 import com.uber.cadence.WorkflowType;
 import com.uber.cadence.client.WorkflowOptions;
@@ -42,6 +43,8 @@ public final class StartWorkflowExecutionParameters {
 
   private long taskStartToCloseTimeoutSeconds;
 
+  private ChildPolicy childPolicy;
+
   private WorkflowIdReusePolicy workflowIdReusePolicy;
 
   private RetryParameters retryParameters;
@@ -265,6 +268,19 @@ public StartWorkflowExecutionParameters withTaskStartToCloseTimeoutSeconds(
     return this;
   }
 
+  public ChildPolicy getChildPolicy() {
+    return childPolicy;
+  }
+
+  public void setChildPolicy(ChildPolicy childPolicy) {
+    this.childPolicy = childPolicy;
+  }
+
+  public StartWorkflowExecutionParameters withChildPolicy(ChildPolicy childPolicy) {
+    this.childPolicy = childPolicy;
+    return this;
+  }
+
   public RetryParameters getRetryParameters() {
     return retryParameters;
   }
@@ -308,6 +324,7 @@ public static StartWorkflowExecutionParameters fromWorkflowOptions(WorkflowOptio
         getSeconds(options.getExecutionStartToCloseTimeout()));
     parameters.setTaskStartToCloseTimeoutSeconds(getSeconds(options.getTaskStartToCloseTimeout()));
     parameters.setTaskList(options.getTaskList());
+    parameters.setChildPolicy(options.getChildPolicy());
     parameters.setWorkflowIdReusePolicy(options.getWorkflowIdReusePolicy());
     RetryOptions retryOptions = options.getRetryOptions();
     if (retryOptions != null) {
@@ -359,6 +376,8 @@ public String toString() {
         + executionStartToCloseTimeoutSeconds
         + ", taskStartToCloseTimeoutSeconds="
         + taskStartToCloseTimeoutSeconds
+        + ", childPolicy="
+        + childPolicy
         + ", workflowIdReusePolicy="
         + workflowIdReusePolicy
         + ", retryParameters="
@@ -386,6 +405,7 @@ public boolean equals(Object o) {
         && Objects.equals(workflowType, that.workflowType)
         && Objects.equals(taskList, that.taskList)
         && Arrays.equals(input, that.input)
+        && childPolicy == that.childPolicy
         && workflowIdReusePolicy == that.workflowIdReusePolicy
         && Objects.equals(retryParameters, that.retryParameters)
         && Objects.equals(cronSchedule, that.cronSchedule)
@@ -402,6 +422,7 @@ public int hashCode() {
             taskList,
             executionStartToCloseTimeoutSeconds,
             taskStartToCloseTimeoutSeconds,
+            childPolicy,
             workflowIdReusePolicy,
             retryParameters,
             cronSchedule,

src/main/java/com/uber/cadence/internal/common/TerminateWorkflowExecutionParameters.java

@@ -17,21 +17,25 @@
 
 package com.uber.cadence.internal.common;
 
+import com.uber.cadence.ChildPolicy;
 import com.uber.cadence.WorkflowExecution;
 
 public class TerminateWorkflowExecutionParameters {
 
   private WorkflowExecution workflowExecution;
 
+  private ChildPolicy childPolicy;
+
   private String reason;
 
   private byte[] details;
 
   public TerminateWorkflowExecutionParameters() {}
 
   public TerminateWorkflowExecutionParameters(
-      WorkflowExecution workflowExecution, String reason, byte[] details) {
+      WorkflowExecution workflowExecution, ChildPolicy childPolicy, String reason, byte[] details) {
     this.workflowExecution = workflowExecution;
+    this.childPolicy = childPolicy;
     this.reason = reason;
     this.details = details;
   }
@@ -50,6 +54,19 @@ public TerminateWorkflowExecutionParameters withWorkflowExecution(
     return this;
   }
 
+  public ChildPolicy getChildPolicy() {
+    return childPolicy;
+  }
+
+  public void setChildPolicy(ChildPolicy childPolicy) {
+    this.childPolicy = childPolicy;
+  }
+
+  public TerminateWorkflowExecutionParameters withChildPolicy(ChildPolicy childPolicy) {
+    this.childPolicy = childPolicy;
+    return this;
+  }
+
   public String getReason() {
     return reason;
   }

src/main/java/com/uber/cadence/internal/replay/DecisionContext.java

@@ -17,6 +17,7 @@
 
 package com.uber.cadence.internal.replay;
 
+import com.uber.cadence.ChildPolicy;
 import com.uber.cadence.WorkflowExecution;
 import com.uber.cadence.WorkflowType;
 import com.uber.cadence.converter.DataConverter;
@@ -68,6 +69,8 @@ public interface DecisionContext extends ReplayAware {
 
   Duration getDecisionTaskTimeout();
 
+  ChildPolicy getChildPolicy();
+
   /**
    * Used to dynamically schedule an activity for execution
    *

src/main/java/com/uber/cadence/internal/replay/DecisionContextImpl.java

@@ -17,6 +17,7 @@
 
 package com.uber.cadence.internal.replay;
 
+import com.uber.cadence.ChildPolicy;
 import com.uber.cadence.DecisionTaskFailedCause;
 import com.uber.cadence.DecisionTaskFailedEventAttributes;
 import com.uber.cadence.HistoryEvent;
@@ -134,6 +135,11 @@ public Duration getDecisionTaskTimeout() {
     return Duration.ofSeconds(workflowContext.getDecisionTaskTimeoutSeconds());
   }
 
+  @Override
+  public ChildPolicy getChildPolicy() {
+    return workflowContext.getChildPolicy();
+  }
+
   @Override
   public String getTaskList() {
     return workflowContext.getTaskList();

src/main/java/com/uber/cadence/internal/replay/StartChildWorkflowExecutionParameters.java

@@ -17,6 +17,7 @@
 
 package com.uber.cadence.internal.replay;
 
+import com.uber.cadence.ChildPolicy;
 import com.uber.cadence.WorkflowIdReusePolicy;
 import com.uber.cadence.WorkflowType;
 import com.uber.cadence.internal.common.RetryParameters;
@@ -43,6 +44,8 @@ public static final class Builder {
 
     private WorkflowType workflowType;
 
+    private ChildPolicy childPolicy;
+
     private WorkflowIdReusePolicy workflowIdReusePolicy;
 
     private RetryParameters retryParameters;
@@ -90,6 +93,11 @@ public Builder setWorkflowType(WorkflowType workflowType) {
       return this;
     }
 
+    public Builder setChildPolicy(ChildPolicy childPolicy) {
+      this.childPolicy = childPolicy;
+      return this;
+    }
+
     public Builder setWorkflowIdReusePolicy(WorkflowIdReusePolicy workflowIdReusePolicy) {
       this.workflowIdReusePolicy = workflowIdReusePolicy;
       return this;
@@ -115,6 +123,7 @@ public StartChildWorkflowExecutionParameters build() {
           taskStartToCloseTimeoutSeconds,
           workflowId,
           workflowType,
+          childPolicy,
           workflowIdReusePolicy,
           retryParameters,
           cronSchedule);
@@ -137,6 +146,8 @@ public StartChildWorkflowExecutionParameters build() {
 
   private final WorkflowType workflowType;
 
+  private final ChildPolicy childPolicy;
+
   private final WorkflowIdReusePolicy workflowIdReusePolicy;
 
   private final RetryParameters retryParameters;
@@ -152,6 +163,7 @@ private StartChildWorkflowExecutionParameters(
       long taskStartToCloseTimeoutSeconds,
       String workflowId,
       WorkflowType workflowType,
+      ChildPolicy childPolicy,
       WorkflowIdReusePolicy workflowIdReusePolicy,
       RetryParameters retryParameters,
       String cronSchedule) {
@@ -163,6 +175,7 @@ private StartChildWorkflowExecutionParameters(
     this.taskStartToCloseTimeoutSeconds = taskStartToCloseTimeoutSeconds;
     this.workflowId = workflowId;
     this.workflowType = workflowType;
+    this.childPolicy = childPolicy;
     this.workflowIdReusePolicy = workflowIdReusePolicy;
     this.retryParameters = retryParameters;
     this.cronSchedule = cronSchedule;
@@ -200,6 +213,10 @@ public WorkflowType getWorkflowType() {
     return workflowType;
   }
 
+  public ChildPolicy getChildPolicy() {
+    return childPolicy;
+  }
+
   public WorkflowIdReusePolicy getWorkflowIdReusePolicy() {
     return workflowIdReusePolicy;
   }
@@ -225,6 +242,7 @@ public boolean equals(Object o) {
         && Objects.equals(taskList, that.taskList)
         && Objects.equals(workflowId, that.workflowId)
         && Objects.equals(workflowType, that.workflowType)
+        && childPolicy == that.childPolicy
         && workflowIdReusePolicy == that.workflowIdReusePolicy
         && Objects.equals(retryParameters, that.retryParameters)
         && Objects.equals(cronSchedule, that.cronSchedule);
@@ -241,6 +259,7 @@ public int hashCode() {
             taskStartToCloseTimeoutSeconds,
             workflowId,
             workflowType,
+            childPolicy,
             workflowIdReusePolicy,
             retryParameters,
             cronSchedule);
@@ -271,6 +290,8 @@ public String toString() {
         + '\''
         + ", workflowType="
         + workflowType
+        + ", childPolicy="
+        + childPolicy
         + ", workflowIdReusePolicy="
         + workflowIdReusePolicy
         + ", retryParameters="

src/main/java/com/uber/cadence/internal/replay/WorkflowContext.java

@@ -120,6 +120,10 @@ private WorkflowExecutionStartedEventAttributes getWorkflowStartedEventAttribute
     return startedAttributes;
   }
 
+  public ChildPolicy getChildPolicy() {
+    return startedAttributes.getChildPolicy();
+  }
+
   void setCurrentRunId(String currentRunId) {
     this.currentRunId = currentRunId;
   }