Ensure DurableTask classes are hidden in Workflow Runtime package (dapr#1311)

* Ensure DurableTask classes are hidden in Workflow Runtime package

Signed-off-by: Artur Ciocanu <[email protected]>

* Fix the file header

Signed-off-by: Artur Ciocanu <[email protected]>

---------

Signed-off-by: Artur Ciocanu <[email protected]>
Co-authored-by: Artur Ciocanu <[email protected]>

Author: artur-ciocanu

sdk-workflows/src/main/java/io/dapr/workflows/client/DaprWorkflowClient.java

@@ -15,12 +15,14 @@
 
 import com.microsoft.durabletask.DurableTaskClient;
 import com.microsoft.durabletask.DurableTaskGrpcClientBuilder;
+import com.microsoft.durabletask.NewOrchestrationInstanceOptions;
 import com.microsoft.durabletask.OrchestrationMetadata;
 import com.microsoft.durabletask.PurgeResult;
 import io.dapr.config.Properties;
 import io.dapr.utils.NetworkUtils;
 import io.dapr.workflows.Workflow;
 import io.dapr.workflows.internal.ApiTokenClientInterceptor;
+import io.dapr.workflows.runtime.DefaultWorkflowInstanceStatus;
 import io.grpc.ClientInterceptor;
 import io.grpc.ManagedChannel;
 
@@ -76,18 +78,6 @@ private DaprWorkflowClient(DurableTaskClient innerClient, ManagedChannel grpcCha
     this.grpcChannel = grpcChannel;
   }
 
-  /**
-   * Static method to create the DurableTaskClient.
-   *
-   * @param grpcChannel ManagedChannel for GRPC.
-   * @return a new instance of a DurableTaskClient with a GRPC channel.
-   */
-  private static DurableTaskClient createDurableTaskClient(ManagedChannel grpcChannel) {
-    return new DurableTaskGrpcClientBuilder()
-        .grpcChannel(grpcChannel)
-        .build();
-  }
-
   /**
    * Schedules a new workflow using DurableTask client.
    *
@@ -133,8 +123,10 @@ public <T extends Workflow> String scheduleNewWorkflow(Class<T> clazz, Object in
    * @return the <code>instanceId</code> parameter value.
    */
   public <T extends Workflow> String scheduleNewWorkflow(Class<T> clazz, NewWorkflowOptions options) {
+    NewOrchestrationInstanceOptions orchestrationInstanceOptions = fromNewWorkflowOptions(options);
+
     return this.innerClient.scheduleNewOrchestrationInstance(clazz.getCanonicalName(),
-        options.getNewOrchestrationInstanceOptions());
+        orchestrationInstanceOptions);
   }
 
   /**
@@ -158,10 +150,8 @@ public void terminateWorkflow(String workflowInstanceId, @Nullable Object output
   @Nullable
   public WorkflowInstanceStatus getInstanceState(String instanceId, boolean getInputsAndOutputs) {
     OrchestrationMetadata metadata = this.innerClient.getInstanceMetadata(instanceId, getInputsAndOutputs);
-    if (metadata == null) {
-      return null;
-    }
-    return new WorkflowInstanceStatus(metadata);
+
+    return metadata == null ? null : new DefaultWorkflowInstanceStatus(metadata);
   }
 
   /**
@@ -186,7 +176,8 @@ public WorkflowInstanceStatus waitForInstanceStart(String instanceId, Duration t
       throws TimeoutException {
 
     OrchestrationMetadata metadata = this.innerClient.waitForInstanceStart(instanceId, timeout, getInputsAndOutputs);
-    return metadata == null ? null : new WorkflowInstanceStatus(metadata);
+
+    return metadata == null ? null : new DefaultWorkflowInstanceStatus(metadata);
   }
 
   /**
@@ -210,11 +201,11 @@ public WorkflowInstanceStatus waitForInstanceStart(String instanceId, Duration t
    */
   @Nullable
   public WorkflowInstanceStatus waitForInstanceCompletion(String instanceId, Duration timeout,
-                                                          boolean getInputsAndOutputs) throws TimeoutException {
+      boolean getInputsAndOutputs) throws TimeoutException {
 
-    OrchestrationMetadata metadata =
-        this.innerClient.waitForInstanceCompletion(instanceId, timeout, getInputsAndOutputs);
-    return metadata == null ? null : new WorkflowInstanceStatus(metadata);
+    OrchestrationMetadata metadata = this.innerClient.waitForInstanceCompletion(instanceId, timeout,
+        getInputsAndOutputs);
+    return metadata == null ? null : new DefaultWorkflowInstanceStatus(metadata);
   }
 
   /**
@@ -236,18 +227,12 @@ public void raiseEvent(String workflowInstanceId, String eventName, Object event
    */
   public boolean purgeInstance(String workflowInstanceId) {
     PurgeResult result = this.innerClient.purgeInstance(workflowInstanceId);
+
     if (result != null) {
       return result.getDeletedInstanceCount() > 0;
     }
-    return false;
-  }
-
-  public void createTaskHub(boolean recreateIfExists) {
-    this.innerClient.createTaskHub(recreateIfExists);
-  }
 
-  public void deleteTaskHub() {
-    this.innerClient.deleteTaskHub();
+    return false;
   }
 
   /**
@@ -267,6 +252,38 @@ public void close() throws InterruptedException {
     }
   }
 
+  /**
+   * Static method to create the DurableTaskClient.
+   *
+   * @param grpcChannel ManagedChannel for GRPC.
+   * @return a new instance of a DurableTaskClient with a GRPC channel.
+   */
+  private static DurableTaskClient createDurableTaskClient(ManagedChannel grpcChannel) {
+    return new DurableTaskGrpcClientBuilder()
+        .grpcChannel(grpcChannel)
+        .build();
+  }
 
-}
+  private static NewOrchestrationInstanceOptions fromNewWorkflowOptions(NewWorkflowOptions options) {
+    NewOrchestrationInstanceOptions instanceOptions = new NewOrchestrationInstanceOptions();
 
+    if (options.getVersion() != null) {
+      instanceOptions.setVersion(options.getVersion());
+    }
+
+    if (options.getInstanceId() != null) {
+      instanceOptions.setInstanceId(options.getInstanceId());
+    }
+
+    if (options.getInput() != null) {
+      instanceOptions.setInput(options.getInput());
+    }
+
+    if (options.getStartTime() != null) {
+      instanceOptions.setStartTime(options.getStartTime());
+    }
+
+    return instanceOptions;
+  }
+
+}

sdk-workflows/src/main/java/io/dapr/workflows/client/NewWorkflowOptions.java

@@ -13,15 +13,17 @@
 
 package io.dapr.workflows.client;
 
-import com.microsoft.durabletask.NewOrchestrationInstanceOptions;
-
 import java.time.Instant;
 
 /**
  * Options for starting a new instance of a workflow.
  */
 public class NewWorkflowOptions {
-  private final NewOrchestrationInstanceOptions newOrchestrationInstanceOptions = new NewOrchestrationInstanceOptions();
+
+  private String version;
+  private String instanceId;
+  private Object input;
+  private Instant startTime;
 
   /**
    * Sets the version of the workflow to start.
@@ -30,7 +32,7 @@ public class NewWorkflowOptions {
    * @return this {@link NewWorkflowOptions} object
    */
   public NewWorkflowOptions setVersion(String version) {
-    this.newOrchestrationInstanceOptions.setVersion(version);
+    this.version = version;
     return this;
   }
 
@@ -43,7 +45,7 @@ public NewWorkflowOptions setVersion(String version) {
    * @return this {@link NewWorkflowOptions} object
    */
   public NewWorkflowOptions setInstanceId(String instanceId) {
-    this.newOrchestrationInstanceOptions.setInstanceId(instanceId);
+    this.instanceId = instanceId;
     return this;
   }
 
@@ -54,7 +56,7 @@ public NewWorkflowOptions setInstanceId(String instanceId) {
    * @return this {@link NewWorkflowOptions} object
    */
   public NewWorkflowOptions setInput(Object input) {
-    this.newOrchestrationInstanceOptions.setInput(input);
+    this.input = input;
     return this;
   }
 
@@ -68,7 +70,7 @@ public NewWorkflowOptions setInput(Object input) {
    * @return this {@link NewWorkflowOptions} object
    */
   public NewWorkflowOptions setStartTime(Instant startTime) {
-    this.newOrchestrationInstanceOptions.setStartTime(startTime);
+    this.startTime = startTime;
     return this;
   }
 
@@ -78,7 +80,7 @@ public NewWorkflowOptions setStartTime(Instant startTime) {
    * @return the user-specified version of the new workflow.
    */
   public String getVersion() {
-    return this.newOrchestrationInstanceOptions.getVersion();
+    return this.version;
   }
 
   /**
@@ -87,7 +89,7 @@ public String getVersion() {
    * @return the instance ID of the new workflow.
    */
   public String getInstanceId() {
-    return this.newOrchestrationInstanceOptions.getInstanceId();
+    return this.instanceId;
   }
 
   /**
@@ -96,7 +98,7 @@ public String getInstanceId() {
    * @return the input of the new workflow.
    */
   public Object getInput() {
-    return this.newOrchestrationInstanceOptions.getInput();
+    return this.input;
   }
 
   /**
@@ -105,10 +107,7 @@ public Object getInput() {
    * @return the configured start time of the new workflow instance.
    */
   public Instant getStartTime() {
-    return this.newOrchestrationInstanceOptions.getStartTime();
+    return this.startTime;
   }
 
-  public NewOrchestrationInstanceOptions getNewOrchestrationInstanceOptions() {
-    return newOrchestrationInstanceOptions;
-  }
 }

sdk-workflows/src/main/java/io/dapr/workflows/client/WorkflowFailureDetails.java

@@ -13,53 +13,30 @@
 
 package io.dapr.workflows.client;
 
-import com.microsoft.durabletask.FailureDetails;
-
 /**
  * Represents a workflow failure details.
  */
-public class WorkflowFailureDetails {
-
-  private final FailureDetails workflowFailureDetails;
-
-  /**
-   * Class constructor.
-   *
-   * @param failureDetails failure Details
-   */
-  public WorkflowFailureDetails(FailureDetails failureDetails) {
-    this.workflowFailureDetails = failureDetails;
-  }
+public interface WorkflowFailureDetails {
 
   /**
    * Gets the error type, which is the namespace-qualified exception type name.
    *
    * @return the error type, which is the namespace-qualified exception type name
    */
-  public String getErrorType() {
-    return workflowFailureDetails.getErrorType();
-  }
+  String getErrorType();
 
   /**
    * Gets the error message.
    *
    * @return the error message
    */
-  public String getErrorMessage() {
-    return workflowFailureDetails.getErrorMessage();
-  }
+  String getErrorMessage();
 
   /**
    * Gets the stack trace.
    *
    * @return the stack trace
    */
-  public String getStackTrace() {
-    return workflowFailureDetails.getStackTrace();
-  }
+  String getStackTrace();
 
-  @Override
-  public String toString() {
-    return workflowFailureDetails.toString();
-  }
 }