Remove unused retry options from worker options

Author: Liang Mei

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

@@ -139,9 +139,6 @@ public Worker newWorker(
     WorkerOptions.Builder builder =
         WorkerOptions.newBuilder()
             .setInterceptorFactory(testEnvironmentOptions.getInterceptorFactory());
-    if (testEnvironmentOptions.getDataConverter() != null) {
-      builder.setDataConverter(testEnvironmentOptions.getDataConverter());
-    }
     builder = overrideOptions.apply(builder);
     return workerFactory.newWorker(taskList, builder.build());
   }

src/main/java/com/uber/cadence/worker/Worker.java

@@ -84,7 +84,7 @@ public final class Worker implements Suspendable {
 
     SingleWorkerOptions activityOptions =
         SingleWorkerOptions.newBuilder()
-            .setDataConverter(options.getDataConverter())
+            .setDataConverter(client.getOptions().getDataConverter())
             .setIdentity(client.getOptions().getIdentity())
             .setPollerOptions(options.getActivityPollerOptions())
             .setTaskExecutorThreadPoolSize(options.getMaxConcurrentActivityExecutionSize())
@@ -98,7 +98,7 @@ public final class Worker implements Suspendable {
 
     SingleWorkerOptions workflowOptions =
         SingleWorkerOptions.newBuilder()
-            .setDataConverter(options.getDataConverter())
+            .setDataConverter(client.getOptions().getDataConverter())
             .setIdentity(client.getOptions().getIdentity())
             .setPollerOptions(options.getWorkflowPollerOptions())
             .setTaskExecutorThreadPoolSize(options.getMaxConcurrentWorkflowExecutionSize())
@@ -108,7 +108,7 @@ public final class Worker implements Suspendable {
             .build();
     SingleWorkerOptions localActivityOptions =
         SingleWorkerOptions.newBuilder()
-            .setDataConverter(options.getDataConverter())
+            .setDataConverter(client.getOptions().getDataConverter())
             .setIdentity(client.getOptions().getIdentity())
             .setPollerOptions(options.getWorkflowPollerOptions())
             .setTaskExecutorThreadPoolSize(options.getMaxConcurrentLocalActivityExecutionSize())

src/main/java/com/uber/cadence/worker/WorkerOptions.java

@@ -17,9 +17,6 @@
 
 package com.uber.cadence.worker;
 
-import com.uber.cadence.common.RetryOptions;
-import com.uber.cadence.converter.DataConverter;
-import com.uber.cadence.converter.JsonDataConverter;
 import com.uber.cadence.internal.worker.PollerOptions;
 import com.uber.cadence.workflow.WorkflowInterceptor;
 import java.util.Objects;
@@ -47,47 +44,28 @@ public static WorkerOptions defaultInstance() {
   public static final class Builder {
 
     private double workerActivitiesPerSecond;
-    private DataConverter dataConverter = JsonDataConverter.getInstance();
     private int maxConcurrentActivityExecutionSize = 100;
     private int maxConcurrentWorkflowExecutionSize = 50;
     private int maxConcurrentLocalActivityExecutionSize = 100;
     private double taskListActivitiesPerSecond = 100000;
     private PollerOptions activityPollerOptions;
     private PollerOptions workflowPollerOptions;
-    private RetryOptions reportActivityCompletionRetryOptions;
-    private RetryOptions reportActivityFailureRetryOptions;
-    private RetryOptions reportWorkflowCompletionRetryOptions;
-    private RetryOptions reportWorkflowFailureRetryOptions;
     private Function<WorkflowInterceptor, WorkflowInterceptor> interceptorFactory = (n) -> n;
 
     private Builder() {}
 
     private Builder(WorkerOptions options) {
       this.workerActivitiesPerSecond = options.workerActivitiesPerSecond;
-      this.dataConverter = options.dataConverter;
       this.maxConcurrentActivityExecutionSize = options.maxConcurrentActivityExecutionSize;
       this.maxConcurrentWorkflowExecutionSize = options.maxConcurrentWorkflowExecutionSize;
       this.maxConcurrentLocalActivityExecutionSize =
           options.maxConcurrentLocalActivityExecutionSize;
       this.taskListActivitiesPerSecond = options.taskListActivitiesPerSecond;
       this.activityPollerOptions = options.activityPollerOptions;
       this.workflowPollerOptions = options.workflowPollerOptions;
-      this.reportActivityCompletionRetryOptions = options.reportActivityCompletionRetryOptions;
-      this.reportActivityFailureRetryOptions = options.reportActivityFailureRetryOptions;
-      this.reportWorkflowCompletionRetryOptions = options.reportWorkflowCompletionRetryOptions;
-      this.reportWorkflowFailureRetryOptions = options.reportWorkflowFailureRetryOptions;
       this.interceptorFactory = options.interceptorFactory;
     }
 
-    /**
-     * Override a data converter implementation used by workflows and activities executed by this
-     * worker. Default is {@link com.uber.cadence.converter.JsonDataConverter} data converter.
-     */
-    public Builder setDataConverter(DataConverter dataConverter) {
-      this.dataConverter = Objects.requireNonNull(dataConverter);
-      return this;
-    }
-
     /** Maximum number of activities started per second. Default is 0 which means unlimited. */
     public Builder setWorkerActivitiesPerSecond(double workerActivitiesPerSecond) {
       if (workerActivitiesPerSecond <= 0) {
@@ -160,72 +138,48 @@ public Builder setTaskListActivitiesPerSecond(double taskListActivitiesPerSecond
     public WorkerOptions build() {
       return new WorkerOptions(
           workerActivitiesPerSecond,
-          dataConverter,
           maxConcurrentActivityExecutionSize,
           maxConcurrentWorkflowExecutionSize,
           maxConcurrentLocalActivityExecutionSize,
           taskListActivitiesPerSecond,
           activityPollerOptions,
           workflowPollerOptions,
-          reportActivityCompletionRetryOptions,
-          reportActivityFailureRetryOptions,
-          reportWorkflowCompletionRetryOptions,
-          reportWorkflowFailureRetryOptions,
           interceptorFactory);
     }
   }
 
   private final double workerActivitiesPerSecond;
-  private final DataConverter dataConverter;
   private final int maxConcurrentActivityExecutionSize;
   private final int maxConcurrentWorkflowExecutionSize;
   private final int maxConcurrentLocalActivityExecutionSize;
   private final double taskListActivitiesPerSecond;
   private final PollerOptions activityPollerOptions;
   private final PollerOptions workflowPollerOptions;
-  private final RetryOptions reportActivityCompletionRetryOptions;
-  private final RetryOptions reportActivityFailureRetryOptions;
-  private final RetryOptions reportWorkflowCompletionRetryOptions;
-  private final RetryOptions reportWorkflowFailureRetryOptions;
   private final Function<WorkflowInterceptor, WorkflowInterceptor> interceptorFactory;
 
   private WorkerOptions(
       double workerActivitiesPerSecond,
-      DataConverter dataConverter,
       int maxConcurrentActivityExecutionSize,
       int maxConcurrentWorkflowExecutionSize,
       int maxConcurrentLocalActivityExecutionSize,
       double taskListActivitiesPerSecond,
       PollerOptions activityPollerOptions,
       PollerOptions workflowPollerOptions,
-      RetryOptions reportActivityCompletionRetryOptions,
-      RetryOptions reportActivityFailureRetryOptions,
-      RetryOptions reportWorkflowCompletionRetryOptions,
-      RetryOptions reportWorkflowFailureRetryOptions,
       Function<WorkflowInterceptor, WorkflowInterceptor> interceptorFactory) {
     this.workerActivitiesPerSecond = workerActivitiesPerSecond;
-    this.dataConverter = dataConverter;
     this.maxConcurrentActivityExecutionSize = maxConcurrentActivityExecutionSize;
     this.maxConcurrentWorkflowExecutionSize = maxConcurrentWorkflowExecutionSize;
     this.maxConcurrentLocalActivityExecutionSize = maxConcurrentLocalActivityExecutionSize;
     this.taskListActivitiesPerSecond = taskListActivitiesPerSecond;
     this.activityPollerOptions = activityPollerOptions;
     this.workflowPollerOptions = workflowPollerOptions;
-    this.reportActivityCompletionRetryOptions = reportActivityCompletionRetryOptions;
-    this.reportActivityFailureRetryOptions = reportActivityFailureRetryOptions;
-    this.reportWorkflowCompletionRetryOptions = reportWorkflowCompletionRetryOptions;
-    this.reportWorkflowFailureRetryOptions = reportWorkflowFailureRetryOptions;
     this.interceptorFactory = interceptorFactory;
   }
 
   public double getWorkerActivitiesPerSecond() {
     return workerActivitiesPerSecond;
   }
 
-  public DataConverter getDataConverter() {
-    return dataConverter;
-  }
-
   public int getMaxConcurrentActivityExecutionSize() {
     return maxConcurrentActivityExecutionSize;
   }
@@ -246,22 +200,6 @@ public PollerOptions getWorkflowPollerOptions() {
     return workflowPollerOptions;
   }
 
-  public RetryOptions getReportActivityCompletionRetryOptions() {
-    return reportActivityCompletionRetryOptions;
-  }
-
-  public RetryOptions getReportActivityFailureRetryOptions() {
-    return reportActivityFailureRetryOptions;
-  }
-
-  public RetryOptions getReportWorkflowCompletionRetryOptions() {
-    return reportWorkflowCompletionRetryOptions;
-  }
-
-  public RetryOptions getReportWorkflowFailureRetryOptions() {
-    return reportWorkflowFailureRetryOptions;
-  }
-
   public Function<WorkflowInterceptor, WorkflowInterceptor> getInterceptorFactory() {
     return interceptorFactory;
   }
@@ -271,8 +209,6 @@ public String toString() {
     return "WorkerOptions{"
         + "workerActivitiesPerSecond="
         + workerActivitiesPerSecond
-        + ", dataConverter="
-        + dataConverter
         + ", maxConcurrentActivityExecutionSize="
         + maxConcurrentActivityExecutionSize
         + ", maxConcurrentWorkflowExecutionSize="
@@ -285,14 +221,6 @@ public String toString() {
         + activityPollerOptions
         + ", workflowPollerOptions="
         + workflowPollerOptions
-        + ", reportActivityCompletionRetryOptions="
-        + reportActivityCompletionRetryOptions
-        + ", reportActivityFailureRetryOptions="
-        + reportActivityFailureRetryOptions
-        + ", reportWorkflowCompletionRetryOptions="
-        + reportWorkflowCompletionRetryOptions
-        + ", reportWorkflowFailureRetryOptions="
-        + reportWorkflowFailureRetryOptions
         + '}';
   }
 }