Add some more fields in activity info (#306)

Author: meiliang86

src/main/java/com/uber/cadence/activity/ActivityTask.java

@@ -18,6 +18,7 @@
 package com.uber.cadence.activity;
 
 import com.uber.cadence.WorkflowExecution;
+import com.uber.cadence.WorkflowType;
 import java.time.Duration;
 
 /**
@@ -58,4 +59,12 @@ public interface ActivityTask {
   Duration getHeartbeatTimeout();
 
   byte[] getHeartbeatDetails();
+
+  WorkflowType getWorkflowType();
+
+  String getWorkflowDomain();
+
+  String getTaskList();
+
+  int getAttempt();
 }

src/main/java/com/uber/cadence/internal/sync/ActivityTaskImpl.java

@@ -19,15 +19,18 @@
 
 import com.uber.cadence.PollForActivityTaskResponse;
 import com.uber.cadence.WorkflowExecution;
+import com.uber.cadence.WorkflowType;
 import com.uber.cadence.activity.ActivityTask;
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 final class ActivityTaskImpl implements ActivityTask {
   private final PollForActivityTaskResponse response;
+  private final String taskList;
 
-  public ActivityTaskImpl(PollForActivityTaskResponse response) {
+  ActivityTaskImpl(PollForActivityTaskResponse response, String taskList) {
     this.response = response;
+    this.taskList = taskList;
   }
 
   @Override
@@ -76,6 +79,26 @@ public byte[] getHeartbeatDetails() {
     return response.getHeartbeatDetails();
   }
 
+  @Override
+  public WorkflowType getWorkflowType() {
+    return response.getWorkflowType();
+  }
+
+  @Override
+  public String getWorkflowDomain() {
+    return response.getWorkflowDomain();
+  }
+
+  @Override
+  public String getTaskList() {
+    return taskList;
+  }
+
+  @Override
+  public int getAttempt() {
+    return response.getAttempt();
+  }
+
   public byte[] getInput() {
     return response.getInput();
   }

src/main/java/com/uber/cadence/internal/sync/POJOActivityTaskHandler.java

@@ -59,7 +59,7 @@ public DataConverter getDataConverter() {
     return dataConverter;
   }
 
-  public void addActivityImplementation(Object activity) {
+  void addActivityImplementation(Object activity) {
     if (activity instanceof Class) {
       throw new IllegalArgumentException("Activity object instance expected, not the class");
     }
@@ -143,7 +143,7 @@ public boolean isAnyTypeSupported() {
     return !activities.isEmpty();
   }
 
-  public void setActivitiesImplementation(Object[] activitiesImplementation) {
+  void setActivitiesImplementation(Object[] activitiesImplementation) {
     activities.clear();
     for (Object activity : activitiesImplementation) {
       addActivityImplementation(activity);
@@ -154,10 +154,11 @@ public void setActivitiesImplementation(Object[] activitiesImplementation) {
   public Result handle(
       IWorkflowService service,
       String domain,
+      String taskList,
       PollForActivityTaskResponse pollResponse,
       Scope metricsScope) {
     String activityType = pollResponse.getActivityType().getName();
-    ActivityTaskImpl activityTask = new ActivityTaskImpl(pollResponse);
+    ActivityTaskImpl activityTask = new ActivityTaskImpl(pollResponse, taskList);
     POJOActivityImplementation activity = activities.get(activityType);
     if (activity == null) {
       String knownTypes = Joiner.on(", ").join(activities.keySet());

src/main/java/com/uber/cadence/internal/sync/TestActivityEnvironmentInternal.java

@@ -208,7 +208,11 @@ public <T> Promise<T> executeActivity(
       IWorkflowService service = new WorkflowServiceWrapper(workflowService);
       Result taskResult =
           activityTaskHandler.handle(
-              service, testEnvironmentOptions.getDomain(), task, NoopScope.getInstance());
+              service,
+              testEnvironmentOptions.getDomain(),
+              options.getTaskList(),
+              task,
+              NoopScope.getInstance());
       return Workflow.newPromise(getReply(task, taskResult, resultClass, resultType));
     }
 

src/main/java/com/uber/cadence/internal/worker/ActivityTaskHandler.java

@@ -83,6 +83,7 @@ public RetryOptions getRequestRetryOptions() {
   Result handle(
       IWorkflowService service,
       String domain,
+      String taskList,
       PollForActivityTaskResponse activityTask,
       Scope metricsScope);
 

src/main/java/com/uber/cadence/internal/worker/ActivityWorker.java

@@ -180,7 +180,7 @@ public void handle(MeasurableActivityTask task) throws Exception {
       try {
         Stopwatch sw = metricsScope.timer(MetricsType.ACTIVITY_EXEC_LATENCY).start();
         ActivityTaskHandler.Result response =
-            handler.handle(service, domain, task.task, metricsScope);
+            handler.handle(service, domain, taskList, task.task, metricsScope);
         sw.stop();
 
         sw = metricsScope.timer(MetricsType.ACTIVITY_RESP_LATENCY).start();

src/test/java/com/uber/cadence/workflow/WorkflowTest.java

@@ -31,6 +31,7 @@
 import com.uber.cadence.activity.Activity;
 import com.uber.cadence.activity.ActivityMethod;
 import com.uber.cadence.activity.ActivityOptions;
+import com.uber.cadence.activity.ActivityTask;
 import com.uber.cadence.client.ActivityCancelledException;
 import com.uber.cadence.client.ActivityCompletionClient;
 import com.uber.cadence.client.ActivityNotExistsException;
@@ -3306,6 +3307,8 @@ public void proc6(String a1, int a2, int a3, int a4, int a5, int a6) {
 
     @Override
     public void heartbeatAndThrowIO() {
+      ActivityTask task = Activity.getTask();
+      assertEquals(task.getAttempt(), heartbeatCounter.get());
       invocations.add("throwIO");
       Optional<Integer> heartbeatDetails = Activity.getHeartbeatDetails(int.class);
       assertEquals(heartbeatCounter.get(), (int) heartbeatDetails.orElse(0));