addressed copilot comments

Author: bachuv

CHANGELOG.md

@@ -1,5 +1,5 @@
 ## Unreleased
-* Add work item filtering support for `DurableTaskGrpcWorker` to enable worker-side filtering of orchestration and activity work items
+* Add work item filtering support for `DurableTaskGrpcWorker` to enable worker-side filtering of orchestration and activity work items ([#275](https://github.com/microsoft/durabletask-java/pull/275)) 
 * Add support for calls to HTTP endpoints ([#271](https://github.com/microsoft/durabletask-java/pull/271))
 * Add getSuspendPostUri and getResumePostUri getters to HttpManagementPayload ([#264](https://github.com/microsoft/durabletask-java/pull/264))
 

client/src/main/java/com/microsoft/durabletask/DurableTaskGrpcWorker.java

@@ -40,6 +40,7 @@ public final class DurableTaskGrpcWorker implements AutoCloseable {
     private final Duration maximumTimerInterval;
     private final DurableTaskGrpcWorkerVersioningOptions versioningOptions;
     private final WorkItemFilter workItemFilter;
+    private final GetWorkItemsRequest getWorkItemsRequest;
 
     private final TaskHubSidecarServiceBlockingStub sidecarClient;
 
@@ -72,6 +73,7 @@ public final class DurableTaskGrpcWorker implements AutoCloseable {
         this.maximumTimerInterval = builder.maximumTimerInterval != null ? builder.maximumTimerInterval : DEFAULT_MAXIMUM_TIMER_INTERVAL;
         this.versioningOptions = builder.versioningOptions;
         this.workItemFilter = workItemFilter;
+        this.getWorkItemsRequest = buildGetWorkItemsRequest();
     }
 
     /**
@@ -134,8 +136,7 @@ public void startAndBlock() {
         // TODO: How do we interrupt manually?
         while (true) {
             try {
-                GetWorkItemsRequest getWorkItemsRequest = buildGetWorkItemsRequest();
-                Iterator<WorkItem> workItemStream = this.sidecarClient.getWorkItems(getWorkItemsRequest);
+                Iterator<WorkItem> workItemStream = this.sidecarClient.getWorkItems(this.getWorkItemsRequest);
                 while (workItemStream.hasNext()) {
                     WorkItem workItem = workItemStream.next();
                     RequestCase requestType = workItem.getRequestCase();

client/src/main/java/com/microsoft/durabletask/DurableTaskGrpcWorkerBuilder.java

@@ -5,6 +5,7 @@
 import io.grpc.Channel;
 
 import java.time.Duration;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -188,10 +189,14 @@ private WorkItemFilter buildAutoWorkItemFilter() {
         }
 
         WorkItemFilter.Builder builder = WorkItemFilter.newBuilder();
-        for (String name : this.orchestrationFactories.keySet()) {
+        List<String> orchestrationNames = new ArrayList<>(this.orchestrationFactories.keySet());
+        Collections.sort(orchestrationNames);
+        for (String name : orchestrationNames) {
             builder.addOrchestration(name, versions);
         }
-        for (String name : this.activityFactories.keySet()) {
+        List<String> activityNames = new ArrayList<>(this.activityFactories.keySet());
+        Collections.sort(activityNames);
+        for (String name : activityNames) {
             builder.addActivity(name, versions);
         }
         return builder.build();

client/src/main/java/com/microsoft/durabletask/WorkItemFilter.java

@@ -92,9 +92,17 @@ public Builder addOrchestration(String name, List<String> versions) {
             if (name == null || name.isEmpty()) {
                 throw new IllegalArgumentException("Orchestration filter name must not be null or empty.");
             }
-            List<String> versionsCopy = versions != null
-                    ? Collections.unmodifiableList(new ArrayList<String>(versions))
-                    : Collections.<String>emptyList();
+            List<String> versionsCopy;
+            if (versions == null) {
+                versionsCopy = Collections.<String>emptyList();
+            } else {
+                for (String version : versions) {
+                    if (version == null || version.isEmpty()) {
+                        throw new IllegalArgumentException("Orchestration filter versions must not contain null or empty entries.");
+                    }
+                }
+                versionsCopy = Collections.unmodifiableList(new ArrayList<String>(versions));
+            }
             this.orchestrations.add(new OrchestrationFilter(name, versionsCopy));
             return this;
         }
@@ -124,9 +132,17 @@ public Builder addActivity(String name, List<String> versions) {
             if (name == null || name.isEmpty()) {
                 throw new IllegalArgumentException("Activity filter name must not be null or empty.");
             }
-            List<String> versionsCopy = versions != null
-                    ? Collections.unmodifiableList(new ArrayList<String>(versions))
-                    : Collections.<String>emptyList();
+            List<String> versionsCopy;
+            if (versions == null) {
+                versionsCopy = Collections.<String>emptyList();
+            } else {
+                for (String version : versions) {
+                    if (version == null || version.isEmpty()) {
+                        throw new IllegalArgumentException("Activity filter versions must not contain null or empty entries.");
+                    }
+                }
+                versionsCopy = Collections.unmodifiableList(new ArrayList<String>(versions));
+            }
             this.activities.add(new ActivityFilter(name, versionsCopy));
             return this;
         }
@@ -150,7 +166,7 @@ public static final class OrchestrationFilter {
 
         OrchestrationFilter(String name, List<String> versions) {
             this.name = name;
-            this.versions = versions;
+            this.versions = Collections.unmodifiableList(new ArrayList<String>(versions));
         }
 
         /**
@@ -181,7 +197,7 @@ public static final class ActivityFilter {
 
         ActivityFilter(String name, List<String> versions) {
             this.name = name;
-            this.versions = versions;
+            this.versions = Collections.unmodifiableList(new ArrayList<String>(versions));
         }
 
         /**