Some improvements

Author: Evanthx

temporal-sdk/src/main/java/io/temporal/client/NexusOperationExecutionDescription.java

@@ -33,12 +33,12 @@ public NexusOperationExecutionDescription(
         /* rawListInfo= */ null,
         response.getInfo().getOperationId(),
         nullIfEmpty(response.getInfo().getRunId()),
-        response.getInfo().getEndpoint(),
-        response.getInfo().getService(),
-        response.getInfo().getOperation(),
+        nullIfEmpty(response.getInfo().getEndpoint()),
+        nullIfEmpty(response.getInfo().getService()),
+        nullIfEmpty(response.getInfo().getOperation()),
         response.getInfo().hasScheduleTime()
             ? ProtobufTimeUtils.toJavaInstant(response.getInfo().getScheduleTime())
-            : Instant.EPOCH,
+            : null,
         response.getInfo().hasCloseTime()
             ? ProtobufTimeUtils.toJavaInstant(response.getInfo().getCloseTime())
             : null,
@@ -53,10 +53,6 @@ public NexusOperationExecutionDescription(
     this.dataConverter = dataConverter;
   }
 
-  private static @Nullable String nullIfEmpty(String s) {
-    return s == null || s.isEmpty() ? null : s;
-  }
-
   /** Underlying proto response. Exposed while the Nexus SDK surface is still experimental. */
   @Nonnull
   public DescribeNexusOperationExecutionResponse getRawResponse() {

temporal-sdk/src/main/java/io/temporal/client/NexusOperationExecutionMetadata.java

@@ -22,10 +22,10 @@ public class NexusOperationExecutionMetadata {
   private final @Nullable NexusOperationExecutionListInfo rawListInfo;
   private final String operationId;
   private final @Nullable String runId;
-  private final String endpoint;
-  private final String service;
-  private final String operation;
-  private final Instant scheduledTime;
+  private final @Nullable String endpoint;
+  private final @Nullable String service;
+  private final @Nullable String operation;
+  private final @Nullable Instant scheduledTime;
   private final @Nullable Instant closeTime;
   private final NexusOperationExecutionStatus status;
   private final SearchAttributes searchAttributes;
@@ -36,10 +36,10 @@ public class NexusOperationExecutionMetadata {
       @Nullable NexusOperationExecutionListInfo rawListInfo,
       String operationId,
       @Nullable String runId,
-      String endpoint,
-      String service,
-      String operation,
-      Instant scheduledTime,
+      @Nullable String endpoint,
+      @Nullable String service,
+      @Nullable String operation,
+      @Nullable Instant scheduledTime,
       @Nullable Instant closeTime,
       NexusOperationExecutionStatus status,
       SearchAttributes searchAttributes,
@@ -59,16 +59,19 @@ public class NexusOperationExecutionMetadata {
     this.executionDuration = executionDuration;
   }
 
+  static @Nullable String nullIfEmpty(String s) {
+    return s == null || s.isEmpty() ? null : s;
+  }
+
   public static NexusOperationExecutionMetadata fromListInfo(NexusOperationExecutionListInfo info) {
-    String runId = info.getRunId();
     return new NexusOperationExecutionMetadata(
         info,
         info.getOperationId(),
-        runId.isEmpty() ? null : runId,
-        info.getEndpoint(),
-        info.getService(),
-        info.getOperation(),
-        ProtobufTimeUtils.toJavaInstant(info.getScheduleTime()),
+        nullIfEmpty(info.getRunId()),
+        nullIfEmpty(info.getEndpoint()),
+        nullIfEmpty(info.getService()),
+        nullIfEmpty(info.getOperation()),
+        info.hasScheduleTime() ? ProtobufTimeUtils.toJavaInstant(info.getScheduleTime()) : null,
         info.hasCloseTime() ? ProtobufTimeUtils.toJavaInstant(info.getCloseTime()) : null,
         info.getStatus(),
         SearchAttributesUtil.decodeTyped(info.getSearchAttributes()),
@@ -99,26 +102,29 @@ public String getRunId() {
     return runId;
   }
 
-  /** The Nexus endpoint name this operation targets. */
-  @Nonnull
+  /** The Nexus endpoint name this operation targets. {@code null} if the server omitted it. */
+  @Nullable
   public String getEndpoint() {
     return endpoint;
   }
 
-  /** The Nexus service name on the endpoint. */
-  @Nonnull
+  /** The Nexus service name on the endpoint. {@code null} if the server omitted it. */
+  @Nullable
   public String getService() {
     return service;
   }
 
-  /** The Nexus operation name within the service. */
-  @Nonnull
+  /** The Nexus operation name within the service. {@code null} if the server omitted it. */
+  @Nullable
   public String getOperation() {
     return operation;
   }
 
-  /** Time when the operation was originally scheduled via a {@code StartNexusOperation} request. */
-  @Nonnull
+  /**
+   * Time when the operation was originally scheduled via a {@code StartNexusOperation} request.
+   * {@code null} if the server omitted it.
+   */
+  @Nullable
   public Instant getScheduledTime() {
     return scheduledTime;
   }

temporal-sdk/src/test/java/io/temporal/client/nexus/NexusAsyncApiTest.java

@@ -2,14 +2,6 @@
 
 import static org.junit.Assume.assumeTrue;
 
-import io.nexusrpc.OperationException;
-import io.nexusrpc.handler.OperationCancelDetails;
-import io.nexusrpc.handler.OperationContext;
-import io.nexusrpc.handler.OperationHandler;
-import io.nexusrpc.handler.OperationImpl;
-import io.nexusrpc.handler.OperationStartDetails;
-import io.nexusrpc.handler.OperationStartResult;
-import io.nexusrpc.handler.ServiceImpl;
 import io.temporal.api.nexus.v1.Endpoint;
 import io.temporal.client.NexusClient;
 import io.temporal.client.NexusClientOptions;
@@ -21,6 +13,7 @@
 import io.temporal.client.UntypedNexusOperationHandle;
 import io.temporal.client.UntypedNexusServiceClient;
 import io.temporal.testing.internal.SDKTestWorkflowRule;
+import io.temporal.workflow.shared.EchoNexusServiceImpl;
 import io.temporal.workflow.shared.TestNexusServices;
 import io.temporal.workflow.shared.TestWorkflows;
 import java.time.Duration;
@@ -42,13 +35,12 @@
 public class NexusAsyncApiTest {
 
   private static final Duration FUTURE_GET_TIMEOUT = Duration.ofSeconds(30);
-  private static final String FAIL_PREFIX = "FAIL:";
 
   @Rule
   public SDKTestWorkflowRule testWorkflowRule =
       SDKTestWorkflowRule.newBuilder()
           .setWorkflowTypes(PlaceholderWorkflowImpl.class)
-          .setNexusServiceImplementation(new TestNexusServiceImpl())
+          .setNexusServiceImplementation(new EchoNexusServiceImpl())
           .build();
 
   @BeforeClass
@@ -166,7 +158,9 @@ public void untypedHandleGetResultAsyncWithTimeoutByClassAndTypeReturnsResult()
   public void executeAsyncPropagatesOperationFailure() throws Exception {
     CompletableFuture<String> future =
         buildServiceClient()
-            .executeAsync(TestNexusServices.TestNexusService1::operation, FAIL_PREFIX + "boom");
+            .executeAsync(
+                TestNexusServices.TestNexusService1::operation,
+                EchoNexusServiceImpl.FAIL_PREFIX + "boom");
 
     try {
       future.get(FUTURE_GET_TIMEOUT.getSeconds(), TimeUnit.SECONDS);
@@ -180,6 +174,20 @@ public void executeAsyncPropagatesOperationFailure() throws Exception {
       Assert.assertTrue(
           "expected NexusOperationFailedException, got " + cause.getClass().getSimpleName(),
           cause instanceof NexusOperationFailedException);
+
+      // Walk the cause chain and verify the handler's failure message surfaces somewhere.
+      boolean foundHandlerFailure = false;
+      for (Throwable c = cause.getCause(); c != null; c = c.getCause()) {
+        if (c.getMessage() != null && c.getMessage().contains("intentional failure")) {
+          foundHandlerFailure = true;
+          break;
+        }
+        if (c.getCause() == c) {
+          break;
+        }
+      }
+      Assert.assertTrue(
+          "expected cause chain to include the handler's failure message", foundHandlerFailure);
     }
   }
 
@@ -212,27 +220,4 @@ public String execute(String input) {
       return input;
     }
   }
-
-  @ServiceImpl(service = TestNexusServices.TestNexusService1.class)
-  public static class TestNexusServiceImpl {
-    @OperationImpl
-    public OperationHandler<String, String> operation() {
-      return new OperationHandler<String, String>() {
-        @Override
-        public OperationStartResult<String> start(
-            OperationContext context, OperationStartDetails details, String input)
-            throws OperationException {
-          if (input != null && input.startsWith(FAIL_PREFIX)) {
-            throw OperationException.failed("intentional failure: " + input);
-          }
-          return OperationStartResult.sync("echo:" + (input == null ? "<null>" : input));
-        }
-
-        @Override
-        public void cancel(OperationContext context, OperationCancelDetails details) {
-          // Unused in these tests.
-        }
-      };
-    }
-  }
 }

temporal-sdk/src/test/java/io/temporal/client/nexus/NexusOperationHandleTest.java

@@ -2,14 +2,6 @@
 
 import static org.junit.Assume.assumeTrue;
 
-import io.nexusrpc.OperationException;
-import io.nexusrpc.handler.OperationCancelDetails;
-import io.nexusrpc.handler.OperationContext;
-import io.nexusrpc.handler.OperationHandler;
-import io.nexusrpc.handler.OperationImpl;
-import io.nexusrpc.handler.OperationStartDetails;
-import io.nexusrpc.handler.OperationStartResult;
-import io.nexusrpc.handler.ServiceImpl;
 import io.temporal.api.nexus.v1.Endpoint;
 import io.temporal.client.NexusClient;
 import io.temporal.client.NexusOperationException;
@@ -20,11 +12,11 @@
 import io.temporal.client.UntypedNexusOperationHandle;
 import io.temporal.client.UntypedNexusServiceClient;
 import io.temporal.testing.internal.SDKTestWorkflowRule;
+import io.temporal.workflow.shared.EchoNexusServiceImpl;
 import io.temporal.workflow.shared.TestNexusServices;
 import io.temporal.workflow.shared.TestWorkflows;
 import java.time.Duration;
 import java.util.UUID;
-import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -41,7 +33,7 @@ public class NexusOperationHandleTest {
   public SDKTestWorkflowRule testWorkflowRule =
       SDKTestWorkflowRule.newBuilder()
           .setWorkflowTypes(PlaceholderWorkflowImpl.class)
-          .setNexusServiceImplementation(new TestNexusServiceImpl())
+          .setNexusServiceImplementation(new EchoNexusServiceImpl())
           .build();
 
   @BeforeClass
@@ -83,21 +75,21 @@ public void describeWithoutRunIdTargetsLatest() {
   // invokations the test server received to make sure it increments.
   @Test
   public void cancelSucceedsForStartedOperation() {
-    int before = TestNexusServiceImpl.cancelInvocations.get();
+    int before = EchoNexusServiceImpl.cancelInvocations.get();
     startPendingOperation().cancel();
     assertCancelDelivered(before);
   }
 
   @Test
   public void cancelWithReasonSucceedsForStartedOperation() {
-    int before = TestNexusServiceImpl.cancelInvocations.get();
+    int before = EchoNexusServiceImpl.cancelInvocations.get();
     startPendingOperation().cancel("test-cancel-reason");
     assertCancelDelivered(before);
   }
 
   @Test
   public void cancelWithNullReasonSucceeds() {
-    int before = TestNexusServiceImpl.cancelInvocations.get();
+    int before = EchoNexusServiceImpl.cancelInvocations.get();
     startPendingOperation().cancel(null);
     assertCancelDelivered(before);
   }
@@ -109,7 +101,7 @@ public void cancelWithNullReasonSucceeds() {
    */
   private static void assertCancelDelivered(int countBeforeCancel) {
     long deadlineNanos = System.nanoTime() + Duration.ofSeconds(8).toNanos();
-    while (TestNexusServiceImpl.cancelInvocations.get() <= countBeforeCancel
+    while (EchoNexusServiceImpl.cancelInvocations.get() <= countBeforeCancel
         && System.nanoTime() < deadlineNanos) {
       try {
         Thread.sleep(100);
@@ -120,7 +112,7 @@ private static void assertCancelDelivered(int countBeforeCancel) {
     }
     Assert.assertTrue(
         "cancel RPC was not delivered to the handler within the poll budget",
-        TestNexusServiceImpl.cancelInvocations.get() > countBeforeCancel);
+        EchoNexusServiceImpl.cancelInvocations.get() > countBeforeCancel);
   }
 
   @Test
@@ -149,7 +141,7 @@ public void terminateWithNullReasonSucceeds() {
    * the lifecycle RPCs have a non-terminal operation to act on.
    */
   private UntypedNexusOperationHandle startPendingOperation() {
-    return startOperation(TestNexusServiceImpl.ASYNC_PREFIX + UUID.randomUUID());
+    return startOperation(EchoNexusServiceImpl.ASYNC_PREFIX + UUID.randomUUID());
   }
 
   /**
@@ -227,61 +219,9 @@ public String execute(String input) {
     }
   }
 
-  @ServiceImpl(service = TestNexusServices.TestNexusService1.class)
-  public static class TestNexusServiceImpl {
-    /** Inputs starting with this prefix make the handler throw, exercising the failure path. */
-    static final String FAIL_PREFIX = "FAIL:";
-
-    /**
-     * Inputs starting with this prefix make the handler return an async-started result without ever
-     * completing the operation. Used by cancel/terminate tests so the operation stays in RUNNING
-     * state long enough for the lifecycle RPC to be observed.
-     */
-    static final String ASYNC_PREFIX = "ASYNC:";
-
-    /**
-     * Incremented every time the worker invokes the handler's {@code cancel(...)} callback. The
-     * cancel tests poll this counter to verify the cancel RPC was delivered end-to-end (client →
-     * server → worker), even though the no-op cancel doesn't drive the operation to a terminal
-     * state.
-     */
-    static final AtomicInteger cancelInvocations = new AtomicInteger();
-
-    @OperationImpl
-    public OperationHandler<String, String> operation() {
-      return new OperationHandler<String, String>() {
-        @Override
-        public OperationStartResult<String> start(
-            OperationContext context, OperationStartDetails details, String input)
-            throws OperationException {
-          if (input != null && input.startsWith(FAIL_PREFIX)) {
-            // OperationException.failed = definitive failure (no retries) so the caller's
-            // getResult surfaces the failure instead of timing out.
-            throw OperationException.failed("intentional failure: " + input);
-          }
-          if (input != null && input.startsWith(ASYNC_PREFIX)) {
-            // Async-started: server keeps the operation in RUNNING state until something
-            // external (terminate, cancellation that takes effect, or schedule-to-close)
-            // transitions it. Terminate is server-forced so it transitions reliably; cancel is
-            // cooperative and won't transition without a backing entity.
-            return OperationStartResult.async("token-" + UUID.randomUUID());
-          }
-          return OperationStartResult.sync("echo:" + (input == null ? "<null>" : input));
-        }
-
-        @Override
-        public void cancel(OperationContext context, OperationCancelDetails details) {
-          // Record delivery for the cancel tests; otherwise a no-op. Driving the operation to a
-          // terminal CANCELED state would require a backing entity (e.g. a workflow).
-          cancelInvocations.incrementAndGet();
-        }
-      };
-    }
-  }
-
   @Test
   public void getResultPropagatesOperationFailure() {
-    UntypedNexusOperationHandle handle = startOperation(TestNexusServiceImpl.FAIL_PREFIX + "boom");
+    UntypedNexusOperationHandle handle = startOperation(EchoNexusServiceImpl.FAIL_PREFIX + "boom");
     String operationId = handle.getNexusOperationId();
 
     try {