validate changes

Author: roseyang62

pubsub/pubsub-gcp/src/main/java/com/salesforce/multicloudj/pubsub/gcp/GcpSubscription.java

@@ -62,7 +62,6 @@ public GcpSubscription() {
     public GcpSubscription(Builder builder) {
         super(builder);
         this.nackLazy = builder.nackLazy;
-        this.receiveBatcherOptions = builder.receiveBatcherOptions;
     }
 
     public GcpSubscription(Builder builder, SubscriptionAdminClient subscriptionAdminClient) {
@@ -228,9 +227,9 @@ protected List<Message> doReceiveBatch(int batchSize) {
                 .setMaxMessages(Math.max(1, batchSize))
                 .setReturnImmediately(true)
                 .build();
-
+            
         PullResponse resp = getOrCreateSubscriptionAdminClient().pullCallable().call(req);
-
+                    
         List<Message> receivedMessages = new ArrayList<>();
         for (ReceivedMessage rm : resp.getReceivedMessagesList()) {
             Message m = convertToMessage(rm);
@@ -311,8 +310,7 @@ public Builder builder() {
 
     public static class Builder extends AbstractSubscription.Builder<GcpSubscription> {
         private boolean nackLazy = false;
-        private Batcher.Options receiveBatcherOptions = null;
-
+        
         public Builder() {
             this.providerId = GcpConstants.PROVIDER_ID;
         }
@@ -358,26 +356,14 @@ public GcpSubscription.Builder withCredentialsOverrider(CredentialsOverrider cre
          *
          * This is useful when you don't want immediate retry but prefer to wait for
          * the natural timeout before reprocessing the message.
-         *
+         * 
          * @param nackLazy true to enable lazy NACK mode, false for immediate redelivery
          * @return this builder for method chaining
          */
         public GcpSubscription.Builder withNackLazy(boolean nackLazy) {
             this.nackLazy = nackLazy;
             return this;
         }
-
-        /**
-         * Sets custom receive batcher options.
-         * This is primarily used in tests to control prefetch behavior.
-         *
-         * @param options the batcher options to use
-         * @return this builder for method chaining
-         */
-        public GcpSubscription.Builder withReceiveBatcherOptions(Batcher.Options options) {
-            this.receiveBatcherOptions = options;
-            return this;
-        }
 
         @Override
         public GcpSubscription build() {

pubsub/pubsub-gcp/src/test/java/com/salesforce/multicloudj/pubsub/gcp/GcpPubsubIT.java

@@ -152,17 +152,18 @@ public AbstractSubscription createSubscriptionDriverWithIndex(int index) {
                 String subscriptionNameWithIndex = index > 0 ? subscriptionName + "-" + index : subscriptionName;
                 String fullSubscriptionName = "projects/" + GcpPubsubIT.PROJECT_ID + "/subscriptions/" + subscriptionNameWithIndex;
 
-                // Use maxHandlers=1 for integration tests to avoid WireMock scenario state race conditions
-                Batcher.Options testBatcherOptions = new Batcher.Options()
-                        .setMaxHandlers(1)
-                        .setMinBatchSize(1)
-                        .setMaxBatchSize(1)
-                        .setMaxBatchByteSize(0);
-
                 GcpSubscription.Builder subscriptionBuilder = new GcpSubscription.Builder()
-                        .withSubscriptionName(fullSubscriptionName)
-                        .withReceiveBatcherOptions(testBatcherOptions);
-                GcpSubscription sub = new GcpSubscription(subscriptionBuilder, client);
+                        .withSubscriptionName(fullSubscriptionName);
+                GcpSubscription sub = new GcpSubscription(subscriptionBuilder, client) {
+                    @Override
+                    protected Batcher.Options createReceiveBatcherOptions() {
+                        return new Batcher.Options()
+                            .setMaxHandlers(1)
+                            .setMinBatchSize(1)
+                            .setMaxBatchSize(1)
+                            .setMaxBatchByteSize(0);
+                    }
+                };
 
                 if (index == 0) {
                     subscription = sub;