Merge remote-tracking branch 'origin/2.x' into 'origin/3.0'

Signed-off-by: Maxim Nesen <[email protected]>

Author: senivam

NOTICE.md

@@ -95,7 +95,7 @@ KineticJS, v4.7.1
 * Project: http://www.kineticjs.com, https://github.com/ericdrowell/KineticJS
 * Copyright: Eric Rowell
 
-org.objectweb.asm Version 9.8
+org.objectweb.asm Version 9.9
 * License: Modified BSD (https://asm.ow2.io/license.html)
 * Copyright (c) 2000-2011 INRIA, France Telecom. All rights reserved.
 

bom/pom.xml

@@ -158,6 +158,11 @@
                 <artifactId>jersey-bean-validation</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.ext</groupId>
+                <artifactId>jersey-constants</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.glassfish.jersey.ext</groupId>
                 <artifactId>jersey-entity-filtering</artifactId>

connectors/helidon-connector/pom.xml

@@ -76,13 +76,6 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <inherited>false</inherited>
             </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-javadoc-plugin</artifactId>
-               <configuration>
-                    <source>8</source>
-               </configuration>
-            </plugin>
         </plugins>
     </build>
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020 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 jakarta.annotation.Priority;
 import jakarta.ws.rs.client.ClientBuilder;
 import jakarta.ws.rs.client.ClientRequestContext;
 import jakarta.ws.rs.client.ClientRequestFilter;
-import jakarta.ws.rs.client.Entity;
 import jakarta.ws.rs.client.WebTarget;
 import jakarta.ws.rs.core.CacheControl;
-import jakarta.ws.rs.core.Configuration;
-import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.HttpHeaders;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.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;
+        }
+    }
 }

core-common/src/main/java/org/glassfish/jersey/internal/guava/Ordering.java

@@ -203,7 +203,7 @@ <E extends T> E min(Iterable<E> iterable) {
      * @throws ClassCastException if the parameters are not <i>mutually
      *                            comparable</i> under this ordering.
      */
-    <E extends T> E min(E a, E b) {
+    public <E extends T> E min(E a, E b) {
         return (compare(a, b) <= 0) ? a : b;
     }
 
@@ -278,7 +278,7 @@ <E extends T> E max(Iterable<E> iterable) {
      * @throws ClassCastException if the parameters are not <i>mutually
      *                            comparable</i> under this ordering.
      */
-    <E extends T> E max(E a, E b) {
+    public <E extends T> E max(E a, E b) {
         return (compare(a, b) >= 0) ? a : b;
     }
 

core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ClassReader.java

@@ -195,7 +195,7 @@ public ClassReader(
     this.b = classFileBuffer;
     // Check the class' major_version. This field is after the magic and minor_version fields, which
     // use 4 and 2 bytes respectively.
-    if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V25) {
+    if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V26) {
       throw new IllegalArgumentException(
           "Unsupported class file major version " + readShort(classFileOffset + 6));
     }

core-server/src/main/java/jersey/repackaged/org/objectweb/asm/Opcodes.java

@@ -291,6 +291,7 @@ public interface Opcodes {
   int V23 = 0 << 16 | 67;
   int V24 = 0 << 16 | 68;
   int V25 = 0 << 16 | 69;
+  int V26 = 0 << 16 | 70;
 
   /**
    * Version flag indicating that the class is using 'preview' features.

core-server/src/main/java/jersey/repackaged/org/objectweb/asm/SymbolTable.java

@@ -1473,7 +1473,7 @@ private static final class LabelEntry {
 
     /**
      * Another entry (and so on recursively) having the same hash code (modulo the size of {@link
-     * SymbolTable#labelEntries}}) as this one.
+     * SymbolTable#labelEntries}) as this one.
      */
     LabelEntry next;
 

core-server/src/main/java/org/glassfish/jersey/server/internal/scanning/AnnotationAcceptingListener.java

@@ -309,7 +309,7 @@ private Class getClassForName(final String className) {
 
     private static class ClassReaderWrapper {
         private static final Logger LOGGER = Logger.getLogger(ClassReader.class.getName());
-        private static final int WARN_VERSION = Opcodes.V25;
+        private static final int WARN_VERSION = Opcodes.V26;
         private static final int INPUT_STREAM_DATA_CHUNK_SIZE = 4096;
 
         private final byte[] b;