Remove ActivityListOptions and ActivityListPaginatedOptions; keep both listActivities and listActivitiesPaginated in the interceptor

Author: GregoryTravis

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

@@ -1590,15 +1590,6 @@ <R> ActivityHandle<R> getHandle(
    */
   Stream<ActivityExecutionMetadata> listExecutions(String query);
 
-  /**
-   * Returns a stream of activity executions matching the given query, with options.
-   *
-   * @param query Temporal visibility query string
-   * @param options list options such as result limit
-   * @return stream of matching activity executions
-   */
-  Stream<ActivityExecutionMetadata> listExecutions(String query, ActivityListOptions options);
-
   /**
    * Returns the count of activity executions matching the given query.
    *

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

@@ -411,14 +411,8 @@ private Header propagatedHeader() {
 
   @Override
   public Stream<ActivityExecutionMetadata> listExecutions(String query) {
-    return listExecutions(query, ActivityListOptions.newBuilder().build());
-  }
-
-  @Override
-  public Stream<ActivityExecutionMetadata> listExecutions(
-      String query, ActivityListOptions options) {
     return invoker
-        .listActivities(new ActivityClientCallsInterceptor.ListActivitiesInput(query, options))
+        .listActivities(new ActivityClientCallsInterceptor.ListActivitiesInput(query))
         .getStream();
   }
 

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

@@ -5,9 +5,7 @@
 import io.temporal.client.ActivityExecutionDescription;
 import io.temporal.client.ActivityExecutionMetadata;
 import io.temporal.client.ActivityFailedException;
-import io.temporal.client.ActivityListOptions;
 import io.temporal.client.ActivityListPage;
-import io.temporal.client.ActivityListPaginatedOptions;
 import io.temporal.client.StartActivityOptions;
 import io.temporal.common.Experimental;
 import java.lang.reflect.Type;
@@ -362,20 +360,14 @@ final class TerminateActivityOutput {}
   @Experimental
   final class ListActivitiesInput {
     private final String query;
-    private final ActivityListOptions options;
 
-    public ListActivitiesInput(String query, ActivityListOptions options) {
+    public ListActivitiesInput(String query) {
       this.query = query;
-      this.options = options;
     }
 
     public String getQuery() {
       return query;
     }
-
-    public ActivityListOptions getOptions() {
-      return options;
-    }
   }
 
   @Experimental
@@ -395,13 +387,10 @@ public Stream<ActivityExecutionMetadata> getStream() {
   final class ListActivitiesPaginatedInput {
     private final String query;
     private final @Nullable byte[] nextPageToken;
-    private final ActivityListPaginatedOptions options;
 
-    public ListActivitiesPaginatedInput(
-        String query, @Nullable byte[] nextPageToken, ActivityListPaginatedOptions options) {
+    public ListActivitiesPaginatedInput(String query, @Nullable byte[] nextPageToken) {
       this.query = query;
       this.nextPageToken = nextPageToken;
-      this.options = options;
     }
 
     public String getQuery() {
@@ -412,10 +401,6 @@ public String getQuery() {
     public byte[] getNextPageToken() {
       return nextPageToken;
     }
-
-    public ActivityListPaginatedOptions getOptions() {
-      return options;
-    }
   }
 
   @Experimental

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

@@ -16,17 +16,14 @@ class ListActivityExecutionIterator
 
   private final @Nullable String query;
   private final @Nonnull String namespace;
-  private final @Nullable Integer pageSize;
   private final @Nonnull GenericWorkflowClient genericClient;
 
   ListActivityExecutionIterator(
       @Nullable String query,
       @Nonnull String namespace,
-      @Nullable Integer pageSize,
       @Nonnull GenericWorkflowClient genericClient) {
     this.query = query;
     this.namespace = Objects.requireNonNull(namespace, "namespace");
-    this.pageSize = pageSize;
     this.genericClient = Objects.requireNonNull(genericClient, "genericClient");
   }
 
@@ -42,10 +39,6 @@ protected CompletableFuture<ListActivityExecutionsResponse> performRequest(
       request.setQuery(query);
     }
 
-    if (pageSize != null) {
-      request.setPageSize(pageSize);
-    }
-
     return genericClient.listActivitiesAsync(request.build());
   }
 

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

@@ -323,10 +323,9 @@ public TerminateActivityOutput terminateActivity(TerminateActivityInput input) {
 
   @Override
   public ListActivitiesOutput listActivities(ListActivitiesInput input) {
-    Integer limit = input.getOptions().getLimit();
     ListActivityExecutionIterator iterator =
         new ListActivityExecutionIterator(
-            input.getQuery(), clientOptions.getNamespace(), limit, genericClient);
+            input.getQuery(), clientOptions.getNamespace(), genericClient);
     iterator.init();
     Iterator<ActivityExecutionMetadata> wrappedIterator =
         Iterators.transform(iterator, ActivityExecutionMetadata::fromListInfo);
@@ -347,9 +346,6 @@ public ListActivitiesPaginatedOutput listActivitiesPaginated(ListActivitiesPagin
     if (input.getNextPageToken() != null) {
       req.setNextPageToken(ByteString.copyFrom(input.getNextPageToken()));
     }
-    if (input.getOptions().getPageSize() != null) {
-      req.setPageSize(input.getOptions().getPageSize());
-    }
     ListActivityExecutionsResponse response = genericClient.listActivities(req.build());
     List<ActivityExecutionMetadata> activities = new ArrayList<>();
     for (io.temporal.api.activity.v1.ActivityExecutionListInfo info :

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

@@ -7,9 +7,7 @@
 import io.temporal.client.ActivityExecutionDescription;
 import io.temporal.client.ActivityExecutionMetadata;
 import io.temporal.client.ActivityFailedException;
-import io.temporal.client.ActivityListOptions;
 import io.temporal.client.ActivityListPage;
-import io.temporal.client.ActivityListPaginatedOptions;
 import io.temporal.client.StartActivityOptions;
 import io.temporal.common.interceptors.ActivityClientCallsInterceptor.*;
 import java.time.Duration;
@@ -130,8 +128,7 @@ public void testListActivitiesDelegatesToNext() {
     ListActivitiesOutput output = new ListActivitiesOutput(stream);
     when(next.listActivities(any(ListActivitiesInput.class))).thenReturn(output);
 
-    ListActivitiesInput input =
-        new ListActivitiesInput("query", ActivityListOptions.newBuilder().build());
+    ListActivitiesInput input = new ListActivitiesInput("query");
     ListActivitiesOutput result = base.listActivities(input);
 
     assertSame(output, result);
@@ -157,9 +154,7 @@ public void testListActivitiesPaginatedDelegatesToNext() {
     ListActivitiesPaginatedOutput output = new ListActivitiesPaginatedOutput(page);
     when(next.listActivitiesPaginated(any(ListActivitiesPaginatedInput.class))).thenReturn(output);
 
-    ListActivitiesPaginatedInput input =
-        new ListActivitiesPaginatedInput(
-            "query", null, ActivityListPaginatedOptions.newBuilder().build());
+    ListActivitiesPaginatedInput input = new ListActivitiesPaginatedInput("query", null);
     ListActivitiesPaginatedOutput result = base.listActivitiesPaginated(input);
 
     assertSame(output, result);