Review comments

Author: Liang Mei

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

@@ -63,8 +63,7 @@ public final class RpcRetryer {
         DomainAlreadyExistsError.class,
         QueryFailedError.class,
         DomainNotActiveError.class,
-        CancellationAlreadyRequestedError.class,
-        DomainNotActiveError.class);
+        CancellationAlreadyRequestedError.class);
     DEFAULT_RPC_RETRY_OPTIONS = roBuilder.validateBuildWithDefaults();
   }
 
@@ -114,7 +113,7 @@ public static <T extends Throwable> void retry(RetryOptions options, RetryablePr
         });
   }
 
-  public static <T extends Throwable> void retryWithDefaultOption(RetryableProc<T> r) throws T {
+  public static <T extends Throwable> void retry(RetryableProc<T> r) throws T {
     retry(DEFAULT_RPC_RETRY_OPTIONS, r);
   }
 

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

@@ -270,7 +270,7 @@ public void signalWorkflowExecution(SignalExternalWorkflowParameters signalParam
     SignalWorkflowExecutionRequest request = getSignalRequest(signalParameters);
 
     try {
-      RpcRetryer.retryWithDefaultOption(() -> service.SignalWorkflowExecution(request));
+      RpcRetryer.retry(() -> service.SignalWorkflowExecution(request));
     } catch (TException e) {
       throw CheckedExceptionWrapper.wrap(e);
     }
@@ -400,7 +400,7 @@ public void requestCancelWorkflowExecution(WorkflowExecution execution) {
     request.setDomain(domain);
     request.setWorkflowExecution(execution);
     try {
-      RpcRetryer.retryWithDefaultOption(() -> service.RequestCancelWorkflowExecution(request));
+      RpcRetryer.retry(() -> service.RequestCancelWorkflowExecution(request));
     } catch (TException e) {
       throw CheckedExceptionWrapper.wrap(e);
     }
@@ -443,7 +443,7 @@ public void terminateWorkflowExecution(TerminateWorkflowExecutionParameters term
     request.setReason(terminateParameters.getReason());
     //        request.setChildPolicy(terminateParameters.getChildPolicy());
     try {
-      RpcRetryer.retryWithDefaultOption(() -> service.TerminateWorkflowExecution(request));
+      RpcRetryer.retry(() -> service.TerminateWorkflowExecution(request));
     } catch (TException e) {
       throw CheckedExceptionWrapper.wrap(e);
     }

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

@@ -95,7 +95,7 @@ public void complete(Object result) {
       request.setResult(convertedResult);
       request.setTaskToken(taskToken);
       try {
-        RpcRetryer.retryWithDefaultOption(() -> service.RespondActivityTaskCompleted(request));
+        RpcRetryer.retry(() -> service.RespondActivityTaskCompleted(request));
         metricsScope.counter(MetricsType.ACTIVITY_TASK_COMPLETED_COUNTER).inc(1);
       } catch (EntityNotExistsError e) {
         throw new ActivityNotExistsException(e);
@@ -137,7 +137,7 @@ public void fail(Throwable failure) {
       request.setDetails(dataConverter.toData(failure));
       request.setTaskToken(taskToken);
       try {
-        RpcRetryer.retryWithDefaultOption(() -> service.RespondActivityTaskFailed(request));
+        RpcRetryer.retry(() -> service.RespondActivityTaskFailed(request));
         metricsScope.counter(MetricsType.ACTIVITY_TASK_FAILED_COUNTER).inc(1);
       } catch (EntityNotExistsError e) {
         throw new ActivityNotExistsException(e);
@@ -152,7 +152,7 @@ public void fail(Throwable failure) {
       request.setWorkflowID(execution.getWorkflowId());
       request.setRunID(execution.getRunId());
       try {
-        RpcRetryer.retryWithDefaultOption(() -> service.RespondActivityTaskFailedByID(request));
+        RpcRetryer.retry(() -> service.RespondActivityTaskFailedByID(request));
         metricsScope.counter(MetricsType.ACTIVITY_TASK_FAILED_BY_ID_COUNTER).inc(1);
       } catch (EntityNotExistsError e) {
         throw new ActivityNotExistsException(e);

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

@@ -201,24 +201,22 @@ private void sendReply(
       if (taskCompleted != null) {
         taskCompleted.setTaskToken(task.getTaskToken());
         taskCompleted.setIdentity(options.getIdentity());
-        RpcRetryer.retryWithDefaultOption(
-            () -> service.RespondActivityTaskCompleted(taskCompleted));
+        RpcRetryer.retry(() -> service.RespondActivityTaskCompleted(taskCompleted));
         metricsScope.counter(MetricsType.ACTIVITY_TASK_COMPLETED_COUNTER).inc(1);
       } else {
         if (response.getTaskFailedResult() != null) {
           RespondActivityTaskFailedRequest taskFailed =
               response.getTaskFailedResult().getTaskFailedRequest();
           taskFailed.setTaskToken(task.getTaskToken());
           taskFailed.setIdentity(options.getIdentity());
-          RpcRetryer.retryWithDefaultOption(() -> service.RespondActivityTaskFailed(taskFailed));
+          RpcRetryer.retry(() -> service.RespondActivityTaskFailed(taskFailed));
           metricsScope.counter(MetricsType.ACTIVITY_TASK_FAILED_COUNTER).inc(1);
         } else {
           RespondActivityTaskCanceledRequest taskCancelled = response.getTaskCancelled();
           if (taskCancelled != null) {
             taskCancelled.setTaskToken(task.getTaskToken());
             taskCancelled.setIdentity(options.getIdentity());
-            RpcRetryer.retryWithDefaultOption(
-                () -> service.RespondActivityTaskCanceled(taskCancelled));
+            RpcRetryer.retry(() -> service.RespondActivityTaskCanceled(taskCancelled));
             metricsScope.counter(MetricsType.ACTIVITY_TASK_CANCELED_COUNTER).inc(1);
           }
         }

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

@@ -237,14 +237,13 @@ private void sendReply(
       if (taskCompleted != null) {
         taskCompleted.setIdentity(options.getIdentity());
         taskCompleted.setTaskToken(taskToken);
-        RpcRetryer.retryWithDefaultOption(
-            () -> service.RespondDecisionTaskCompleted(taskCompleted));
+        RpcRetryer.retry(() -> service.RespondDecisionTaskCompleted(taskCompleted));
       } else {
         RespondDecisionTaskFailedRequest taskFailed = response.getTaskFailed();
         if (taskFailed != null) {
           taskFailed.setIdentity(options.getIdentity());
           taskFailed.setTaskToken(taskToken);
-          RpcRetryer.retryWithDefaultOption(() -> service.RespondDecisionTaskFailed(taskFailed));
+          RpcRetryer.retry(() -> service.RespondDecisionTaskFailed(taskFailed));
         } else {
           RespondQueryTaskCompletedRequest queryCompleted = response.getQueryCompleted();
           if (queryCompleted != null) {