Fix getOriginalExecutionRunId return value and add explicit @nonnull annotations (#1737)

Author: Spikhalskiy

temporal-sdk/src/main/java/io/temporal/internal/replay/BasicWorkflowContext.java

@@ -72,7 +72,8 @@ WorkflowType getWorkflowType() {
     return startedAttributes.getWorkflowType();
   }
 
-  public String getFirstExecutionRunId() {
+  @Nonnull
+  String getFirstExecutionRunId() {
     return startedAttributes.getFirstExecutionRunId();
   }
 
@@ -81,9 +82,9 @@ Optional<String> getContinuedExecutionRunId() {
     return runId.isEmpty() ? Optional.empty() : Optional.of(runId);
   }
 
-  Optional<String> getOriginalExecutionRunId() {
-    String runId = startedAttributes.getOriginalExecutionRunId();
-    return runId.isEmpty() ? Optional.empty() : Optional.of(runId);
+  @Nonnull
+  String getOriginalExecutionRunId() {
+    return startedAttributes.getOriginalExecutionRunId();
   }
 
   WorkflowExecution getParentWorkflowExecution() {

temporal-sdk/src/main/java/io/temporal/internal/replay/ReplayWorkflowContext.java

@@ -84,13 +84,15 @@ public Functions.Proc1<Exception> getCancellationHandle() {
    * @see #getFirstExecutionRunId() for the very first RunId that is preserved along the whole
    *     Workflow Execution chain, including ContinueAsNew, Retry, Cron and Reset.
    */
+  @Nonnull
   String getRunId();
 
   /**
    * @return The very first original RunId of the current Workflow Execution preserved along the
    *     chain of ContinueAsNew, Retry, Cron and Reset. Identifies the whole Runs chain of Workflow
    *     Execution.
    */
+  @Nonnull
   String getFirstExecutionRunId();
 
   /**
@@ -108,7 +110,8 @@ public Functions.Proc1<Exception> getCancellationHandle() {
    * @see #getFirstExecutionRunId() for the very first RunId that is preserved along the whole
    *     Workflow Execution chain, including ContinueAsNew, Retry, Cron and Reset.
    */
-  Optional<String> getOriginalExecutionRunId();
+  @Nonnull
+  String getOriginalExecutionRunId();
 
   /** Workflow task queue name. */
   String getTaskQueue();

temporal-sdk/src/main/java/io/temporal/internal/replay/ReplayWorkflowContextImpl.java

@@ -120,7 +120,7 @@ public Optional<String> getContinuedExecutionRunId() {
   }
 
   @Override
-  public Optional<String> getOriginalExecutionRunId() {
+  public String getOriginalExecutionRunId() {
     return basicWorkflowContext.getOriginalExecutionRunId();
   }
 
@@ -150,6 +150,7 @@ public String getWorkflowId() {
     return basicWorkflowContext.getWorkflowExecution().getWorkflowId();
   }
 
+  @Nonnull
   @Override
   public String getRunId() {
     String result = basicWorkflowContext.getWorkflowExecution().getRunId();

temporal-sdk/src/main/java/io/temporal/internal/sync/WorkflowInfoImpl.java

@@ -26,6 +26,7 @@
 import io.temporal.workflow.WorkflowInfo;
 import java.time.Duration;
 import java.util.Optional;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 final class WorkflowInfoImpl implements WorkflowInfo {
@@ -51,11 +52,13 @@ public String getWorkflowType() {
     return context.getWorkflowType().getName();
   }
 
+  @Nonnull
   @Override
   public String getRunId() {
     return context.getRunId();
   }
 
+  @Nonnull
   @Override
   public String getFirstExecutionRunId() {
     return context.getFirstExecutionRunId();
@@ -66,8 +69,9 @@ public Optional<String> getContinuedExecutionRunId() {
     return context.getContinuedExecutionRunId();
   }
 
+  @Nonnull
   @Override
-  public Optional<String> getOriginalExecutionRunId() {
+  public String getOriginalExecutionRunId() {
     return context.getOriginalExecutionRunId();
   }
 

temporal-sdk/src/main/java/io/temporal/workflow/WorkflowInfo.java

@@ -23,6 +23,7 @@
 import io.temporal.api.common.v1.SearchAttributes;
 import java.time.Duration;
 import java.util.Optional;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 /**
@@ -54,13 +55,15 @@ public interface WorkflowInfo {
    * @see #getFirstExecutionRunId() for the very first RunId that is preserved along the whole
    *     Workflow Execution chain, including ContinueAsNew, Retry, Cron and Reset.
    */
+  @Nonnull
   String getRunId();
 
   /**
    * @return The very first original RunId of the current Workflow Execution preserved along the
    *     chain of ContinueAsNew, Retry, Cron and Reset. Identifies the whole Runs chain of Workflow
    *     Execution.
    */
+  @Nonnull
   String getFirstExecutionRunId();
 
   /**
@@ -78,7 +81,8 @@ public interface WorkflowInfo {
    * @see #getFirstExecutionRunId() for the very first RunId that is preserved along the whole
    *     Workflow Execution chain, including ContinueAsNew, Retry, Cron and Reset.
    */
-  Optional<String> getOriginalExecutionRunId();
+  @Nonnull
+  String getOriginalExecutionRunId();
 
   /**
    * @return Workflow Task Queue name

temporal-testing/src/main/java/io/temporal/internal/sync/DummySyncWorkflowContext.java

@@ -126,24 +126,27 @@ public String getWorkflowId() {
       return "dummy-workflow-id";
     }
 
+    @Nonnull
     @Override
     public String getRunId() {
       return "dummy-run-id";
     }
 
+    @Nonnull
     @Override
     public String getFirstExecutionRunId() {
-      return null;
+      throw new UnsupportedOperationException("not implemented");
     }
 
     @Override
     public Optional<String> getContinuedExecutionRunId() {
       throw new UnsupportedOperationException("not implemented");
     }
 
+    @Nonnull
     @Override
-    public Optional<String> getOriginalExecutionRunId() {
-      return Optional.empty();
+    public String getOriginalExecutionRunId() {
+      throw new UnsupportedOperationException("not implemented");
     }
 
     @Override