Cleaned up some inputs

Author: Evanthx

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

@@ -2,7 +2,6 @@
 
 import static io.temporal.internal.WorkflowThreadMarker.enforceNonWorkflowThread;
 
-import com.google.protobuf.ByteString;
 import com.uber.m3.tally.Scope;
 import io.temporal.common.Experimental;
 import io.temporal.common.interceptors.NexusClientCallsInterceptor;
@@ -19,14 +18,9 @@
 import io.temporal.internal.client.external.GenericWorkflowClientImpl;
 import io.temporal.serviceclient.MetricsTag;
 import io.temporal.serviceclient.WorkflowServiceStubs;
-import java.util.Iterator;
 import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Spliterator;
-import java.util.Spliterators;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
 import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -132,16 +126,15 @@ NexusClientCallsInterceptor getNexusClientCallsInvoker() {
     return nexusClientCallsInvoker;
   }
 
-  private static final int DEFAULT_LIST_PAGE_SIZE = 1000;
-
   @Override
   public Stream<NexusOperationExecutionMetadata> listNexusOperationExecutions(
       @Nullable String query) {
-    Iterator<NexusOperationExecutionMetadata> iter =
-        new ListPageIterator(nexusClientCallsInvoker, query, DEFAULT_LIST_PAGE_SIZE);
-    return StreamSupport.stream(
-        Spliterators.spliteratorUnknownSize(iter, Spliterator.ORDERED | Spliterator.NONNULL),
-        false);
+    // Pagination is handled inside the interceptor invoker; we receive a fully materialized list
+    // and expose a Stream view of it to honour the public API contract.
+    ListNexusOperationExecutionsOutput out =
+        nexusClientCallsInvoker.listNexusOperationExecutions(
+            new ListNexusOperationExecutionsInput(query));
+    return out.getOperations().stream().map(NexusOperationExecutionMetadata::fromListInfo);
   }
 
   @Override
@@ -158,54 +151,4 @@ public NexusOperationExecutionCount countNexusOperationExecutions(@Nullable Stri
             .collect(Collectors.toList());
     return new NexusOperationExecutionCount(out.getCount(), publicGroups);
   }
-
-  /** Lazily fetches pages from the interceptor and flattens them into a single iteration. */
-  private static final class ListPageIterator implements Iterator<NexusOperationExecutionMetadata> {
-    private final NexusClientCallsInterceptor invoker;
-    private final @Nullable String query;
-    private final int pageSize;
-    private Iterator<NexusOperationExecutionMetadata> current =
-        java.util.Collections.emptyIterator();
-    private @Nullable ByteString nextPageToken = null;
-    private boolean exhausted = false;
-
-    ListPageIterator(NexusClientCallsInterceptor invoker, @Nullable String query, int pageSize) {
-      this.invoker = invoker;
-      this.query = query;
-      this.pageSize = pageSize;
-    }
-
-    @Override
-    public boolean hasNext() {
-      while (!current.hasNext() && !exhausted) {
-        fetchNextPage();
-      }
-      return current.hasNext();
-    }
-
-    @Override
-    public NexusOperationExecutionMetadata next() {
-      if (!hasNext()) {
-        throw new NoSuchElementException();
-      }
-      return current.next();
-    }
-
-    private void fetchNextPage() {
-      ListNexusOperationExecutionsOutput page =
-          invoker.listNexusOperationExecutions(
-              new ListNexusOperationExecutionsInput(query, pageSize, nextPageToken));
-      current =
-          page.getOperations().stream()
-              .map(NexusOperationExecutionMetadata::fromListInfo)
-              .iterator();
-      ByteString token = page.getNextPageToken();
-      if (token == null || token.isEmpty()) {
-        exhausted = true;
-        nextPageToken = null;
-      } else {
-        nextPageToken = token;
-      }
-    }
-  }
 }

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

@@ -50,9 +50,7 @@ private Builder(StartNexusOperationOptions options) {
       this.idConflictPolicy = options.idConflictPolicy;
     }
 
-    /**
-     * Required. Unique identifier for this operation within its namespace.
-     */
+    /** Required. Unique identifier for this operation within its namespace. */
     public Builder setId(@Nonnull String id) {
       Objects.requireNonNull(id, "id");
       if (id.isEmpty()) {

temporal-sdk/src/main/java/io/temporal/common/interceptors/NexusClientCallsInterceptor.java

@@ -1,6 +1,5 @@
 package io.temporal.common.interceptors;
 
-import com.google.protobuf.ByteString;
 import io.grpc.Deadline;
 import io.temporal.api.common.v1.Payload;
 import io.temporal.api.enums.v1.NexusOperationWaitStage;
@@ -45,19 +44,17 @@ StartNexusOperationExecutionOutput startNexusOperationExecution(
   /**
    * Returns a point-in-time snapshot of a standalone Nexus operation execution.
    *
-   * @param input operation ID, optional run ID, and flags controlling whether to include input and
-   *     outcome payloads
+   * @param input operation ID and optional run ID
    * @return output wrapping the {@link NexusOperationExecutionDescription}
    */
   DescribeNexusOperationExecutionOutput describeNexusOperationExecution(
       DescribeNexusOperationExecutionInput input);
 
   /**
-   * Synchronously long-polls the server until the Nexus operation reaches the wait stage requested
-   * in {@code input}, then returns the outcome. Blocks the calling thread for the duration.
+   * Synchronously long-polls the server until the Nexus operation reaches a terminal stage, then
+   * returns the outcome. Blocks the calling thread for the duration.
    *
-   * @param input operation ID, optional run ID, target wait stage, and the deadline bounding the
-   *     poll
+   * @param input operation ID, optional run ID, and the deadline bounding the poll
    * @return output containing the run ID, wait stage reached, operation token, and either the
    *     result payload or failure (when the operation has reached a terminal stage)
    */
@@ -68,20 +65,19 @@ PollNexusOperationExecutionOutput pollNexusOperationExecution(
    * Asynchronous variant of {@link #pollNexusOperationExecution} that returns a future without
    * blocking the calling thread.
    *
-   * @param input operation ID, optional run ID, target wait stage, and the deadline bounding the
-   *     poll
+   * @param input operation ID, optional run ID, and the deadline bounding the poll
    * @return a future that completes with the poll output, or completes exceptionally if the poll
    *     fails or the deadline expires
    */
   CompletableFuture<PollNexusOperationExecutionOutput> pollNexusOperationExecutionAsync(
       PollNexusOperationExecutionInput input);
 
   /**
-   * Lists standalone Nexus operation executions matching a Visibility query, with paging support.
+   * Lists standalone Nexus operation executions matching a Visibility query. Pagination is handled
+   * internally by the SDK; the returned output contains the full materialized result set.
    *
-   * @param input Visibility query string, page size, and optional next-page token from a prior call
-   * @return output wrapping the matching operations and the next-page token (empty when the result
-   *     set is exhausted)
+   * @param input Visibility query string
+   * @return output wrapping the matching operations
    */
   ListNexusOperationExecutionsOutput listNexusOperationExecutions(
       ListNexusOperationExecutionsInput input);
@@ -199,15 +195,10 @@ public boolean isStarted() {
   final class DescribeNexusOperationExecutionInput {
     private final String operationId;
     private final @Nullable String runId;
-    private final boolean includeInput;
-    private final boolean includeOutcome;
 
-    public DescribeNexusOperationExecutionInput(
-        String operationId, @Nullable String runId, boolean includeInput, boolean includeOutcome) {
+    public DescribeNexusOperationExecutionInput(String operationId, @Nullable String runId) {
       this.operationId = operationId;
       this.runId = runId;
-      this.includeInput = includeInput;
-      this.includeOutcome = includeOutcome;
     }
 
     public String getOperationId() {
@@ -217,14 +208,6 @@ public String getOperationId() {
     public Optional<String> getRunId() {
       return Optional.ofNullable(runId);
     }
-
-    public boolean isIncludeInput() {
-      return includeInput;
-    }
-
-    public boolean isIncludeOutcome() {
-      return includeOutcome;
-    }
   }
 
   final class DescribeNexusOperationExecutionOutput {
@@ -242,17 +225,12 @@ public NexusOperationExecutionDescription getDescription() {
   final class PollNexusOperationExecutionInput {
     private final String operationId;
     private final @Nullable String runId;
-    private final NexusOperationWaitStage waitStage;
     private final @Nonnull Deadline deadline;
 
     public PollNexusOperationExecutionInput(
-        String operationId,
-        @Nullable String runId,
-        NexusOperationWaitStage waitStage,
-        @Nonnull Deadline deadline) {
+        String operationId, @Nullable String runId, @Nonnull Deadline deadline) {
       this.operationId = operationId;
       this.runId = runId;
-      this.waitStage = waitStage;
       this.deadline = deadline;
     }
 
@@ -264,10 +242,6 @@ public Optional<String> getRunId() {
       return Optional.ofNullable(runId);
     }
 
-    public NexusOperationWaitStage getWaitStage() {
-      return waitStage;
-    }
-
     public Deadline getDeadline() {
       return deadline;
     }
@@ -316,46 +290,30 @@ public Optional<Failure> getFailure() {
 
   final class ListNexusOperationExecutionsInput {
     private final @Nullable String query;
-    private final int pageSize;
-    private final @Nullable ByteString nextPageToken;
 
-    public ListNexusOperationExecutionsInput(
-        @Nullable String query, int pageSize, @Nullable ByteString nextPageToken) {
+    public ListNexusOperationExecutionsInput(@Nullable String query) {
       this.query = query;
-      this.pageSize = pageSize;
-      this.nextPageToken = nextPageToken;
     }
 
     public Optional<String> getQuery() {
       return Optional.ofNullable(query);
     }
-
-    public int getPageSize() {
-      return pageSize;
-    }
-
-    public Optional<ByteString> getNextPageToken() {
-      return Optional.ofNullable(nextPageToken);
-    }
   }
 
+  /**
+   * Result of a list call. Holds the full materialized result set; pagination is handled inside the
+   * SDK and not exposed through the interceptor surface.
+   */
   final class ListNexusOperationExecutionsOutput {
     private final List<NexusOperationExecutionListInfo> operations;
-    private final ByteString nextPageToken;
 
-    public ListNexusOperationExecutionsOutput(
-        List<NexusOperationExecutionListInfo> operations, ByteString nextPageToken) {
+    public ListNexusOperationExecutionsOutput(List<NexusOperationExecutionListInfo> operations) {
       this.operations = Collections.unmodifiableList(operations);
-      this.nextPageToken = nextPageToken;
     }
 
     public List<NexusOperationExecutionListInfo> getOperations() {
       return operations;
     }
-
-    public ByteString getNextPageToken() {
-      return nextPageToken;
-    }
   }
 
   final class CountNexusOperationExecutionsInput {

temporal-sdk/src/main/java/io/temporal/internal/client/NexusOperationHandleImpl.java

@@ -69,8 +69,7 @@ public String getNexusOperationId() {
   @Override
   public NexusOperationExecutionDescription describe() {
     DescribeNexusOperationExecutionInput input =
-        new DescribeNexusOperationExecutionInput(
-            operationId, runId, /* includeInput= */ false, /* includeOutcome= */ true);
+        new DescribeNexusOperationExecutionInput(operationId, runId);
     DescribeNexusOperationExecutionOutput output =
         interceptor.describeNexusOperationExecution(input);
     return output.getDescription();
@@ -161,11 +160,7 @@ private PollNexusOperationExecutionOutput pollSyncUntilCompletedOrDeadline(Deadl
       throws TimeoutException {
     while (true) {
       PollNexusOperationExecutionInput pollInput =
-          new PollNexusOperationExecutionInput(
-              operationId,
-              runId,
-              NexusOperationWaitStage.NEXUS_OPERATION_WAIT_STAGE_CLOSED,
-              deadline);
+          new PollNexusOperationExecutionInput(operationId, runId, deadline);
       PollNexusOperationExecutionOutput out;
       try {
         out = interceptor.pollNexusOperationExecution(pollInput);
@@ -184,11 +179,7 @@ private PollNexusOperationExecutionOutput pollSyncUntilCompletedOrDeadline(Deadl
   private CompletableFuture<PollNexusOperationExecutionOutput> pollAsyncUntilCompletedOrDeadline(
       Deadline deadline) {
     PollNexusOperationExecutionInput pollInput =
-        new PollNexusOperationExecutionInput(
-            operationId,
-            runId,
-            NexusOperationWaitStage.NEXUS_OPERATION_WAIT_STAGE_CLOSED,
-            deadline);
+        new PollNexusOperationExecutionInput(operationId, runId, deadline);
     CompletableFuture<PollNexusOperationExecutionOutput> pollFuture;
     try {
       pollFuture = interceptor.pollNexusOperationExecutionAsync(pollInput);