Fix NPE

Signed-off-by: siri-varma <siri.varma@outlook.com>
Signed-off-by: sirivarma <siri.varma@outlook.com>

Author: siri-varma

examples/src/main/java/io/dapr/examples/workflows/childworkflow/DemoChildWorkerflowClient.java

@@ -16,6 +16,7 @@
 import io.dapr.workflows.client.DaprWorkflowClient;
 import io.dapr.workflows.client.WorkflowInstanceStatus;
 
+import java.time.Duration;
 import java.util.concurrent.TimeoutException;
 
 public class DemoChildWorkerflowClient {
@@ -27,15 +28,19 @@ public class DemoChildWorkerflowClient {
    */
   public static void main(String[] args) {
     try (DaprWorkflowClient client = new DaprWorkflowClient()) {
-      String instanceId = client.scheduleNewWorkflow(DemoWorkflow.class);
+      String instanceId = client.scheduleNewWorkflow(DemoChildWorkflow.class, "Hello Word");
       System.out.printf("Started a new child-workflow model workflow with instance ID: %s%n", instanceId);
-      WorkflowInstanceStatus workflowInstanceStatus =
-          client.waitForInstanceCompletion(instanceId, null, true);
 
-      String result = workflowInstanceStatus.readOutputAs(String.class);
-      System.out.printf("workflow instance with ID: %s completed with result: %s%n", instanceId, result);
+      while (true) {
+        try {
+          Thread.sleep(10000);
+          System.out.println(client.getInstanceState(instanceId, true).getRuntimeStatus());
+        } catch (Exception ex) {
+          System.out.println("exception");
+        }
+      }
 
-    } catch (TimeoutException | InterruptedException e) {
+    } catch (InterruptedException e) {
       throw new RuntimeException(e);
     }
   }

examples/src/main/java/io/dapr/examples/workflows/childworkflow/DemoChildWorkflow.java

@@ -13,20 +13,41 @@
 
 package io.dapr.examples.workflows.childworkflow;
 
+import io.dapr.durabletask.interruption.OrchestratorBlockedException;
 import io.dapr.workflows.Workflow;
 import io.dapr.workflows.WorkflowStub;
+import io.dapr.workflows.WorkflowTaskOptions;
+import io.dapr.workflows.WorkflowTaskRetryPolicy;
+
+import java.time.Duration;
 
 public class DemoChildWorkflow implements Workflow {
   @Override
   public WorkflowStub create() {
     return ctx -> {
       ctx.getLogger().info("Starting ChildWorkflow: " + ctx.getName());
 
+      WorkflowTaskRetryPolicy policy = WorkflowTaskRetryPolicy.newBuilder()
+              .setFirstRetryInterval(Duration.ofSeconds(1))
+              .setMaxNumberOfAttempts(10)
+              .build();
+
+      WorkflowTaskOptions options = new WorkflowTaskOptions(policy);
+
       var childWorkflowInput = ctx.getInput(String.class);
       ctx.getLogger().info("ChildWorkflow received input: " + childWorkflowInput);
 
       ctx.getLogger().info("ChildWorkflow is calling Activity: " + ReverseActivity.class.getName());
-      String result = ctx.callActivity(ReverseActivity.class.getName(), childWorkflowInput, String.class).await();
+      String result = new String("");
+
+      try {
+        result = ctx.callActivity(ReverseActivity.class.getName(), childWorkflowInput, options, String.class).await();
+      } catch (OrchestratorBlockedException ex) {
+        throw ex;
+      } catch (Exception ex) {
+        System.out.println("EX:" + ex.getMessage());
+        ctx.getLogger().warn("Ex is what instance of " + (ex.getMessage()));
+      }
 
       ctx.getLogger().info("ChildWorkflow finished with: " + result);
       ctx.complete(result);

examples/src/main/java/io/dapr/examples/workflows/childworkflow/DemoChildWorkflowWorker.java

@@ -13,9 +13,13 @@
 
 package io.dapr.examples.workflows.childworkflow;
 
+import io.dapr.workflows.WorkflowTaskRetryPolicy;
 import io.dapr.workflows.runtime.WorkflowRuntime;
 import io.dapr.workflows.runtime.WorkflowRuntimeBuilder;
 
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+
 public class DemoChildWorkflowWorker {
   /**
    * The main method of this app.
@@ -25,13 +29,15 @@ public class DemoChildWorkflowWorker {
    */
   public static void main(String[] args) throws Exception {
     // Register the Workflow with the builder.
+
     WorkflowRuntimeBuilder builder = new WorkflowRuntimeBuilder()
         .registerWorkflow(DemoWorkflow.class)
             .registerWorkflow(DemoChildWorkflow.class);
     builder.registerActivity(ReverseActivity.class);
 
     // Build and then start the workflow runtime pulling and executing tasks
     WorkflowRuntime runtime = builder.build();
+    runtime.start();
     System.out.println("Start workflow runtime");
   }
 }

examples/src/main/java/io/dapr/examples/workflows/childworkflow/ReverseActivity.java

@@ -30,6 +30,13 @@ public Object run(WorkflowActivityContext ctx) {
     logger.info("Message Received from input: " + message);
     logger.info("Sending message to output: " + newMessage);
 
-    return newMessage;
+    throw new RuntimeException("abcdef");
   }
 }
+
+class MyCustomException extends RuntimeException {
+
+  public MyCustomException(String message) {
+    super(message);
+  }
+}

sdk-workflows/pom.xml

@@ -47,7 +47,7 @@
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>durabletask-client</artifactId>
-      <version>1.5.2</version>
+      <version>1.5.3</version>
     </dependency>
     <!--
     manually declare durabletask-client's jackson dependencies

sdk-workflows/src/main/java/io/dapr/workflows/WorkflowTaskRetryPolicy.java

@@ -166,9 +166,10 @@ public Builder setMaxRetryInterval(@Nullable Duration maxRetryInterval) {
      * @return This builder
      */
     public Builder setRetryTimeout(Duration retryTimeout) {
-      if (retryTimeout != null && retryTimeout.compareTo(this.firstRetryInterval) < 0) {
+      if (retryTimeout == null || retryTimeout.compareTo(this.firstRetryInterval) < 0) {
         throw new IllegalArgumentException(
-            "The value for retryTimeout must be greater than or equal to the value for firstRetryInterval.");
+            "The value for retryTimeout cannot be null and"
+                    + " must be greater than or equal to the value for firstRetryInterval.");
       }
 
       this.retryTimeout = retryTimeout;

sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java

@@ -240,7 +240,9 @@ private static TaskOptions toTaskOptions(WorkflowTaskOptions options) {
     );
 
     retryPolicy.setBackoffCoefficient(workflowTaskRetryPolicy.getBackoffCoefficient());
-    retryPolicy.setRetryTimeout(workflowTaskRetryPolicy.getRetryTimeout());
+    if (workflowTaskRetryPolicy.getRetryTimeout() != null) {
+      retryPolicy.setRetryTimeout(workflowTaskRetryPolicy.getRetryTimeout());
+    }
 
     return new TaskOptions(retryPolicy);
   }