Decision to WorkflowTask or Command renaming (#150)

Author: mfateev

build.gradle

@@ -113,6 +113,11 @@ dependencies {
     testImplementation group: 'junit', name: 'junit', version: '4.13'
 }
 
+configurations.all {
+    // Conflicts with logback
+    exclude group: 'org.slf4j', module: 'slf4j-simple'
+}
+
 license {
     header rootProject.file('license-header.txt')
     exclude 'io/temporal/proto/**.java' // generated code
@@ -217,6 +222,12 @@ javadoc {
     }
 }
 
+// Needed to include generated fils into the source jar
+task sourceJar(type: Jar) {
+    from sourceSets.main.allSource, file("$buildDir/generated/main/java")
+    classifier "sources"
+}
+
 task registerNamespace(type: JavaExec) {
     main = 'io.temporal.RegisterTestNamespace'
     classpath = sourceSets.test.runtimeClasspath

src/main/java/io/temporal/client/WorkflowFailedException.java

@@ -29,35 +29,35 @@
 public final class WorkflowFailedException extends WorkflowException {
 
   private final RetryState retryState;
-  private final long decisionTaskCompletedEventId;
+  private final long workflowTaskCompletedEventId;
 
   public WorkflowFailedException(
       WorkflowExecution workflowExecution,
       String workflowType,
-      long decisionTaskCompletedEventId,
+      long workflowTaskCompletedEventId,
       RetryState retryState,
       Throwable cause) {
     super(
-        getMessage(workflowExecution, workflowType, decisionTaskCompletedEventId, retryState),
+        getMessage(workflowExecution, workflowType, workflowTaskCompletedEventId, retryState),
         workflowExecution,
         workflowType,
         cause);
     this.retryState = retryState;
-    this.decisionTaskCompletedEventId = decisionTaskCompletedEventId;
+    this.workflowTaskCompletedEventId = workflowTaskCompletedEventId;
   }
 
   public RetryState getRetryState() {
     return retryState;
   }
 
-  public long getDecisionTaskCompletedEventId() {
-    return decisionTaskCompletedEventId;
+  public long getWorkflowTaskCompletedEventId() {
+    return workflowTaskCompletedEventId;
   }
 
   public static String getMessage(
       WorkflowExecution workflowExecution,
       String workflowType,
-      long decisionTaskCompletedEventId,
+      long workflowTaskCompletedEventId,
       RetryState retryState) {
     return "workflowId='"
         + workflowExecution.getWorkflowId()
@@ -66,7 +66,7 @@ public static String getMessage(
         + (workflowType == null ? "'" : "', workflowType='" + workflowType + '\'')
         + ", retryState="
         + retryState
-        + ", decisionTaskCompletedEventId="
-        + decisionTaskCompletedEventId;
+        + ", workflowTaskCompletedEventId="
+        + workflowTaskCompletedEventId;
   }
 }

src/main/java/io/temporal/client/WorkflowOptions.java

@@ -168,14 +168,14 @@ public Builder setWorkflowExecutionTimeout(Duration workflowExecutionTimeout) {
       return this;
     }
 
-    /** Maximum execution time of a single decision task. Default is 10 seconds. */
+    /** Maximum execution time of a single workflow task. Default is 10 seconds. */
     public Builder setWorkflowTaskTimeout(Duration workflowTaskTimeout) {
       this.workflowTaskTimeout = workflowTaskTimeout;
       return this;
     }
 
     /**
-     * Task queue to use for decision tasks. It should match a task queue specified when creating a
+     * Task queue to use for workflow tasks. It should match a task queue specified when creating a
      * {@link io.temporal.worker.Worker} that hosts the workflow code.
      */
     public Builder setTaskQueue(String taskQueue) {

src/main/java/io/temporal/common/converter/JacksonJsonPayloadConverter.java

@@ -43,6 +43,10 @@ public JacksonJsonPayloadConverter() {
     mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
   }
 
+  public JacksonJsonPayloadConverter(ObjectMapper mapper) {
+    this.mapper = mapper;
+  }
+
   @Override
   public String getEncodingType() {
     return EncodingKeys.METADATA_ENCODING_JSON_NAME;

src/main/java/io/temporal/failure/FailureConverter.java

@@ -58,7 +58,7 @@ public class FailureConverter {
   private static final ImmutableSet<String> CUTOFF_METHOD_NAMES =
       ImmutableSet.of(
           "io.temporal.internal.worker.POJOActivityImplementationFactory$POJOActivityImplementation.execute",
-          "io.temporal.internal.sync.POJODecisionTaskHandler$POJOWorkflowImplementation.execute");
+          "io.temporal.internal.sync.POJOWorkflowTaskHandler$POJOWorkflowImplementation.execute");
 
   /** Used to parse a stack trace line. */
   private static final String TRACE_ELEMENT_REGEXP =

src/main/java/io/temporal/internal/common/LocalActivityMarkerData.java

@@ -29,7 +29,7 @@
 import io.temporal.api.workflowservice.v1.RespondActivityTaskCanceledRequest;
 import io.temporal.api.workflowservice.v1.RespondActivityTaskFailedRequest;
 import io.temporal.common.converter.DataConverter;
-import io.temporal.internal.replay.ClockDecisionContext;
+import io.temporal.internal.replay.ReplayClockContext;
 import java.time.Duration;
 import java.util.Optional;
 
@@ -182,7 +182,7 @@ public HistoryEvent toEvent(DataConverter converter) {
     Payloads data = converter.toPayloads(this.data).get();
     MarkerRecordedEventAttributes.Builder attributes =
         MarkerRecordedEventAttributes.newBuilder()
-            .setMarkerName(ClockDecisionContext.LOCAL_ACTIVITY_MARKER_NAME)
+            .setMarkerName(ReplayClockContext.LOCAL_ACTIVITY_MARKER_NAME)
             .putDetails(MARKER_DATA_KEY, data);
     if (result.isPresent()) {
       attributes.putDetails(MARKER_RESULT_KEY, result.get());

src/main/java/io/temporal/internal/common/WorkflowExecutionFailedException.java

@@ -25,23 +25,23 @@
 /** Framework level exception. Do not throw or catch in the application level code. */
 public final class WorkflowExecutionFailedException extends RuntimeException {
 
-  private final long decisionTaskCompletedEventId;
+  private final long workflowTaskCompletedEventId;
   private final Failure failure;
   private final RetryState retryState;
 
   WorkflowExecutionFailedException(
-      Failure failure, long decisionTaskCompletedEventId, RetryState retryState) {
+      Failure failure, long workflowTaskCompletedEventId, RetryState retryState) {
     this.failure = failure;
-    this.decisionTaskCompletedEventId = decisionTaskCompletedEventId;
+    this.workflowTaskCompletedEventId = workflowTaskCompletedEventId;
     this.retryState = retryState;
   }
 
   public Failure getFailure() {
     return failure;
   }
 
-  public long getDecisionTaskCompletedEventId() {
-    return decisionTaskCompletedEventId;
+  public long getWorkflowTaskCompletedEventId() {
+    return workflowTaskCompletedEventId;
   }
 
   public RetryState getRetryState() {

src/main/java/io/temporal/internal/common/WorkflowExecutionUtils.java

@@ -33,10 +33,10 @@
 import com.uber.m3.tally.Scope;
 import io.grpc.Deadline;
 import io.grpc.Status;
+import io.temporal.api.command.v1.Command;
 import io.temporal.api.common.v1.Payloads;
 import io.temporal.api.common.v1.WorkflowExecution;
-import io.temporal.api.decision.v1.Decision;
-import io.temporal.api.enums.v1.DecisionType;
+import io.temporal.api.enums.v1.CommandType;
 import io.temporal.api.enums.v1.EventType;
 import io.temporal.api.enums.v1.HistoryEventFilterType;
 import io.temporal.api.enums.v1.RetryState;
@@ -88,7 +88,7 @@
 public class WorkflowExecutionUtils {
 
   /**
-   * Indentation for history and decisions pretty printing. Do not change it from 2 spaces. The gson
+   * Indentation for history and commands pretty printing. Do not change it from 2 spaces. The gson
    * pretty printer has it hardcoded and changing it breaks the indentation of exception stack
    * traces.
    */
@@ -173,7 +173,7 @@ private static Optional<Payloads> getResultFromCloseEvent(
         WorkflowExecutionFailedEventAttributes failed =
             closeEvent.getWorkflowExecutionFailedEventAttributes();
         throw new WorkflowExecutionFailedException(
-            failed.getFailure(), failed.getDecisionTaskCompletedEventId(), failed.getRetryState());
+            failed.getFailure(), failed.getWorkflowTaskCompletedEventId(), failed.getRetryState());
       case EVENT_TYPE_WORKFLOW_EXECUTION_TERMINATED:
         WorkflowExecutionTerminatedEventAttributes terminated =
             closeEvent.getWorkflowExecutionTerminatedEventAttributes();
@@ -413,13 +413,13 @@ public static boolean isWorkflowExecutionCompletedEvent(HistoryEventOrBuilder ev
             || event.getEventType() == EventType.EVENT_TYPE_WORKFLOW_EXECUTION_TERMINATED));
   }
 
-  public static boolean isWorkflowExecutionCompleteDecision(Decision decision) {
-    return ((decision != null)
-        && (decision.getDecisionType() == DecisionType.DECISION_TYPE_COMPLETE_WORKFLOW_EXECUTION
-            || decision.getDecisionType() == DecisionType.DECISION_TYPE_CANCEL_WORKFLOW_EXECUTION
-            || decision.getDecisionType() == DecisionType.DECISION_TYPE_FAIL_WORKFLOW_EXECUTION
-            || decision.getDecisionType()
-                == DecisionType.DECISION_TYPE_CONTINUE_AS_NEW_WORKFLOW_EXECUTION));
+  public static boolean isWorkflowExecutionCompleteCommand(Command command) {
+    return ((command != null)
+        && (command.getCommandType() == CommandType.COMMAND_TYPE_COMPLETE_WORKFLOW_EXECUTION
+            || command.getCommandType() == CommandType.COMMAND_TYPE_CANCEL_WORKFLOW_EXECUTION
+            || command.getCommandType() == CommandType.COMMAND_TYPE_FAIL_WORKFLOW_EXECUTION
+            || command.getCommandType()
+                == CommandType.COMMAND_TYPE_CONTINUE_AS_NEW_WORKFLOW_EXECUTION));
   }
 
   public static boolean isActivityTaskClosedEvent(HistoryEvent event) {
@@ -678,7 +678,7 @@ public static String prettyPrintHistory(
   /**
    * Returns workflow instance history in a human readable format.
    *
-   * @param showWorkflowTasks when set to false workflow task events (decider events) are not
+   * @param showWorkflowTasks when set to false workflow task events (command events) are not
    *     included
    * @param metricsScope
    */
@@ -731,7 +731,7 @@ private void getNextPage() {
   /**
    * Returns workflow instance history in a human readable format.
    *
-   * @param showWorkflowTasks when set to false workflow task events (decider events) are not
+   * @param showWorkflowTasks when set to false workflow task events (command events) are not
    *     included
    * @param history Workflow instance history
    */
@@ -752,10 +752,10 @@ public static String prettyPrintHistory(
     return result.toString();
   }
 
-  public static String prettyPrintDecisions(Iterable<Decision> decisions) {
+  public static String prettyPrintCommands(Iterable<Command> commands) {
     StringBuilder result = new StringBuilder();
-    for (Decision decision : decisions) {
-      result.append(prettyPrintObject(decision));
+    for (Command command : commands) {
+      result.append(prettyPrintObject(command));
     }
     return result.toString();
   }
@@ -791,8 +791,8 @@ private static void fixStackTrace(JsonElement json, String stackIndentation) {
     }
   }
 
-  /** Is this an event that was created to mirror a decision? */
-  public static boolean isDecisionEvent(HistoryEvent event) {
+  /** Is this an event that was created to mirror a command? */
+  public static boolean isCommandEvent(HistoryEvent event) {
     EventType eventType = event.getEventType();
     boolean result =
         ((event != null)
@@ -815,36 +815,36 @@ public static boolean isDecisionEvent(HistoryEvent event) {
     return result;
   }
 
-  public static EventType getEventTypeForDecision(DecisionType decisionType) {
-    switch (decisionType) {
-      case DECISION_TYPE_SCHEDULE_ACTIVITY_TASK:
+  public static EventType getEventTypeForCommand(CommandType commandType) {
+    switch (commandType) {
+      case COMMAND_TYPE_SCHEDULE_ACTIVITY_TASK:
         return EventType.EVENT_TYPE_ACTIVITY_TASK_SCHEDULED;
-      case DECISION_TYPE_REQUEST_CANCEL_ACTIVITY_TASK:
+      case COMMAND_TYPE_REQUEST_CANCEL_ACTIVITY_TASK:
         return EventType.EVENT_TYPE_ACTIVITY_TASK_CANCEL_REQUESTED;
-      case DECISION_TYPE_START_TIMER:
+      case COMMAND_TYPE_START_TIMER:
         return EventType.EVENT_TYPE_TIMER_STARTED;
-      case DECISION_TYPE_COMPLETE_WORKFLOW_EXECUTION:
+      case COMMAND_TYPE_COMPLETE_WORKFLOW_EXECUTION:
         return EventType.EVENT_TYPE_WORKFLOW_EXECUTION_COMPLETED;
-      case DECISION_TYPE_FAIL_WORKFLOW_EXECUTION:
+      case COMMAND_TYPE_FAIL_WORKFLOW_EXECUTION:
         return EventType.EVENT_TYPE_WORKFLOW_EXECUTION_FAILED;
-      case DECISION_TYPE_CANCEL_TIMER:
+      case COMMAND_TYPE_CANCEL_TIMER:
         return EventType.EVENT_TYPE_TIMER_CANCELED;
-      case DECISION_TYPE_CANCEL_WORKFLOW_EXECUTION:
+      case COMMAND_TYPE_CANCEL_WORKFLOW_EXECUTION:
         return EventType.EVENT_TYPE_WORKFLOW_EXECUTION_CANCELED;
-      case DECISION_TYPE_REQUEST_CANCEL_EXTERNAL_WORKFLOW_EXECUTION:
+      case COMMAND_TYPE_REQUEST_CANCEL_EXTERNAL_WORKFLOW_EXECUTION:
         return EventType.EVENT_TYPE_EXTERNAL_WORKFLOW_EXECUTION_CANCEL_REQUESTED;
-      case DECISION_TYPE_RECORD_MARKER:
+      case COMMAND_TYPE_RECORD_MARKER:
         return EventType.EVENT_TYPE_MARKER_RECORDED;
-      case DECISION_TYPE_CONTINUE_AS_NEW_WORKFLOW_EXECUTION:
+      case COMMAND_TYPE_CONTINUE_AS_NEW_WORKFLOW_EXECUTION:
         return EventType.EVENT_TYPE_WORKFLOW_EXECUTION_CONTINUED_AS_NEW;
-      case DECISION_TYPE_START_CHILD_WORKFLOW_EXECUTION:
+      case COMMAND_TYPE_START_CHILD_WORKFLOW_EXECUTION:
         return EventType.EVENT_TYPE_START_CHILD_WORKFLOW_EXECUTION_INITIATED;
-      case DECISION_TYPE_SIGNAL_EXTERNAL_WORKFLOW_EXECUTION:
+      case COMMAND_TYPE_SIGNAL_EXTERNAL_WORKFLOW_EXECUTION:
         return EventType.EVENT_TYPE_SIGNAL_EXTERNAL_WORKFLOW_EXECUTION_INITIATED;
-      case DECISION_TYPE_UPSERT_WORKFLOW_SEARCH_ATTRIBUTES:
+      case COMMAND_TYPE_UPSERT_WORKFLOW_SEARCH_ATTRIBUTES:
         return EventType.EVENT_TYPE_UPSERT_WORKFLOW_SEARCH_ATTRIBUTES;
     }
-    throw new IllegalArgumentException("Unknown decisionType");
+    throw new IllegalArgumentException("Unknown commandType");
   }
 
   public static WorkflowExecutionHistory readHistoryFromResource(String resourceFileName)

src/main/java/io/temporal/internal/grpc/GrpcTracingInterceptor.java

@@ -36,10 +36,10 @@ class GrpcTracingInterceptor implements ClientInterceptor {
   private static final Logger log = LoggerFactory.getLogger(GrpcTracingInterceptor.class);
 
   /**
-   * Separate logger for PollForDecisionTask reply which includes history. It is separate to allow
-   * disabling independently through configuration.
+   * Separate logger for PollWorkflowTaskQueue reply which includes history. It is separate to allow
+   * disabling this noisy log independently through configuration.
    */
-  private static final Logger decision_task_log =
+  private static final Logger workflow_task_log =
       LoggerFactory.getLogger(GrpcTracingInterceptor.class.getName() + ":history");
 
   @Override
@@ -61,9 +61,9 @@ public void start(Listener<RespT> responseListener, Metadata headers) {
               @Override
               public void onMessage(RespT message) {
                 // Skip printing the whole history
-                if (method == WorkflowServiceGrpc.getPollForDecisionTaskMethod()) {
-                  if (decision_task_log.isTraceEnabled()) {
-                    decision_task_log.trace(
+                if (method == WorkflowServiceGrpc.getPollWorkflowTaskQueueMethod()) {
+                  if (workflow_task_log.isTraceEnabled()) {
+                    workflow_task_log.trace(
                         "Returned \""
                             + method.getServiceName()
                             + "\" of \""
@@ -91,6 +91,6 @@ public void onMessage(RespT message) {
   }
 
   public boolean isEnabled() {
-    return log.isTraceEnabled() || decision_task_log.isTraceEnabled();
+    return log.isTraceEnabled() || workflow_task_log.isTraceEnabled();
   }
 }

src/main/java/io/temporal/internal/grpc/LongPollUtil.java

@@ -28,8 +28,8 @@ class LongPollUtil {
 
   static <ReqT, RespT> boolean isLongPoll(
       MethodDescriptor<ReqT, RespT> method, CallOptions callOptions) {
-    if (method == WorkflowServiceGrpc.getPollForDecisionTaskMethod()
-        || method == WorkflowServiceGrpc.getPollForActivityTaskMethod()) {
+    if (method == WorkflowServiceGrpc.getPollWorkflowTaskQueueMethod()
+        || method == WorkflowServiceGrpc.getPollActivityTaskQueueMethod()) {
       return true;
     }
     if (method == WorkflowServiceGrpc.getGetWorkflowExecutionHistoryMethod()) {