PR feedback

Signed-off-by: Cassandra Coyle <[email protected]>

Author: cicoyle

client/src/main/java/io/dapr/durabletask/TaskOptions.java

@@ -10,10 +10,10 @@ public final class TaskOptions {
     private final RetryHandler retryHandler;
     private final String appID;
 
-    private TaskOptions(Builder builder) {
-        this.retryPolicy = builder.retryPolicy;
-        this.retryHandler = builder.retryHandler;
-        this.appID = builder.appID;
+    private TaskOptions(RetryPolicy retryPolicy, RetryHandler retryHandler, String appID) {
+        this.retryPolicy = retryPolicy;
+        this.retryHandler = retryHandler;
+        this.appID = appID;
     }
 
     /**
@@ -142,7 +142,7 @@ public Builder appID(String appID) {
          * @return a new TaskOptions instance
          */
         public TaskOptions build() {
-            return new TaskOptions(this);
+            return new TaskOptions(this.retryPolicy, this.retryHandler, this.appID);
         }
     }
 }

client/src/main/java/io/dapr/durabletask/TaskOrchestrationExecutor.java

@@ -147,6 +147,10 @@ public String getAppId() {
             return this.appId;
         }
 
+        private void setAppId(String appId) {
+            this.appId = appId;
+        }
+
         @Override
         public Instant getCurrentInstant() {
             // TODO: Throw if instant is null
@@ -874,7 +878,7 @@ private void processEvent(HistoryEvent e) {
                         this.setInput(executionStarted.getInput().getValue());
                         this.setInstanceId(executionStarted.getOrchestrationInstance().getInstanceId());
                         this.logger.fine(() -> this.instanceId + ": Workflow execution started");
-                        this.appId = e.getRouter().getSourceAppID();
+                        this.setAppId(e.getRouter().getSourceAppID());
 
                         // Create and invoke the workflow orchestrator
                         TaskOrchestrationFactory factory = TaskOrchestrationExecutor.this.orchestrationFactories.get(executionStarted.getName());

client/src/test/java/io/dapr/durabletask/TaskOptionsTest.java

@@ -121,20 +121,16 @@ public boolean handle(RetryContext context) {
 
     @Test
     void taskOptionsWithBuilderChaining() {
-        RetryPolicy retryPolicy = new RetryPolicy(2, Duration.ofSeconds(30));
-        RetryHandler retryHandler = new RetryHandler() {
-            @Override
-            public boolean handle(RetryContext context) {
-                return context.getLastAttemptNumber() < 1;
-            }
-        };
+        RetryPolicy retryPolicy = new RetryPolicy(3, Duration.ofSeconds(1));
+        RetryHandler retryHandler = context -> true;
 
         TaskOptions options = TaskOptions.builder()
                 .retryPolicy(retryPolicy)
                 .retryHandler(retryHandler)
                 .appID("test-app")
                 .build();
 
+        assertNotNull(options);
         assertTrue(options.hasRetryPolicy());
         assertEquals(retryPolicy, options.getRetryPolicy());
         assertTrue(options.hasRetryHandler());