Fix to invoke InvocationBuilderListener for each request.

Signed-off-by: jansupol <[email protected]>

Author: jansupol

core-client/src/main/java/org/glassfish/jersey/client/InvocationBuilderListenerStage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -40,18 +40,18 @@
  * would be created, this class is utilized.
  */
 /* package */ class InvocationBuilderListenerStage {
-    final Iterator<InvocationBuilderListener> invocationBuilderListenerIterator;
+    private final Iterable<InvocationBuilderListener> invocationBuilderListenerIterable;
 
     /* package */ InvocationBuilderListenerStage(InjectionManager injectionManager) {
         final RankedComparator<InvocationBuilderListener> comparator =
                 new RankedComparator<>(RankedComparator.Order.ASCENDING);
-        invocationBuilderListenerIterator = Providers
-                .getAllProviders(injectionManager, InvocationBuilderListener.class, comparator).iterator();
+        invocationBuilderListenerIterable = Providers
+                .getAllProviders(injectionManager, InvocationBuilderListener.class, comparator);
     }
 
     /* package */ void invokeListener(JerseyInvocation.Builder builder) {
-        while (invocationBuilderListenerIterator.hasNext()) {
-            invocationBuilderListenerIterator.next().onNewBuilder(new InvocationBuilderContextImpl(builder));
+        for (InvocationBuilderListener invocationBuilderListener : invocationBuilderListenerIterable) {
+            invocationBuilderListener.onNewBuilder(new InvocationBuilderContextImpl(builder));
         }
     }
 

core-client/src/test/java/org/glassfish/jersey/client/spi/InvocationBuilderListenerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,22 +16,17 @@
 
 package org.glassfish.jersey.client.spi;
 
-import org.glassfish.jersey.internal.PropertiesDelegate;
 import org.hamcrest.Matchers;
 import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import javax.annotation.Priority;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.ClientRequestContext;
 import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.CacheControl;
-import javax.ws.rs.core.Configuration;
-import javax.ws.rs.core.Context;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
@@ -95,6 +90,20 @@ public void testGetters() {
         }
     }
 
+    @Test
+    public void testCounter() {
+        CountingInvocationBuilderListener listener = new CountingInvocationBuilderListener();
+        target = target.register(listener);
+        try (Response r = target.request().get()) {
+            assertDefault(r);
+            Assertions.assertEquals(1, listener.getCount());
+        }
+        try (Response r = target.request().get()) {
+            assertDefault(r);
+            Assertions.assertEquals(2, listener.getCount());
+        }
+    }
+
     private void assertDefault(Response response) {
         Assertions.assertEquals(key(ONE) + "=" + ONE, response.readEntity(String.class));
     }
@@ -193,4 +202,17 @@ public void onNewBuilder(InvocationBuilderContext context) {
             MatcherAssert.assertThat(context.getCookies().get("Cookie"), Matchers.notNullValue());
         }
     }
+
+    private static class CountingInvocationBuilderListener implements InvocationBuilderListener {
+        private int counter = 0;
+
+        @Override
+        public void onNewBuilder(InvocationBuilderContext context) {
+            counter++;
+        }
+
+        public int getCount() {
+            return counter;
+        }
+    }
 }