address PR comments

Author: Liang Mei

src/main/java/com/uber/cadence/internal/external/GenericWorkflowClientExternalImpl.java

@@ -71,45 +71,7 @@ public IWorkflowService getService() {
   public WorkflowExecution startWorkflow(StartWorkflowExecutionParameters startParameters)
       throws WorkflowExecutionAlreadyStartedError {
     try {
-      StartWorkflowExecutionRequest request = new StartWorkflowExecutionRequest();
-      request.setDomain(domain);
-
-      request.setInput(startParameters.getInput());
-      request.setExecutionStartToCloseTimeoutSeconds(
-          (int) startParameters.getExecutionStartToCloseTimeoutSeconds());
-      request.setTaskStartToCloseTimeoutSeconds(
-          (int) startParameters.getTaskStartToCloseTimeoutSeconds());
-      request.setWorkflowIdReusePolicy(startParameters.getWorkflowIdReusePolicy());
-      String taskList = startParameters.getTaskList();
-      if (taskList != null && !taskList.isEmpty()) {
-        TaskList tl = new TaskList();
-        tl.setName(taskList);
-        request.setTaskList(tl);
-      }
-      String workflowId = startParameters.getWorkflowId();
-      if (workflowId == null) {
-        workflowId = UUID.randomUUID().toString();
-      }
-      request.setWorkflowId(workflowId);
-      request.setWorkflowType(startParameters.getWorkflowType());
-
-      //        if(startParameters.getChildPolicy() != null) {
-      //            request.setChildPolicy(startParameters.getChildPolicy());
-      //        }
-
-      StartWorkflowExecutionResponse result;
-      try {
-        result = service.StartWorkflowExecution(request);
-      } catch (WorkflowExecutionAlreadyStartedError e) {
-        throw e;
-      } catch (TException e) {
-        throw CheckedExceptionWrapper.wrap(e);
-      }
-      WorkflowExecution execution = new WorkflowExecution();
-      execution.setRunId(result.getRunId());
-      execution.setWorkflowId(request.getWorkflowId());
-
-      return execution;
+      return startWorkflowInternal(startParameters);
     } finally {
       // TODO: can probably cache this
       Map<String, String> tags =
@@ -120,6 +82,49 @@ public WorkflowExecution startWorkflow(StartWorkflowExecutionParameters startPar
     }
   }
 
+  private WorkflowExecution startWorkflowInternal(StartWorkflowExecutionParameters startParameters)
+      throws WorkflowExecutionAlreadyStartedError {
+    StartWorkflowExecutionRequest request = new StartWorkflowExecutionRequest();
+    request.setDomain(domain);
+
+    request.setInput(startParameters.getInput());
+    request.setExecutionStartToCloseTimeoutSeconds(
+        (int) startParameters.getExecutionStartToCloseTimeoutSeconds());
+    request.setTaskStartToCloseTimeoutSeconds(
+        (int) startParameters.getTaskStartToCloseTimeoutSeconds());
+    request.setWorkflowIdReusePolicy(startParameters.getWorkflowIdReusePolicy());
+    String taskList = startParameters.getTaskList();
+    if (taskList != null && !taskList.isEmpty()) {
+      TaskList tl = new TaskList();
+      tl.setName(taskList);
+      request.setTaskList(tl);
+    }
+    String workflowId = startParameters.getWorkflowId();
+    if (workflowId == null) {
+      workflowId = UUID.randomUUID().toString();
+    }
+    request.setWorkflowId(workflowId);
+    request.setWorkflowType(startParameters.getWorkflowType());
+
+    //        if(startParameters.getChildPolicy() != null) {
+    //            request.setChildPolicy(startParameters.getChildPolicy());
+    //        }
+
+    StartWorkflowExecutionResponse result;
+    try {
+      result = service.StartWorkflowExecution(request);
+    } catch (WorkflowExecutionAlreadyStartedError e) {
+      throw e;
+    } catch (TException e) {
+      throw CheckedExceptionWrapper.wrap(e);
+    }
+    WorkflowExecution execution = new WorkflowExecution();
+    execution.setRunId(result.getRunId());
+    execution.setWorkflowId(request.getWorkflowId());
+
+    return execution;
+  }
+
   @Override
   public void signalWorkflowExecution(SignalExternalWorkflowParameters signalParameters) {
     SignalWorkflowExecutionRequest request = new SignalWorkflowExecutionRequest();

src/main/java/com/uber/cadence/internal/metrics/NoopScope.java

@@ -25,7 +25,7 @@
 import com.uber.m3.util.Duration;
 import java.util.Map;
 
-public class NoopScope {
+public final class NoopScope {
   private static class NoopReporter implements StatsReporter {
 
     @Override

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

@@ -153,10 +153,8 @@ private class MeasurableActivityTask {
     Stopwatch sw;
 
     MeasurableActivityTask(PollForActivityTaskResponse task, Stopwatch sw) {
-      Objects.requireNonNull(task);
-      Objects.requireNonNull(sw);
-      this.task = task;
-      this.sw = sw;
+      this.task = Objects.requireNonNull(task);
+      this.sw = Objects.requireNonNull(sw);
     }
 
     void markDone() {