org.glassfish.jersey.ext
jersey-wadl-doclet
diff --git a/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheClientProperties.java b/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheClientProperties.java
index d5c2ff8a01..099fa31123 100644
--- a/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheClientProperties.java
+++ b/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheClientProperties.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
@@ -89,8 +89,8 @@ public final class ApacheClientProperties {
/**
* A value of {@code true} indicates that configured connection manager should be shared
- * among multiple Jersey {@link org.glassfish.jersey.client.ClientRuntime} instances. It means that closing
- * a particular {@link org.glassfish.jersey.client.ClientRuntime} instance does not shut down the underlying
+ * among multiple Jersey {@code ClientRuntime} instances. It means that closing
+ * a particular {@code ClientRuntime} instance does not shut down the underlying
* connection manager automatically. In such case, the connection manager life-cycle
* should be fully managed by the application code. To release all allocated resources,
* caller code should especially ensure {@link org.apache.http.conn.HttpClientConnectionManager#shutdown()} gets
@@ -114,7 +114,7 @@ public final class ApacheClientProperties {
*
* The value MUST be an instance of {@link org.apache.http.client.config.RequestConfig}.
*
- * If the property is absent default request configuration will be used.
+ * If the property is absent the default request configuration will be used.
*
* The name of the configuration property is {@value}.
*
@@ -137,9 +137,9 @@ public final class ApacheClientProperties {
/**
* ConnectionReuseStrategy for the {@link org.apache.http.client.HttpClient}.
*
- * The value MUST be an instance of {@link org.apache.http.impl.ConnectionReuseStrategy}.
+ * The value MUST be an instance of {@link org.apache.http.ConnectionReuseStrategy}.
*
- * If the property is absent the default reuse strategy of the Apache HTTP library will be used
+ * If the property is absent the default reuse strategy of the Apache HTTP library will be used.
*
* The name of the configuration property is {@value}.
*/
@@ -158,7 +158,9 @@ public final class ApacheClientProperties {
/**
- * Strategy that closes the Apache Connection. Accepts an instance of {@link ApacheConnectionClosingStrategy}.
+ *
+ * Strategy that closes the Apache Connection. Accepts an instance of {@link ApacheConnectionClosingStrategy}.
+ *
*
* @see ApacheConnectionClosingStrategy
* @since 2.30
diff --git a/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnector.java b/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnector.java
index 52059bb125..81e94b4b17 100644
--- a/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnector.java
+++ b/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnector.java
@@ -110,18 +110,22 @@
*
* The following properties are only supported at construction of this class:
*
+ * - {@link ApacheClientProperties#CONNECTION_CLOSING_STRATEGY}
* - {@link ApacheClientProperties#CONNECTION_MANAGER}
- * - {@link ApacheClientProperties#REQUEST_CONFIG}
+ * - {@link ApacheClientProperties#CONNECTION_MANAGER_SHARED}
+ * - {@link ApacheClientProperties#CONNECTION_CLOSING_STRATEGY}
* - {@link ApacheClientProperties#CREDENTIALS_PROVIDER}
* - {@link ApacheClientProperties#DISABLE_COOKIES}
* - {@link ApacheClientProperties#KEEPALIVE_STRATEGY}
+ * - {@link ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION}
* - {@link org.glassfish.jersey.client.ClientProperties#PROXY_URI}
* - {@link org.glassfish.jersey.client.ClientProperties#PROXY_USERNAME}
* - {@link org.glassfish.jersey.client.ClientProperties#PROXY_PASSWORD}
* - {@link org.glassfish.jersey.client.ClientProperties#REQUEST_ENTITY_PROCESSING} - default value is {@link org.glassfish.jersey.client.RequestEntityProcessing#CHUNKED}
- * - {@link ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION}
+ * - {@link ApacheClientProperties#REQUEST_CONFIG}
* - {@link ApacheClientProperties#RETRY_HANDLER}
* - {@link ApacheClientProperties#REUSE_STRATEGY}
+ * - {@link ApacheClientProperties#USE_SYSTEM_PROPERTIES}
*
*
* This connector uses {@link RequestEntityProcessing#CHUNKED chunked encoding} as a default setting. This can
diff --git a/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnectorProvider.java b/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnectorProvider.java
index d92d490fb1..d97204fa62 100644
--- a/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnectorProvider.java
+++ b/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnectorProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
@@ -33,19 +33,23 @@
*
* The following connector configuration properties are supported:
*
+ * - {@link ApacheClientProperties#CONNECTION_CLOSING_STRATEGY}
* - {@link ApacheClientProperties#CONNECTION_MANAGER}
- * - {@link ApacheClientProperties#REQUEST_CONFIG}
+ * - {@link ApacheClientProperties#CONNECTION_MANAGER_SHARED}
+ * - {@link ApacheClientProperties#CONNECTION_CLOSING_STRATEGY}
* - {@link ApacheClientProperties#CREDENTIALS_PROVIDER}
* - {@link ApacheClientProperties#DISABLE_COOKIES}
* - {@link ApacheClientProperties#KEEPALIVE_STRATEGY}
+ * - {@link ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION}
* - {@link org.glassfish.jersey.client.ClientProperties#PROXY_URI}
* - {@link org.glassfish.jersey.client.ClientProperties#PROXY_USERNAME}
* - {@link org.glassfish.jersey.client.ClientProperties#PROXY_PASSWORD}
* - {@link org.glassfish.jersey.client.ClientProperties#REQUEST_ENTITY_PROCESSING}
* - default value is {@link org.glassfish.jersey.client.RequestEntityProcessing#CHUNKED}
- * - {@link ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION}
+ * - {@link ApacheClientProperties#REQUEST_CONFIG}
* - {@link ApacheClientProperties#RETRY_HANDLER}
* - {@link ApacheClientProperties#REUSE_STRATEGY}
+ * - {@link ApacheClientProperties#USE_SYSTEM_PROPERTIES}
*
*
*
diff --git a/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5ClientProperties.java b/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5ClientProperties.java
index eac5be5f2f..df4c8e059c 100644
--- a/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5ClientProperties.java
+++ b/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5ClientProperties.java
@@ -90,8 +90,8 @@ public final class Apache5ClientProperties {
/**
* A value of {@code true} indicates that configured connection manager should be shared
- * among multiple Jersey {@link org.glassfish.jersey.client.ClientRuntime} instances. It means that closing
- * a particular {@link org.glassfish.jersey.client.ClientRuntime} instance does not shut down the underlying
+ * among multiple Jersey {@code ClientRuntime} instances. It means that closing
+ * a particular {@code ClientRuntime} instance does not shut down the underlying
* connection manager automatically. In such case, the connection manager life-cycle
* should be fully managed by the application code. To release all allocated resources,
* caller code should especially ensure {@link org.apache.hc.client5.http.io.HttpClientConnectionManager#close()} gets
@@ -124,7 +124,7 @@ public final class Apache5ClientProperties {
public static final String REQUEST_CONFIG = "jersey.config.apache5.client.requestConfig";
/**
- * HttpRequestRetryHandler which will be used to create {@link org.apache.hc.client5.http.classic.HttpClient}.
+ * HttpRequestRetryStrategy which will be used to create {@link org.apache.hc.client5.http.classic.HttpClient}.
*
* The value MUST be an instance of {@link org.apache.hc.client5.http.HttpRequestRetryStrategy}.
*
diff --git a/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5Connector.java b/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5Connector.java
index 13b827910f..9d101055f2 100644
--- a/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5Connector.java
+++ b/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5Connector.java
@@ -107,18 +107,21 @@
*
* The following properties are only supported at construction of this class:
*
+ * - {@link Apache5ClientProperties#CONNECTION_CLOSING_STRATEGY}
* - {@link Apache5ClientProperties#CONNECTION_MANAGER}
- * - {@link Apache5ClientProperties#REQUEST_CONFIG}
- * - {@link Apache5ClientProperties#CREDENTIALS_PROVIDER}
+ * - {@link Apache5ClientProperties#CONNECTION_MANAGER_SHARED}
* - {@link Apache5ClientProperties#DISABLE_COOKIES}
+ * - {@link Apache5ClientProperties#CREDENTIALS_PROVIDER}
* - {@link Apache5ClientProperties#KEEPALIVE_STRATEGY}
+ * - {@link Apache5ClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION}
* - {@link org.glassfish.jersey.client.ClientProperties#PROXY_URI}
* - {@link org.glassfish.jersey.client.ClientProperties#PROXY_USERNAME}
* - {@link org.glassfish.jersey.client.ClientProperties#PROXY_PASSWORD}
* - {@link org.glassfish.jersey.client.ClientProperties#REQUEST_ENTITY_PROCESSING} - default value is {@link org.glassfish.jersey.client.RequestEntityProcessing#CHUNKED}
- * - {@link Apache5ClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION}
+ * - {@link Apache5ClientProperties#REQUEST_CONFIG}
* - {@link Apache5ClientProperties#RETRY_STRATEGY}
* - {@link Apache5ClientProperties#REUSE_STRATEGY}
+ * - {@link Apache5ClientProperties#USE_SYSTEM_PROPERTIES}
*
*
* This connector uses {@link RequestEntityProcessing#CHUNKED chunked encoding} as a default setting. This can
diff --git a/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5ConnectorProvider.java b/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5ConnectorProvider.java
index 9a32a2ce3c..7f5d882829 100644
--- a/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5ConnectorProvider.java
+++ b/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5ConnectorProvider.java
@@ -32,19 +32,22 @@
*
* The following connector configuration properties are supported:
*
+ * - {@link Apache5ClientProperties#CONNECTION_CLOSING_STRATEGY}
* - {@link Apache5ClientProperties#CONNECTION_MANAGER}
- * - {@link Apache5ClientProperties#REQUEST_CONFIG}
- * - {@link Apache5ClientProperties#CREDENTIALS_PROVIDER}
+ * - {@link Apache5ClientProperties#CONNECTION_MANAGER_SHARED}
* - {@link Apache5ClientProperties#DISABLE_COOKIES}
+ * - {@link Apache5ClientProperties#CREDENTIALS_PROVIDER}
* - {@link Apache5ClientProperties#KEEPALIVE_STRATEGY}
+ * - {@link Apache5ClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION}
* - {@link org.glassfish.jersey.client.ClientProperties#PROXY_URI}
* - {@link org.glassfish.jersey.client.ClientProperties#PROXY_USERNAME}
* - {@link org.glassfish.jersey.client.ClientProperties#PROXY_PASSWORD}
* - {@link org.glassfish.jersey.client.ClientProperties#REQUEST_ENTITY_PROCESSING}
* - default value is {@link org.glassfish.jersey.client.RequestEntityProcessing#CHUNKED}
- * - {@link Apache5ClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION}
+ * - {@link Apache5ClientProperties#REQUEST_CONFIG}
* - {@link Apache5ClientProperties#RETRY_STRATEGY}
* - {@link Apache5ClientProperties#REUSE_STRATEGY}
+ * - {@link Apache5ClientProperties#USE_SYSTEM_PROPERTIES}
*
*
*
diff --git a/connectors/jdk-connector/src/main/java/org/glassfish/jersey/jdk/connector/JdkConnectorProperties.java b/connectors/jdk-connector/src/main/java/org/glassfish/jersey/jdk/connector/JdkConnectorProperties.java
index 190232f94b..9e7acdd83e 100644
--- a/connectors/jdk-connector/src/main/java/org/glassfish/jersey/jdk/connector/JdkConnectorProperties.java
+++ b/connectors/jdk-connector/src/main/java/org/glassfish/jersey/jdk/connector/JdkConnectorProperties.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022 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
@@ -60,7 +60,7 @@ public final class JdkConnectorProperties {
* Value is expected to be positive {@link Integer}. Default value is {@value #DEFAULT_MAX_REDIRECTS}.
*
* HTTP redirection must be enabled by property {@link org.glassfish.jersey.client.ClientProperties#FOLLOW_REDIRECTS},
- * otherwise {@code MAX_HEADER_SIZE} is not applied.
+ * otherwise {@code MAX_REDIRECTS} is not applied.
*
* @see org.glassfish.jersey.client.ClientProperties#FOLLOW_REDIRECTS
* @see org.glassfish.jersey.jdk.connector.internal.RedirectException
@@ -70,14 +70,14 @@ public final class JdkConnectorProperties {
/**
* To set the cookie policy of this cookie manager.
*
- * The default value is ACCEPT_ORIGINAL_SERVER.
+ * The default value is {@link CookiePolicy#ACCEPT_ORIGINAL_SERVER}.
*
* @see java.net.CookieManager
*/
public static final String COOKIE_POLICY = "jersey.config.client.JdkConnectorProvider.cookiePolicy";
/**
- * A maximal number of open connection to each destination. A destination is determined by the following triple:
+ * A maximum number of open connections per each destination. A destination is determined by the following triple:
*
* - host
* - port
diff --git a/connectors/jdk-connector/src/main/java/org/glassfish/jersey/jdk/connector/internal/RedirectException.java b/connectors/jdk-connector/src/main/java/org/glassfish/jersey/jdk/connector/internal/RedirectException.java
index 65aec26b79..0e8e672b5a 100644
--- a/connectors/jdk-connector/src/main/java/org/glassfish/jersey/jdk/connector/internal/RedirectException.java
+++ b/connectors/jdk-connector/src/main/java/org/glassfish/jersey/jdk/connector/internal/RedirectException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022 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
@@ -25,7 +25,7 @@
*
* -
* the chained redirection count exceeds the value of
- * {@link org.glassfish.jersey.client.JdkConnectorProvider#MAX_REDIRECTS}
+ * {@link org.glassfish.jersey.jdk.connector.JdkConnectorProperties#MAX_REDIRECTS}
*
* -
* or an infinite redirection loop is detected
diff --git a/connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyClientProperties.java b/connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyClientProperties.java
index 7b860c3214..ef2c8bef11 100644
--- a/connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyClientProperties.java
+++ b/connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyClientProperties.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
@@ -70,7 +70,7 @@ private JettyClientProperties() {
* that is stored in a truststore.
*
* The value MUST be an instance of {@link java.lang.Boolean}.
- * If the property is absent the default value is {@code true}
+ * If the property is absent the default value is {@code true}.
*/
public static final String ENABLE_SSL_HOSTNAME_VERIFICATION =
"jersey.config.jetty.client.enableSslHostnameVerification";
diff --git a/connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnector.java b/connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnector.java
index 46a938b555..780adc1e8a 100644
--- a/connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnector.java
+++ b/connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnector.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
@@ -92,8 +92,10 @@
*
- {@link ClientProperties#PROXY_USERNAME}
* - {@link ClientProperties#PROXY_PASSWORD}
* - {@link ClientProperties#PROXY_PASSWORD}
+ * - {@link JettyClientProperties#DISABLE_COOKIES}
*
+ * - {@link JettyClientProperties#ENABLE_SSL_HOSTNAME_VERIFICATION}
* - {@link JettyClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION}
- * - {@link JettyClientProperties#DISABLE_COOKIES}
+ * - {@link JettyClientProperties#SYNC_LISTENER_RESPONSE_MAX_SIZE}
*
*
* This transport supports both synchronous and asynchronous processing of client requests.
diff --git a/connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnectorProvider.java b/connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnectorProvider.java
index e59ae71139..0d1e084226 100644
--- a/connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnectorProvider.java
+++ b/connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnectorProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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,8 +40,10 @@
* - {@link org.glassfish.jersey.client.ClientProperties#PROXY_USERNAME}
* - {@link org.glassfish.jersey.client.ClientProperties#PROXY_PASSWORD}
* - {@link org.glassfish.jersey.client.ClientProperties#PROXY_PASSWORD}
+ * - {@link JettyClientProperties#DISABLE_COOKIES}
*
+ * - {@link JettyClientProperties#ENABLE_SSL_HOSTNAME_VERIFICATION}
* - {@link JettyClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION}
- * - {@link JettyClientProperties#DISABLE_COOKIES}
+ * - {@link JettyClientProperties#SYNC_LISTENER_RESPONSE_MAX_SIZE}
*
*
*
diff --git a/docs/src/main/docbook/appendix-properties.xml b/docs/src/main/docbook/appendix-properties.xml
index 5c3455ed12..b957da7398 100644
--- a/docs/src/main/docbook/appendix-properties.xml
+++ b/docs/src/main/docbook/appendix-properties.xml
@@ -1,7 +1,7 @@
-
-
-
-
-
-
-
-
-
+
+ org.glassfish.jersey.ext
+ jersey-spring6
+ ${project.version}
+
org.glassfish.jersey.ext
jersey-declarative-linking
diff --git a/ext/pom.xml b/ext/pom.xml
index 2c6e1500d4..fa7003a00b 100644
--- a/ext/pom.xml
+++ b/ext/pom.xml
@@ -51,10 +51,7 @@
mvc-mustache
proxy-client
rx
-
+ spring6
wadl-doclet
microprofile
diff --git a/ext/spring4/pom.xml b/ext/spring4/pom.xml
deleted file mode 100644
index e436f3da1b..0000000000
--- a/ext/spring4/pom.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-
-
-
-
-
- 4.0.0
-
-
- org.glassfish.jersey.ext
- project
- 3.0.0-SNAPSHOT
-
-
- jersey-spring4
- jersey-spring4
-
- jar
-
-
- Jersey extension module providing support for Spring 4 integration.
-
-
-
-
- org.glassfish.jersey.core
- jersey-server
- ${project.version}
-
-
-
- org.glassfish.jersey.inject
- jersey-hk2
- ${project.version}
-
-
-
- org.glassfish.jersey.containers
- jersey-container-servlet-core
- ${project.version}
-
-
-
- org.glassfish.jersey.test-framework.providers
- jersey-test-framework-provider-grizzly2
- ${project.version}
- test
-
-
-
- commons-logging
- commons-logging
- 1.2
- test
-
-
-
- org.glassfish.hk2
- hk2
- ${hk2.version}
-
-
-
- org.glassfish.hk2
- spring-bridge
- ${hk2.version}
-
-
- jakarta.inject
- jakarta.inject-api
-
-
- org.glassfish.hk2
- hk2-api
-
-
-
-
-
- org.springframework
- spring-beans
- ${spring4.version}
-
-
-
- org.springframework
- spring-core
- ${spring4.version}
-
-
- commons-logging
- commons-logging
-
-
-
-
-
- org.springframework
- spring-web
- ${spring4.version}
-
-
-
- org.springframework
- spring-aop
- ${spring4.version}
-
-
-
- jakarta.servlet
- jakarta.servlet-api
- ${servlet4.version}
- provided
-
-
-
- org.glassfish.jersey.test-framework
- jersey-test-framework-core
- ${project.version}
- test
-
-
-
- org.aspectj
- aspectjrt
- 1.6.11
- test
-
-
- org.aspectj
- aspectjweaver
- 1.6.11
- test
-
-
-
-
-
-
-
- com.sun.istack
- istack-commons-maven-plugin
- true
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- true
-
-
-
-
-
-
- jakartification_exclude_tests
-
- [1.8,)
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- true
-
-
-
-
-
-
- delayed-strategy-skip-test
-
-
- org.glassfish.jersey.injection.manager.strategy
- delayed
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- true
-
-
-
-
-
-
- ignore.on.jdk16
-
-
- [16,)
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- true
-
-
-
-
-
-
-
diff --git a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/AutowiredInjectResolver.java b/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/AutowiredInjectResolver.java
deleted file mode 100644
index 1158fc60ca..0000000000
--- a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/AutowiredInjectResolver.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring;
-
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.logging.Logger;
-
-import jakarta.inject.Singleton;
-
-import org.glassfish.jersey.internal.inject.Injectee;
-import org.glassfish.jersey.internal.inject.InjectionResolver;
-
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.config.DependencyDescriptor;
-import org.springframework.context.ApplicationContext;
-import org.springframework.core.MethodParameter;
-
-/**
- * HK2 injection resolver for Spring framework {@link Autowired} annotation injection.
- *
- * @author Marko Asplund (marko.asplund at yahoo.com)
- * @author Vetle Leinonen-Roeim (vetle at roeim.net)
- */
-@Singleton
-public class AutowiredInjectResolver implements InjectionResolver {
-
- private static final Logger LOGGER = Logger.getLogger(AutowiredInjectResolver.class.getName());
-
- private volatile ApplicationContext ctx;
-
- /**
- * Create a new instance.
- *
- * @param ctx Spring application context.
- */
- public AutowiredInjectResolver(ApplicationContext ctx) {
- this.ctx = ctx;
- }
-
- @Override
- public Object resolve(Injectee injectee) {
- AnnotatedElement parent = injectee.getParent();
- String beanName = null;
- if (parent != null) {
- Qualifier an = parent.getAnnotation(Qualifier.class);
- if (an != null) {
- beanName = an.value();
- }
- }
- boolean required = parent != null ? parent.getAnnotation(Autowired.class).required() : false;
- return getBeanFromSpringContext(beanName, injectee, required);
- }
-
- private Object getBeanFromSpringContext(String beanName, Injectee injectee, final boolean required) {
- try {
- DependencyDescriptor dependencyDescriptor = createSpringDependencyDescriptor(injectee);
- Set autowiredBeanNames = new HashSet<>(1);
- autowiredBeanNames.add(beanName);
- return ctx.getAutowireCapableBeanFactory().resolveDependency(dependencyDescriptor, null,
- autowiredBeanNames, null);
- } catch (NoSuchBeanDefinitionException e) {
- if (required) {
- LOGGER.warning(e.getMessage());
- throw e;
- }
- return null;
- }
- }
-
- private DependencyDescriptor createSpringDependencyDescriptor(final Injectee injectee) {
- AnnotatedElement annotatedElement = injectee.getParent();
-
- if (annotatedElement.getClass().isAssignableFrom(Field.class)) {
- return new DependencyDescriptor((Field) annotatedElement, !injectee.isOptional());
- } else if (annotatedElement.getClass().isAssignableFrom(Method.class)) {
- return new DependencyDescriptor(
- new MethodParameter((Method) annotatedElement, injectee.getPosition()), !injectee.isOptional());
- } else {
- return new DependencyDescriptor(
- new MethodParameter((Constructor) annotatedElement, injectee.getPosition()), !injectee.isOptional());
- }
- }
-
- @Override
- public boolean isConstructorParameterIndicator() {
- return false;
- }
-
- @Override
- public boolean isMethodParameterIndicator() {
- return false;
- }
-
- @Override
- public Class getAnnotation() {
- return Autowired.class;
- }
-}
diff --git a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/scope/JaxrsRequestAttributes.java b/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/scope/JaxrsRequestAttributes.java
deleted file mode 100644
index ec22efaeb6..0000000000
--- a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/scope/JaxrsRequestAttributes.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.scope;
-
-import jakarta.ws.rs.container.ContainerRequestContext;
-
-import org.glassfish.jersey.server.spring.LocalizationMessages;
-import org.springframework.util.StringUtils;
-import org.springframework.web.context.request.AbstractRequestAttributes;
-
-/**
- * JAX-RS based Spring RequestAttributes implementation.
- *
- * @author Marko Asplund (marko.asplund at yahoo.com)
- * @author Marek Potociar
- */
-class JaxrsRequestAttributes extends AbstractRequestAttributes {
-
- private final ContainerRequestContext requestContext;
-
- /**
- * Create a new instance.
- *
- * @param requestContext JAX-RS container request context
- */
- public JaxrsRequestAttributes(ContainerRequestContext requestContext) {
- this.requestContext = requestContext;
- }
-
- @Override
- protected void updateAccessedSessionAttributes() {
- // sessions not supported
- }
-
- @Override
- public Object getAttribute(String name, int scope) {
- return requestContext.getProperty(name);
- }
-
- @Override
- public void setAttribute(String name, Object value, int scope) {
- requestContext.setProperty(name, value);
- }
-
- @Override
- public void removeAttribute(String name, int scope) {
- requestContext.removeProperty(name);
- }
-
- @Override
- public String[] getAttributeNames(int scope) {
- if (!isRequestActive()) {
- throw new IllegalStateException(LocalizationMessages.NOT_IN_REQUEST_SCOPE());
- }
- return StringUtils.toStringArray(requestContext.getPropertyNames());
- }
-
- @Override
- public void registerDestructionCallback(String name, Runnable callback, int scope) {
- registerRequestDestructionCallback(name, callback);
- }
-
- @Override
- public Object resolveReference(String key) {
- if (REFERENCE_REQUEST.equals(key)) {
- return requestContext;
- }
- return null;
- }
-
- @Override
- public String getSessionId() {
- return null;
- }
-
- @Override
- public Object getSessionMutex() {
- return null;
- }
-}
diff --git a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/scope/JaxrsServletRequestAttributes.java b/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/scope/JaxrsServletRequestAttributes.java
deleted file mode 100644
index a3ac9d1235..0000000000
--- a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/scope/JaxrsServletRequestAttributes.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2016, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.scope;
-
-import jakarta.ws.rs.container.ContainerRequestContext;
-
-import jakarta.servlet.http.HttpServletRequest;
-
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-/**
- * JAX-RS based Spring RequestAttributes implementation for Servlet-based applications.
- *
- * @author Marek Potociar
- */
-class JaxrsServletRequestAttributes extends ServletRequestAttributes {
-
- private final ContainerRequestContext requestContext;
-
- /**
- * Create a new JAX-RS ServletRequestAttributes instance for the given request.
- *
- * @param request current HTTP request
- * @param requestContext JAX-RS request context
- */
- public JaxrsServletRequestAttributes(final HttpServletRequest request, final ContainerRequestContext requestContext) {
- super(request);
- this.requestContext = requestContext;
- }
-
- @Override
- public Object resolveReference(String key) {
- if (REFERENCE_REQUEST.equals(key)) {
- return this.requestContext;
- } else if (REFERENCE_SESSION.equals(key)) {
- return super.getSession(true);
- } else {
- return null;
- }
- }
-}
diff --git a/ext/spring4/src/main/resources/org/glassfish/jersey/server/spring/localization.properties b/ext/spring4/src/main/resources/org/glassfish/jersey/server/spring/localization.properties
deleted file mode 100644
index 6fd0a06270..0000000000
--- a/ext/spring4/src/main/resources/org/glassfish/jersey/server/spring/localization.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (c) 2013, 2018 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
-# http://www.eclipse.org/legal/epl-2.0.
-#
-# This Source Code may also be made available under the following Secondary
-# Licenses when the conditions for such availability set forth in the
-# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-# version 2 with the GNU Classpath Exception, which is available at
-# https://www.gnu.org/software/classpath/license.html.
-#
-# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-#
-
-no.beans.found.for.type=No beans found. Resolution failed for type {0}.
-ctx.lookup.started=Spring context lookup started.
-ctx.lookup.failed=Spring context lookup failed, skipping spring component provider initialization.
-ctx.lookup.sucessful=Spring context lookup done.
-spring.component.provider.initialized=Spring component provider initialized.
-none.or.multiple.beans.available=None or multiple beans found in Spring context for type {0}, skipping the type.
-bean.registered=Spring managed bean, {0}, registered with HK2.
-registering.ctx.loader.listener=Registering Spring ContextLoaderListener
-skipping.ctx.lodaer.listener.registration=Presuming Spring ContextLoaderListener was manually registered. Skipping context loader registration.
-not.in.request.scope=Cannot ask for request attributes - request is not active anymore!
diff --git a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/NoComponent.java b/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/NoComponent.java
deleted file mode 100644
index 111361c378..0000000000
--- a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/NoComponent.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2014, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring;
-
-public class NoComponent {
-
-}
diff --git a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/SpringTestConfiguration.java b/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/SpringTestConfiguration.java
deleted file mode 100644
index 5a8123cc42..0000000000
--- a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/SpringTestConfiguration.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2014, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ComponentScan(basePackages = "org.glassfish.jersey.server.spring")
-public class SpringTestConfiguration {
-}
diff --git a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/TestComponent2.java b/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/TestComponent2.java
deleted file mode 100644
index 792d9b85e8..0000000000
--- a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/TestComponent2.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2014, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring;
-
-public interface TestComponent2 {
- String result();
-}
diff --git a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/TestComponent2Impl2.java b/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/TestComponent2Impl2.java
deleted file mode 100644
index 9900cd476d..0000000000
--- a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/TestComponent2Impl2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2014, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class TestComponent2Impl2 implements TestComponent2 {
- @Override
- public String result() {
- return "test ok";
- }
-}
diff --git a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/aspect4j/Aspect4jJerseyConfig.java b/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/aspect4j/Aspect4jJerseyConfig.java
deleted file mode 100644
index 4506c7ecaf..0000000000
--- a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/aspect4j/Aspect4jJerseyConfig.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2014, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.aspect4j;
-
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.server.spring.scope.RequestContextFilter;
-
-public class Aspect4jJerseyConfig extends ResourceConfig {
-
- public Aspect4jJerseyConfig() {
- register(RequestContextFilter.class);
- register(NoComponentResource.class);
- register(ComponentResource.class);
- }
-}
diff --git a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/aspect4j/ComponentResource.java b/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/aspect4j/ComponentResource.java
deleted file mode 100644
index 9b96e32de1..0000000000
--- a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/aspect4j/ComponentResource.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2014, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.aspect4j;
-
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.UriInfo;
-
-import org.glassfish.jersey.server.spring.TestComponent1;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Path("/")
-@Component
-public class ComponentResource {
-
- @Autowired
- private TestComponent1 testComponent1;
- @Context
- private UriInfo uriInfo;
-
- @Path("test2")
- @GET
- public String test2() {
- return testComponent1.result();
- }
-
- @Path("JERSEY-3126")
- @GET
- public String JERSEY_3126() {
- return uriInfo == null ? "test failed" : "test ok";
- }
-
-}
diff --git a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/aspect4j/NoComponentResource.java b/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/aspect4j/NoComponentResource.java
deleted file mode 100644
index bb5bf8aee7..0000000000
--- a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/aspect4j/NoComponentResource.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2014, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.aspect4j;
-
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-
-import org.glassfish.jersey.server.spring.TestComponent1;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Path("/")
-public class NoComponentResource {
-
- @Autowired
- private TestComponent1 testComponent1;
-
- @Path("test1")
- @GET
- public String test1() {
- return testComponent1.result();
- }
-
-}
diff --git a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/fieldinjection/SpringFieldInjectionTest.java b/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/fieldinjection/SpringFieldInjectionTest.java
deleted file mode 100644
index 141d16e789..0000000000
--- a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/fieldinjection/SpringFieldInjectionTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2014, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.fieldinjection;
-
-import jakarta.ws.rs.core.Application;
-
-import org.glassfish.jersey.server.spring.SpringTestConfiguration;
-import org.glassfish.jersey.test.JerseyTest;
-import org.junit.Test;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-
-import static org.junit.Assert.assertEquals;
-
-public class SpringFieldInjectionTest extends JerseyTest {
-
- @Override
- protected Application configure() {
- ApplicationContext context = new AnnotationConfigApplicationContext(SpringTestConfiguration.class);
- return new SpringFieldInjectionJerseyTestConfig()
- .property("contextConfig", context);
- }
-
- @Test
- public void testInjectionOfSingleBean() {
- String result = target("test1").request().get(String.class);
- assertEquals("test ok", result);
- }
-
- @Test
- public void testInjectionOfListOfBeans() {
- String result = target("test2").request().get(String.class);
- assertEquals("test ok", result);
- }
-
- @Test
- public void testInjectionOfSetOfBeans() {
- String result = target("test3").request().get(String.class);
- assertEquals("test ok", result);
- }
-
- @Test
- public void JERSEY_2643() {
- String result = target("JERSEY-2643").request().get(String.class);
- assertEquals("test ok", result);
- }
-}
diff --git a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/fieldinjection/SpringFieldInjectionTestResource.java b/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/fieldinjection/SpringFieldInjectionTestResource.java
deleted file mode 100644
index 941e311089..0000000000
--- a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/fieldinjection/SpringFieldInjectionTestResource.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2014, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.fieldinjection;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-
-import org.glassfish.jersey.server.spring.NoComponent;
-import org.glassfish.jersey.server.spring.TestComponent1;
-import org.glassfish.jersey.server.spring.TestComponent2;
-import org.springframework.beans.factory.annotation.Autowired;
-
-@Path("/")
-public class SpringFieldInjectionTestResource {
-
- @Autowired
- private TestComponent1 testComponent1;
-
- @Autowired
- private List testComponent2List;
-
- @Autowired
- Set testComponent2Set;
-
- @Autowired(required = false)
- private NoComponent noComponent;
-
- @Path("test1")
- @GET
- public String test1() {
- return testComponent1.result();
- }
-
- @Path("test2")
- @GET
- public String test2() {
- return (testComponent2List.size() == 2 && "test ok".equals(testComponent2List.get(0).result())
- && "test ok".equals(testComponent2List.get(1).result())) ? "test ok" : "test failed";
- }
-
- @Path("test3")
- @GET
- public String test3() {
- Iterator iterator = testComponent2Set.iterator();
- return (testComponent2Set.size() == 2 && "test ok".equals(iterator.next().result())
- && "test ok".equals(iterator.next().result())) ? "test ok" : "test failed";
- }
-
- @Path("JERSEY-2643")
- @GET
- public String JERSEY_2643() {
- return noComponent == null ? "test ok" : "test failed";
- }
-
-}
diff --git a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/filter/Counter.java b/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/filter/Counter.java
deleted file mode 100644
index 28de237b30..0000000000
--- a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/filter/Counter.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2013, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.filter;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class Counter {
-
- private int count = 0;
-
- public void inc() {
- count++;
- }
-
- public int getCount() {
- return count;
- }
-
-}
diff --git a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/methodinjection/SpringMethodInjectionJerseyTestConfig.java b/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/methodinjection/SpringMethodInjectionJerseyTestConfig.java
deleted file mode 100644
index 5a9d3b75f7..0000000000
--- a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/methodinjection/SpringMethodInjectionJerseyTestConfig.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2014, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.methodinjection;
-
-import org.glassfish.jersey.server.spring.scope.RequestContextFilter;
-import org.glassfish.jersey.server.ResourceConfig;
-
-public class SpringMethodInjectionJerseyTestConfig extends ResourceConfig {
- public SpringMethodInjectionJerseyTestConfig() {
- register(RequestContextFilter.class);
- register(SpringMethodInjectionTestResource.class);
- }
-}
diff --git a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/methodinjection/SpringMethodInjectionTest.java b/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/methodinjection/SpringMethodInjectionTest.java
deleted file mode 100644
index 3f66478a95..0000000000
--- a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/methodinjection/SpringMethodInjectionTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2014, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.methodinjection;
-
-import static org.junit.Assert.assertEquals;
-
-import org.glassfish.jersey.test.JerseyTest;
-import org.junit.Test;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.glassfish.jersey.server.spring.SpringTestConfiguration;
-
-import jakarta.ws.rs.core.Application;
-
-public class SpringMethodInjectionTest extends JerseyTest {
-
- @Override
- protected Application configure() {
- ApplicationContext context = new AnnotationConfigApplicationContext(SpringTestConfiguration.class);
- return new SpringMethodInjectionJerseyTestConfig()
- .property("contextConfig", context);
- }
-
- @Test
- public void testInjectionOfSingleBean() {
- String result = target("test1").request().get(String.class);
- assertEquals("test ok", result);
- }
-
- @Test
- public void testInjectionOfListOfBeans() {
- String result = target("test2").request().get(String.class);
- assertEquals("test ok", result);
- }
-
- @Test
- public void testInjectionOfSetOfBeans() {
- String result = target("test3").request().get(String.class);
- assertEquals("test ok", result);
- }
-}
diff --git a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/methodinjection/SpringMethodInjectionTestResource.java b/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/methodinjection/SpringMethodInjectionTestResource.java
deleted file mode 100644
index 8a16bbef63..0000000000
--- a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/methodinjection/SpringMethodInjectionTestResource.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2014, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.methodinjection;
-
-import org.glassfish.jersey.server.spring.NoComponent;
-import org.glassfish.jersey.server.spring.TestComponent1;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
-import java.util.Set;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-
-@Path("/")
-public class SpringMethodInjectionTestResource {
-
- private TestComponent1 testComponent1;
- private List testComponent2List;
- private Set testComponent2Set;
- private NoComponent noComponent;
-
- @Autowired
- public void setTestComponent1(TestComponent1 testComponent1) {
- this.testComponent1 = testComponent1;
- }
-
- @Autowired
- public void setTestComponent2List(List testComponent2List) {
- this.testComponent2List = testComponent2List;
- }
-
- @Autowired
- public void setTestComponent2Set(Set testComponent2Set) {
- this.testComponent2Set = testComponent2Set;
- }
-
- @Autowired(required = false)
- public void setNoComponent(NoComponent noComponent) {
- this.noComponent = noComponent;
- }
-
- @Path("test1")
- @GET
- public String test1() {
- return testComponent1.result();
- }
-
- @Path("test2")
- @GET
- public String test2() {
- return (testComponent2List.size() == 2 && "test ok".equals(testComponent2List.get(0).result())
- && "test ok".equals(testComponent2List.get(1).result())) ? "test ok" : "test failed";
- }
-
- @Path("test3")
- @GET
- public String test3() {
- java.util.Iterator iterator = testComponent2Set.iterator();
- return (testComponent2Set.size() == 2 && "test ok".equals(iterator.next().result())
- && "test ok".equals(iterator.next().result())) ? "test ok" : "test failed";
- }
-
- @Path("JERSEY-2643")
- @GET
- public String JERSEY_2643() {
- return noComponent == null ? "test ok" : "test failed";
- }
-
-}
diff --git a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/parameterinjection/SpringParameterInjectionTestResource.java b/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/parameterinjection/SpringParameterInjectionTestResource.java
deleted file mode 100644
index b7c56c964b..0000000000
--- a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/parameterinjection/SpringParameterInjectionTestResource.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2014, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.parameterinjection;
-
-import org.glassfish.jersey.server.spring.TestComponent1;
-import org.glassfish.jersey.server.spring.TestComponent2;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-@Path("/")
-public class SpringParameterInjectionTestResource {
-
- private final TestComponent1 testComponent1;
- private final List testComponent2List;
- private final Set testComponent2Set;
-
- @Autowired
- public SpringParameterInjectionTestResource(final TestComponent1 testComponent1,
- final List testComponent2List,
- final Set testComponent2Set) {
- this.testComponent1 = testComponent1;
- this.testComponent2List = testComponent2List;
- this.testComponent2Set = testComponent2Set;
- }
-
- @Path("test1")
- @GET
- public String test1() {
- return testComponent1.result();
- }
-
- @Path("test2")
- @GET
- public String test2() {
- return (testComponent2List.size() == 2 && "test ok".equals(testComponent2List.get(0).result())
- && "test ok".equals(testComponent2List.get(1).result())) ? "test ok" : "test failed";
- }
-
- @Path("test3")
- @GET
- public String test3() {
- Iterator iterator = testComponent2Set.iterator();
- return (testComponent2Set.size() == 2 && "test ok".equals(iterator.next().result())
- && "test ok".equals(iterator.next().result())) ? "test ok" : "test failed";
- }
-}
diff --git a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/profiles/DefaultTestService.java b/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/profiles/DefaultTestService.java
deleted file mode 100644
index 040d05309a..0000000000
--- a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/profiles/DefaultTestService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2014, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.profiles;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class DefaultTestService implements TestService {
-
- @Override
- public String test() {
- return "default";
- }
-}
diff --git a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/profiles/DevTestService.java b/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/profiles/DevTestService.java
deleted file mode 100644
index dc3c99543e..0000000000
--- a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/profiles/DevTestService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2014, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.profiles;
-
-import org.springframework.context.annotation.Primary;
-import org.springframework.context.annotation.Profile;
-import org.springframework.stereotype.Component;
-
-@Component
-@Primary
-@Profile("dev")
-public class DevTestService implements TestService {
-
- @Override
- public String test() {
- return "dev";
- }
-}
diff --git a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/profiles/SpringDefaultProfileResourceTest.java b/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/profiles/SpringDefaultProfileResourceTest.java
deleted file mode 100644
index 3b1f6a8b69..0000000000
--- a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/profiles/SpringDefaultProfileResourceTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2014, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.profiles;
-
-import jakarta.ws.rs.core.Application;
-
-import org.glassfish.jersey.logging.LoggingFeature;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.server.spring.scope.RequestContextFilter;
-import org.glassfish.jersey.test.JerseyTest;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-
-public class SpringDefaultProfileResourceTest extends JerseyTest {
-
- @Override
- protected Application configure() {
- System.setProperty("spring.profiles.active", "");
- ApplicationContext context = new AnnotationConfigApplicationContext("org.glassfish.jersey.server.spring.profiles");
- return new ResourceConfig()
- .register(RequestContextFilter.class)
- .register(LoggingFeature.class)
- .packages("org.glassfish.jersey.server.spring.profiles")
- .property("contextConfig", context);
- }
-
- @Test
- public void shouldUseDefaultComponent() {
- final String result = target("spring-resource").request().get(String.class);
- Assert.assertEquals("default", result);
- }
-}
diff --git a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/profiles/SpringDevProfileResourceTest.java b/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/profiles/SpringDevProfileResourceTest.java
deleted file mode 100644
index 2d7c5a184e..0000000000
--- a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/profiles/SpringDevProfileResourceTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2014, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.profiles;
-
-import jakarta.ws.rs.core.Application;
-
-import org.glassfish.jersey.logging.LoggingFeature;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.server.spring.scope.RequestContextFilter;
-import org.glassfish.jersey.test.JerseyTest;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-
-public class SpringDevProfileResourceTest extends JerseyTest {
-
- @Override
- protected Application configure() {
- System.setProperty("spring.profiles.active", "dev");
- AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
- "org.glassfish.jersey.server.spring.profiles");
- return new ResourceConfig()
- .register(RequestContextFilter.class)
- .register(LoggingFeature.class)
- .packages("org.glassfish.jersey.server.spring.profiles")
- .property("contextConfig", context);
- }
-
- @Test
- public void shouldUseDevProfileBean() {
- final String result = target("spring-resource").request().get(String.class);
- Assert.assertEquals("dev", result);
- }
-}
diff --git a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/profiles/SpringRequestResource.java b/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/profiles/SpringRequestResource.java
deleted file mode 100644
index e05de3da6c..0000000000
--- a/ext/spring4/src/test/java/org/glassfish/jersey/server/spring/profiles/SpringRequestResource.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2014, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.profiles;
-
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.MediaType;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-
-@Singleton
-@Path("spring-resource")
-@Service
-public class SpringRequestResource {
-
- @Autowired
- private TestService testService;
-
- @GET
- @Produces(MediaType.TEXT_PLAIN)
- public String getGoodbye() {
- return testService.test();
- }
-
-}
diff --git a/ext/spring5/pom.xml b/ext/spring5/pom.xml
deleted file mode 100644
index 4647434fdd..0000000000
--- a/ext/spring5/pom.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-
-
-
-
-
- 4.0.0
-
-
- org.glassfish.jersey.ext
- project
- 3.0.0-SNAPSHOT
-
-
- jersey-spring5
- jersey-spring5
-
- jar
-
-
- Jersey extension module providing support for Spring 5 integration.
-
-
-
-
- org.glassfish.jersey.core
- jersey-server
- ${project.version}
-
-
-
- org.glassfish.jersey.inject
- jersey-hk2
- ${project.version}
-
-
-
- org.glassfish.jersey.containers
- jersey-container-servlet-core
- ${project.version}
-
-
-
- org.glassfish.jersey.test-framework.providers
- jersey-test-framework-provider-grizzly2
- ${project.version}
- test
-
-
-
- commons-logging
- commons-logging
- 1.2
- test
-
-
-
- org.glassfish.hk2
- hk2
- ${hk2.version}
-
-
-
- org.glassfish.hk2
- spring-bridge
- ${hk2.version}
-
-
- jakarta.inject
- jakarta.inject
-
-
- org.glassfish.hk2
- hk2-api
-
-
- org.springframework
- spring-context
-
-
-
-
-
- org.springframework
- spring-beans
- ${spring5.version}
-
-
-
- org.springframework
- spring-core
- ${spring5.version}
-
-
- commons-logging
- commons-logging
-
-
-
-
-
- org.springframework
- spring-context
- ${spring5.version}
-
-
- commons-logging
- commons-logging
-
-
-
-
-
- org.springframework
- spring-web
- ${spring5.version}
-
-
-
- org.springframework
- spring-aop
- ${spring5.version}
-
-
-
- jakarta.servlet
- jakarta.servlet-api
- ${servlet4.version}
- provided
-
-
-
- org.glassfish.jersey.test-framework
- jersey-test-framework-core
- ${project.version}
- test
-
-
-
- org.aspectj
- aspectjrt
- 1.6.11
- test
-
-
- org.aspectj
- aspectjweaver
- 1.6.11
- test
-
-
-
-
-
-
-
- com.sun.istack
- istack-commons-maven-plugin
- true
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- true
-
-
-
-
-
-
- delayed-strategy-skip-test
-
-
- org.glassfish.jersey.injection.manager.strategy
- delayed
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- true
-
-
-
-
-
-
-
diff --git a/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/SpringComponentProvider.java b/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/SpringComponentProvider.java
deleted file mode 100644
index e8df9402ad..0000000000
--- a/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/SpringComponentProvider.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 2013, 2019 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring;
-
-import java.util.Set;
-import java.util.function.Supplier;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import jakarta.servlet.ServletContext;
-
-import org.glassfish.jersey.inject.hk2.ImmediateHk2InjectionManager;
-import org.glassfish.jersey.internal.inject.Binding;
-import org.glassfish.jersey.internal.inject.Bindings;
-import org.glassfish.jersey.internal.inject.InjectionManager;
-import org.glassfish.jersey.server.ApplicationHandler;
-import org.glassfish.jersey.server.spi.ComponentProvider;
-
-import org.jvnet.hk2.spring.bridge.api.SpringBridge;
-import org.jvnet.hk2.spring.bridge.api.SpringIntoHK2Bridge;
-
-import org.springframework.aop.framework.Advised;
-import org.springframework.beans.factory.BeanFactoryUtils;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-
-/**
- * Custom ComponentProvider class.
- * Responsible for 1) bootstrapping Jersey 2 Spring integration and
- * 2) making Jersey skip JAX-RS Spring component life-cycle management and leave it to us.
- *
- * @author Marko Asplund (marko.asplund at yahoo.com)
- */
-public class SpringComponentProvider implements ComponentProvider {
-
- private static final Logger LOGGER = Logger.getLogger(SpringComponentProvider.class.getName());
- private static final String DEFAULT_CONTEXT_CONFIG_LOCATION = "applicationContext.xml";
- private static final String PARAM_CONTEXT_CONFIG_LOCATION = "contextConfigLocation";
- private static final String PARAM_SPRING_CONTEXT = "contextConfig";
-
- private volatile InjectionManager injectionManager;
- private volatile ApplicationContext ctx;
-
- @Override
- public void initialize(InjectionManager injectionManager) {
- this.injectionManager = injectionManager;
-
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.fine(LocalizationMessages.CTX_LOOKUP_STARTED());
- }
-
- ServletContext sc = injectionManager.getInstance(ServletContext.class);
-
- if (sc != null) {
- // servlet container
- ctx = WebApplicationContextUtils.getWebApplicationContext(sc);
- } else {
- // non-servlet container
- ctx = createSpringContext();
- }
- if (ctx == null) {
- LOGGER.severe(LocalizationMessages.CTX_LOOKUP_FAILED());
- return;
- }
- LOGGER.config(LocalizationMessages.CTX_LOOKUP_SUCESSFUL());
-
- // initialize HK2 spring-bridge
-
- ImmediateHk2InjectionManager hk2InjectionManager = (ImmediateHk2InjectionManager) injectionManager;
- SpringBridge.getSpringBridge().initializeSpringBridge(hk2InjectionManager.getServiceLocator());
- SpringIntoHK2Bridge springBridge = injectionManager.getInstance(SpringIntoHK2Bridge.class);
- springBridge.bridgeSpringBeanFactory(ctx);
-
- injectionManager.register(Bindings.injectionResolver(new AutowiredInjectResolver(ctx)));
- injectionManager.register(Bindings.service(ctx).to(ApplicationContext.class).named("SpringContext"));
- LOGGER.config(LocalizationMessages.SPRING_COMPONENT_PROVIDER_INITIALIZED());
- }
-
- // detect JAX-RS classes that are also Spring @Components.
- // register these with HK2 ServiceLocator to manage their lifecycle using Spring.
- @Override
- public boolean bind(Class component, Set> providerContracts) {
-
- if (ctx == null) {
- return false;
- }
-
- if (AnnotationUtils.findAnnotation(component, Component.class) != null) {
- String[] beanNames = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(ctx, component);
- if (beanNames == null || beanNames.length != 1) {
- LOGGER.severe(LocalizationMessages.NONE_OR_MULTIPLE_BEANS_AVAILABLE(component));
- return false;
- }
- String beanName = beanNames[0];
-
- Binding binding = Bindings.supplier(new SpringManagedBeanFactory(ctx, injectionManager, beanName))
- .to(component)
- .to(providerContracts);
- injectionManager.register(binding);
-
- LOGGER.config(LocalizationMessages.BEAN_REGISTERED(beanNames[0]));
- return true;
- }
- return false;
- }
-
- @Override
- public void done() {
- }
-
- private ApplicationContext createSpringContext() {
- ApplicationHandler applicationHandler = injectionManager.getInstance(ApplicationHandler.class);
- ApplicationContext springContext = (ApplicationContext) applicationHandler.getConfiguration()
- .getProperty(PARAM_SPRING_CONTEXT);
- if (springContext == null) {
- String contextConfigLocation = (String) applicationHandler.getConfiguration()
- .getProperty(PARAM_CONTEXT_CONFIG_LOCATION);
- springContext = createXmlSpringConfiguration(contextConfigLocation);
- }
- return springContext;
- }
-
- private ApplicationContext createXmlSpringConfiguration(String contextConfigLocation) {
- if (contextConfigLocation == null) {
- contextConfigLocation = DEFAULT_CONTEXT_CONFIG_LOCATION;
- }
- return ctx = new ClassPathXmlApplicationContext(contextConfigLocation, "jersey-spring-applicationContext.xml");
- }
-
- private static class SpringManagedBeanFactory implements Supplier {
-
- private final ApplicationContext ctx;
- private final InjectionManager injectionManager;
- private final String beanName;
-
- private SpringManagedBeanFactory(ApplicationContext ctx, InjectionManager injectionManager, String beanName) {
- this.ctx = ctx;
- this.injectionManager = injectionManager;
- this.beanName = beanName;
- }
-
- @Override
- public Object get() {
- Object bean = ctx.getBean(beanName);
- if (bean instanceof Advised) {
- try {
- // Unwrap the bean and inject the values inside of it
- Object localBean = ((Advised) bean).getTargetSource().getTarget();
- injectionManager.inject(localBean);
- } catch (Exception e) {
- // Ignore and let the injection happen as it normally would.
- injectionManager.inject(bean);
- }
- } else {
- injectionManager.inject(bean);
- }
- return bean;
- }
- }
-}
diff --git a/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/SpringWebApplicationInitializer.java b/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/SpringWebApplicationInitializer.java
deleted file mode 100644
index c3bac70aef..0000000000
--- a/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/SpringWebApplicationInitializer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2013, 2019 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring;
-
-import java.util.logging.Logger;
-
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletException;
-
-import org.springframework.web.WebApplicationInitializer;
-
-/**
- * Spring WebApplicationInitializer implementation initializes Spring context by
- * adding a Spring ContextLoaderListener to the ServletContext.
- *
- * @author Marko Asplund (marko.asplund at yahoo.com)
- */
-public class SpringWebApplicationInitializer implements WebApplicationInitializer {
-
- private static final Logger LOGGER = Logger.getLogger(SpringWebApplicationInitializer.class.getName());
-
- private static final String PAR_NAME_CTX_CONFIG_LOCATION = "contextConfigLocation";
-
- @Override
- public void onStartup(ServletContext sc) throws ServletException {
- if (sc.getInitParameter(PAR_NAME_CTX_CONFIG_LOCATION) == null) {
- LOGGER.config(LocalizationMessages.REGISTERING_CTX_LOADER_LISTENER());
- sc.setInitParameter(PAR_NAME_CTX_CONFIG_LOCATION, "classpath:applicationContext.xml");
- sc.addListener("org.springframework.web.context.ContextLoaderListener");
- sc.addListener("org.springframework.web.context.request.RequestContextListener");
- } else {
- LOGGER.config(LocalizationMessages.SKIPPING_CTX_LODAER_LISTENER_REGISTRATION());
- }
- }
-}
diff --git a/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/package-info.java b/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/package-info.java
deleted file mode 100644
index 6e7b71a767..0000000000
--- a/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2013, 2019 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/**
- * Jersey server-side Spring 5 integration classes.
- * @since 2.29
- */
-package org.glassfish.jersey.server.spring;
diff --git a/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/scope/RequestContextFilter.java b/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/scope/RequestContextFilter.java
deleted file mode 100644
index de87d7e91d..0000000000
--- a/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/scope/RequestContextFilter.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.scope;
-
-import java.io.IOException;
-
-import jakarta.ws.rs.container.ContainerRequestContext;
-import jakarta.ws.rs.container.ContainerRequestFilter;
-import jakarta.ws.rs.container.ContainerResponseContext;
-import jakarta.ws.rs.container.ContainerResponseFilter;
-import jakarta.ws.rs.container.PreMatching;
-import jakarta.ws.rs.ext.Provider;
-
-import jakarta.inject.Inject;
-import jakarta.servlet.http.HttpServletRequest;
-
-import org.glassfish.jersey.internal.inject.InjectionManager;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.request.AbstractRequestAttributes;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-
-/**
- * Spring filter to provide a bridge between JAX-RS and Spring request attributes.
- *
- * @author Marko Asplund (marko.asplund at yahoo.com)
- * @author Jakub Podlesak
- * @author Marek Potociar
- */
-@Provider
-@PreMatching
-public final class RequestContextFilter implements ContainerRequestFilter, ContainerResponseFilter {
-
- private static final String REQUEST_ATTRIBUTES_PROPERTY = RequestContextFilter.class.getName() + ".REQUEST_ATTRIBUTES";
-
- private final SpringAttributeController attributeController;
-
- private static final SpringAttributeController EMPTY_ATTRIBUTE_CONTROLLER = new SpringAttributeController() {
- @Override
- public void setAttributes(final ContainerRequestContext requestContext) {
- }
-
- @Override
- public void resetAttributes(final ContainerRequestContext requestContext) {
- }
- };
-
- private interface SpringAttributeController {
-
- void setAttributes(final ContainerRequestContext requestContext);
-
- void resetAttributes(final ContainerRequestContext requestContext);
- }
-
- /**
- * Create a new request context filter instance.
- *
- * @param injectionManager injection manager.
- */
- @Inject
- public RequestContextFilter(final InjectionManager injectionManager) {
- final ApplicationContext appCtx = injectionManager.getInstance(ApplicationContext.class);
- final boolean isWebApp = appCtx instanceof WebApplicationContext;
-
- attributeController = appCtx != null ? new SpringAttributeController() {
-
- @Override
- public void setAttributes(final ContainerRequestContext requestContext) {
- final RequestAttributes attributes;
- if (isWebApp) {
- final HttpServletRequest httpRequest = injectionManager.getInstance(HttpServletRequest.class);
- attributes = new JaxrsServletRequestAttributes(httpRequest, requestContext);
- } else {
- attributes = new JaxrsRequestAttributes(requestContext);
- }
- requestContext.setProperty(REQUEST_ATTRIBUTES_PROPERTY, attributes);
- RequestContextHolder.setRequestAttributes(attributes);
- }
-
- @Override
- public void resetAttributes(final ContainerRequestContext requestContext) {
- final AbstractRequestAttributes attributes =
- (AbstractRequestAttributes) requestContext.getProperty(REQUEST_ATTRIBUTES_PROPERTY);
- RequestContextHolder.resetRequestAttributes();
- attributes.requestCompleted();
- }
- } : EMPTY_ATTRIBUTE_CONTROLLER;
- }
-
- @Override
- public void filter(final ContainerRequestContext requestContext) throws IOException {
- attributeController.setAttributes(requestContext);
- }
-
- @Override
- public void filter(final ContainerRequestContext requestContext, final ContainerResponseContext responseContext)
- throws IOException {
- attributeController.resetAttributes(requestContext);
- }
-}
diff --git a/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/scope/package-info.java b/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/scope/package-info.java
deleted file mode 100644
index 49985aab7d..0000000000
--- a/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/scope/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2013, 2019 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/**
- * Jersey server-side Spring 5 integration injection scopes related classes.
- * @since 2.29
- */
-package org.glassfish.jersey.server.spring.scope;
diff --git a/ext/spring5/src/main/resources/META-INF/services/org.glassfish.jersey.server.spi.ComponentProvider b/ext/spring5/src/main/resources/META-INF/services/org.glassfish.jersey.server.spi.ComponentProvider
deleted file mode 100644
index 5aec207d97..0000000000
--- a/ext/spring5/src/main/resources/META-INF/services/org.glassfish.jersey.server.spi.ComponentProvider
+++ /dev/null
@@ -1 +0,0 @@
-org.glassfish.jersey.server.spring.SpringComponentProvider
diff --git a/ext/spring5/src/main/resources/jersey-spring-applicationContext.xml b/ext/spring5/src/main/resources/jersey-spring-applicationContext.xml
deleted file mode 100644
index fd6f52829a..0000000000
--- a/ext/spring5/src/main/resources/jersey-spring-applicationContext.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/TestComponent1.java b/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/TestComponent1.java
deleted file mode 100644
index d8d29a3c0b..0000000000
--- a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/TestComponent1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2014, 2019 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class TestComponent1 {
-
- public String result() {
- return "test ok";
- }
-}
diff --git a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/TestComponent2Impl1.java b/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/TestComponent2Impl1.java
deleted file mode 100644
index 25078b67e0..0000000000
--- a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/TestComponent2Impl1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2014, 2019 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class TestComponent2Impl1 implements TestComponent2 {
- @Override
- public String result() {
- return "test ok";
- }
-}
diff --git a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/aspect4j/Aspect4JTest.java b/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/aspect4j/Aspect4JTest.java
deleted file mode 100644
index 52fd0e3e11..0000000000
--- a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/aspect4j/Aspect4JTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2014, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.aspect4j;
-
-import jakarta.ws.rs.core.Application;
-
-import org.glassfish.jersey.test.JerseyTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import static org.junit.Assert.assertEquals;
-
-public class Aspect4JTest extends JerseyTest {
-
- private ClassPathXmlApplicationContext applicationContext;
-
- private TestAspect testAspect;
-
- @Before
- public void before() {
- testAspect.reset();
- }
-
- @Override
- protected Application configure() {
- applicationContext = new ClassPathXmlApplicationContext("jersey-spring-aspect4j-applicationContext.xml");
- testAspect = applicationContext.getBean(TestAspect.class);
- return new Aspect4jJerseyConfig()
- .property("contextConfig", applicationContext);
- }
-
- @Test
- public void methodCallShouldNotBeIntercepted() {
- target("test1").request().get(String.class);
- assertEquals(0, testAspect.getInterceptions());
- }
-
- @Test
- public void methodCallShouldBeIntercepted() {
- target("test2").request().get(String.class);
- assertEquals(1, applicationContext.getBean(TestAspect.class).getInterceptions());
- }
-
- @Test
- public void JERSEY_3126() {
- final String result = target("JERSEY-3126").request().get(String.class);
- assertEquals("test ok", result);
- }
-}
diff --git a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/aspect4j/TestAspect.java b/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/aspect4j/TestAspect.java
deleted file mode 100644
index 458019992e..0000000000
--- a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/aspect4j/TestAspect.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2014, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.aspect4j;
-
-import jakarta.inject.Singleton;
-
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-
-@Aspect
-@Singleton
-public class TestAspect {
-
- private int interceptions = 0;
-
- @Before("execution(* org.glassfish.jersey.server.spring.aspect4j.*.*())")
- public void intercept(JoinPoint joinPoint) {
- interceptions++;
- }
-
- public int getInterceptions() {
- return interceptions;
- }
-
- public void reset() {
- interceptions = 0;
- }
-}
diff --git a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/fieldinjection/SpringFieldInjectionJerseyTestConfig.java b/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/fieldinjection/SpringFieldInjectionJerseyTestConfig.java
deleted file mode 100644
index 0eb367b5c3..0000000000
--- a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/fieldinjection/SpringFieldInjectionJerseyTestConfig.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2014, 2019 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.fieldinjection;
-
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.server.spring.scope.RequestContextFilter;
-
-public class SpringFieldInjectionJerseyTestConfig extends ResourceConfig {
- public SpringFieldInjectionJerseyTestConfig() {
- register(RequestContextFilter.class);
- register(SpringFieldInjectionTestResource.class);
- }
-}
diff --git a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/filter/FilterTest.java b/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/filter/FilterTest.java
deleted file mode 100644
index 3c33392daa..0000000000
--- a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/filter/FilterTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2014, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.filter;
-
-import jakarta.ws.rs.core.Application;
-
-import org.glassfish.jersey.server.spring.SpringTestConfiguration;
-import org.glassfish.jersey.test.JerseyTest;
-import org.junit.Test;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-
-import static org.junit.Assert.assertEquals;
-
-public class FilterTest extends JerseyTest {
-
- private ApplicationContext context;
-
- @Override
- protected Application configure() {
- context = new AnnotationConfigApplicationContext(SpringTestConfiguration.class);
- return new JerseyTestConfig()
- .property("contextConfig", context);
- }
-
- @Test
- public void testInjectionOfSingleBean() {
- target("test1").request().get(String.class);
- assertEquals(1, context.getBean(Counter.class).getCount());
- }
-
-}
diff --git a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/filter/JerseyTestConfig.java b/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/filter/JerseyTestConfig.java
deleted file mode 100644
index c8df018a81..0000000000
--- a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/filter/JerseyTestConfig.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2013, 2019 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.filter;
-
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.server.spring.scope.RequestContextFilter;
-
-public class JerseyTestConfig extends ResourceConfig {
-
- public JerseyTestConfig() {
- register(RequestContextFilter.class);
- register(TestResource.class);
- register(TestFilter.class);
- }
-}
diff --git a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/filter/TestResource.java b/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/filter/TestResource.java
deleted file mode 100644
index 7e624ef398..0000000000
--- a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/filter/TestResource.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2014, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.filter;
-
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-
-@Path("/")
-public class TestResource {
-
- @Path("test1")
- @GET
- public String test1() {
- return "Hello, Test!";
- }
-}
diff --git a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/parameterinjection/SpringParameterInjectionJerseyTestConfig.java b/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/parameterinjection/SpringParameterInjectionJerseyTestConfig.java
deleted file mode 100644
index 598618f6f9..0000000000
--- a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/parameterinjection/SpringParameterInjectionJerseyTestConfig.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2014, 2019 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.parameterinjection;
-
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.server.spring.scope.RequestContextFilter;
-
-public class SpringParameterInjectionJerseyTestConfig extends ResourceConfig {
- public SpringParameterInjectionJerseyTestConfig() {
- register(RequestContextFilter.class);
- register(SpringParameterInjectionTestResource.class);
- }
-}
diff --git a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/parameterinjection/SpringParameterInjectionTest.java b/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/parameterinjection/SpringParameterInjectionTest.java
deleted file mode 100644
index e6b720e470..0000000000
--- a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/parameterinjection/SpringParameterInjectionTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2014, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.parameterinjection;
-
-import org.glassfish.jersey.server.spring.SpringTestConfiguration;
-import org.glassfish.jersey.server.spring.fieldinjection.SpringFieldInjectionJerseyTestConfig;
-import org.glassfish.jersey.test.JerseyTest;
-import org.junit.Test;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-
-import jakarta.ws.rs.core.Application;
-
-import static org.junit.Assert.assertEquals;
-
-public class SpringParameterInjectionTest extends JerseyTest {
- @Override
- protected Application configure() {
- ApplicationContext context = new AnnotationConfigApplicationContext(SpringTestConfiguration.class);
- return new SpringParameterInjectionJerseyTestConfig()
- .property("contextConfig", context);
- }
-
- @Test
- public void testInjectionOfSingleBean() {
- String result = target("test1").request().get(String.class);
- assertEquals("test ok", result);
- }
-
- @Test
- public void testInjectionOfListOfBeans() {
- String result = target("test2").request().get(String.class);
- assertEquals("test ok", result);
- }
-
- @Test
- public void testInjectionOfSetOfBeans() {
- String result = target("test3").request().get(String.class);
- assertEquals("test ok", result);
- }
-}
diff --git a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/profiles/SpringProfilesTest.java b/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/profiles/SpringProfilesTest.java
deleted file mode 100644
index be0ac479ae..0000000000
--- a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/profiles/SpringProfilesTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2014, 2019 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.profiles;
-
-import org.junit.Test;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import static org.junit.Assert.assertEquals;
-
-public class SpringProfilesTest {
-
- @Test
- public void shouldGetDefaultBean() {
- System.setProperty("spring.profiles.active", "");
- AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
- "org.glassfish.jersey.server.spring.profiles");
- assertEquals("default", context.getBean(TestService.class).test());
- }
-
- @Test
- public void shouldGetDevProfileBean() {
- System.setProperty("spring.profiles.active", "dev");
- AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
- "org.glassfish.jersey.server.spring.profiles");
- assertEquals("dev", context.getBean(TestService.class).test());
- }
-}
diff --git a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/profiles/TestService.java b/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/profiles/TestService.java
deleted file mode 100644
index d5635b52d4..0000000000
--- a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/profiles/TestService.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2014, 2019 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.profiles;
-
-public interface TestService {
-
- String test();
-}
diff --git a/ext/spring5/src/test/resources/jersey-spring-aspect4j-applicationContext.xml b/ext/spring5/src/test/resources/jersey-spring-aspect4j-applicationContext.xml
deleted file mode 100644
index 7abafe382c..0000000000
--- a/ext/spring5/src/test/resources/jersey-spring-aspect4j-applicationContext.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ext/spring6/pom.xml b/ext/spring6/pom.xml
new file mode 100644
index 0000000000..c7817c6b71
--- /dev/null
+++ b/ext/spring6/pom.xml
@@ -0,0 +1,361 @@
+
+
+
+
+
+ 4.0.0
+
+
+ org.glassfish.jersey.ext
+ project
+ 3.1.0-SNAPSHOT
+
+
+ jersey-spring6
+ jersey-spring6
+
+ jar
+
+
+ Jersey extension module providing support for Spring 6 integration.
+
+
+
+ UTF-8
+ ${project.basedir}/target
+ ${project.basedir}/src/main/javaPre17
+ ${project.basedir}/target17
+ ${project.basedir}/src/main/java17
+
+
+
+
+ Spring Repository
+ spring-repository
+ https://repo.spring.io/milestone
+
+
+
+
+
+ org.glassfish.jersey.core
+ jersey-server
+ ${project.version}
+
+
+
+ org.glassfish.jersey.inject
+ jersey-hk2
+ ${project.version}
+
+
+
+ org.glassfish.jersey.containers
+ jersey-container-servlet-core
+ ${project.version}
+
+
+
+ org.glassfish.jersey.test-framework.providers
+ jersey-test-framework-provider-grizzly2
+ ${project.version}
+ test
+
+
+
+ commons-logging
+ commons-logging
+ 1.2
+ test
+
+
+
+ org.glassfish.hk2
+ hk2
+ ${hk2.version}
+
+
+
+ org.glassfish.hk2
+ spring-bridge
+ ${hk2.version}
+
+
+ jakarta.inject
+ jakarta.inject
+
+
+ org.glassfish.hk2
+ hk2-api
+
+
+ org.springframework
+ spring-context
+
+
+
+
+
+ org.springframework
+ spring-beans
+ ${spring6.version}
+ provided
+
+
+
+ org.springframework
+ spring-core
+ ${spring6.version}
+
+
+ commons-logging
+ commons-logging
+
+
+ provided
+
+
+
+ org.springframework
+ spring-context
+ ${spring6.version}
+
+
+ commons-logging
+ commons-logging
+
+
+ provided
+
+
+
+ org.springframework
+ spring-web
+ ${spring6.version}
+ provided
+
+
+
+ org.springframework
+ spring-aop
+ ${spring6.version}
+ provided
+
+
+
+ jakarta.servlet
+ jakarta.servlet-api
+ ${servlet5.version}
+ provided
+
+
+
+ org.glassfish.jersey.test-framework
+ jersey-test-framework-core
+ ${project.version}
+ test
+
+
+
+ org.aspectj
+ aspectjrt
+ 1.6.11
+ test
+
+
+ org.aspectj
+ aspectjweaver
+ 1.6.11
+ test
+
+
+
+
+
+
+
+ com.sun.istack
+ istack-commons-maven-plugin
+ true
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ true
+
+
+
+
+
+
+ SpringExclude
+
+ [1.8,17)
+
+
+ ${java.build.outputDirectory}
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
+
+ generate-sources
+
+ add-source
+
+
+
+ ${javaPre17.sourceDirectory}
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+
+ org/glassfish/jersey/server/spring/**/*.java
+
+
+
+
+
+
+
+ SpringInclude
+
+ [17,)
+
+
+ ${java17.build.outputDirectory}
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
+
+ generate-sources
+
+ add-source
+
+
+
+ ${java17.sourceDirectory}
+
+
+
+
+
+
+
+
+
+ copyJDK17FilesToMultiReleaseJar
+
+
+
+ target17/classes/org/glassfish/jersey/server/spring/SpringWebApplicationInitializer.class
+
+ [1.8,17)
+
+
+
+
+ org.apache.felix
+ maven-bundle-plugin
+ true
+ true
+
+
+ true
+
+
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+ true
+
+
+ copy-jdk17-classes
+ prepare-package
+
+ copy-resources
+
+
+ ${java.build.outputDirectory}/classes/META-INF/versions/17
+
+
+ ${java17.build.outputDirectory}/classes
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+
+
+ copy-jdk17-sources
+ package
+
+
+
+ sources-jar: ${sources-jar}
+
+
+
+
+
+
+ run
+
+
+
+
+
+
+
+
+ delayed-strategy-skip-test
+
+
+ org.glassfish.jersey.injection.manager.strategy
+ delayed
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ true
+
+
+
+
+
+
+
diff --git a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/package-info.java b/ext/spring6/src/main/java/org/glassfish/jersey/server/spring/package-info.java
similarity index 84%
rename from ext/spring4/src/main/java/org/glassfish/jersey/server/spring/package-info.java
rename to ext/spring6/src/main/java/org/glassfish/jersey/server/spring/package-info.java
index 0176470fce..229c054ed1 100644
--- a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/package-info.java
+++ b/ext/spring6/src/main/java/org/glassfish/jersey/server/spring/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
@@ -15,7 +15,7 @@
*/
/**
- * Jersey server-side Spring 4 integration classes.
- *
+ * Jersey server-side Spring 6 integration classes.
+ * @since 3.0.5
*/
package org.glassfish.jersey.server.spring;
diff --git a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/scope/package-info.java b/ext/spring6/src/main/java/org/glassfish/jersey/server/spring/scope/package-info.java
similarity index 83%
rename from ext/spring4/src/main/java/org/glassfish/jersey/server/spring/scope/package-info.java
rename to ext/spring6/src/main/java/org/glassfish/jersey/server/spring/scope/package-info.java
index e15b2c5022..d4e3c8e864 100644
--- a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/scope/package-info.java
+++ b/ext/spring6/src/main/java/org/glassfish/jersey/server/spring/scope/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
@@ -15,7 +15,7 @@
*/
/**
- * Jersey server-side Spring 4 integration injection scopes related classes.
- *
+ * Jersey server-side Spring 6 integration injection scopes related classes.
+ * @since 3.0.5
*/
package org.glassfish.jersey.server.spring.scope;
diff --git a/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/AutowiredInjectResolver.java b/ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/AutowiredInjectResolver.java
similarity index 98%
rename from ext/spring5/src/main/java/org/glassfish/jersey/server/spring/AutowiredInjectResolver.java
rename to ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/AutowiredInjectResolver.java
index 61fc9b17a0..aca66c9652 100644
--- a/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/AutowiredInjectResolver.java
+++ b/ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/AutowiredInjectResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
diff --git a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/SpringComponentProvider.java b/ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/SpringComponentProvider.java
similarity index 98%
rename from ext/spring4/src/main/java/org/glassfish/jersey/server/spring/SpringComponentProvider.java
rename to ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/SpringComponentProvider.java
index 07208f5dc7..358f488577 100644
--- a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/SpringComponentProvider.java
+++ b/ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/SpringComponentProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
@@ -43,7 +43,7 @@
/**
* Custom ComponentProvider class.
- * Responsible for 1) bootstrapping Jersey 2 Spring integration and
+ * Responsible for 1) bootstrapping Jersey 3 Spring integration and
* 2) making Jersey skip JAX-RS Spring component life-cycle management and leave it to us.
*
* @author Marko Asplund (marko.asplund at yahoo.com)
diff --git a/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/SpringLifecycleListener.java b/ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/SpringLifecycleListener.java
similarity index 93%
rename from ext/spring5/src/main/java/org/glassfish/jersey/server/spring/SpringLifecycleListener.java
rename to ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/SpringLifecycleListener.java
index 5a06926b94..b47ba09836 100644
--- a/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/SpringLifecycleListener.java
+++ b/ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/SpringLifecycleListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
@@ -27,7 +27,7 @@
import org.springframework.context.ConfigurableApplicationContext;
/**
- * JAX-RS Provider class for processing Jersey 2 Spring integration container life-cycle events.
+ * JAX-RS Provider class for processing Jersey 3 Spring integration container life-cycle events.
*
* @author Marko Asplund (marko.asplund at yahoo.com)
*/
diff --git a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/SpringWebApplicationInitializer.java b/ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/SpringWebApplicationInitializer.java
similarity index 96%
rename from ext/spring4/src/main/java/org/glassfish/jersey/server/spring/SpringWebApplicationInitializer.java
rename to ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/SpringWebApplicationInitializer.java
index b33a69d9a2..8e21bdade2 100644
--- a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/SpringWebApplicationInitializer.java
+++ b/ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/SpringWebApplicationInitializer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
diff --git a/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/scope/JaxrsRequestAttributes.java b/ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/scope/JaxrsRequestAttributes.java
similarity index 97%
rename from ext/spring5/src/main/java/org/glassfish/jersey/server/spring/scope/JaxrsRequestAttributes.java
rename to ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/scope/JaxrsRequestAttributes.java
index ec22efaeb6..35a9e261a1 100644
--- a/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/scope/JaxrsRequestAttributes.java
+++ b/ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/scope/JaxrsRequestAttributes.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
diff --git a/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/scope/JaxrsServletRequestAttributes.java b/ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/scope/JaxrsServletRequestAttributes.java
similarity index 96%
rename from ext/spring5/src/main/java/org/glassfish/jersey/server/spring/scope/JaxrsServletRequestAttributes.java
rename to ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/scope/JaxrsServletRequestAttributes.java
index c32ddbc22f..4c2d0c2792 100644
--- a/ext/spring5/src/main/java/org/glassfish/jersey/server/spring/scope/JaxrsServletRequestAttributes.java
+++ b/ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/scope/JaxrsServletRequestAttributes.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022 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
diff --git a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/scope/RequestContextFilter.java b/ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/scope/RequestContextFilter.java
similarity index 98%
rename from ext/spring4/src/main/java/org/glassfish/jersey/server/spring/scope/RequestContextFilter.java
rename to ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/scope/RequestContextFilter.java
index de87d7e91d..a489695202 100644
--- a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/scope/RequestContextFilter.java
+++ b/ext/spring6/src/main/java17/org/glassfish/jersey/server/spring/scope/RequestContextFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
diff --git a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/filter/TestFilter.java b/ext/spring6/src/main/javaPre17/org/glassfish/jersey/server/spring/AutowiredInjectResolver.java
similarity index 53%
rename from ext/spring5/src/test/java/org/glassfish/jersey/server/spring/filter/TestFilter.java
rename to ext/spring6/src/main/javaPre17/org/glassfish/jersey/server/spring/AutowiredInjectResolver.java
index 16cfd51e9b..747c6072b7 100644
--- a/ext/spring5/src/test/java/org/glassfish/jersey/server/spring/filter/TestFilter.java
+++ b/ext/spring6/src/main/javaPre17/org/glassfish/jersey/server/spring/AutowiredInjectResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
@@ -13,27 +13,32 @@
*
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
+package org.glassfish.jersey.server.spring;
-package org.glassfish.jersey.server.spring.filter;
-
-import java.io.IOException;
-import jakarta.inject.Inject;
import jakarta.inject.Singleton;
-import jakarta.ws.rs.container.ContainerRequestContext;
-import jakarta.ws.rs.container.ContainerRequestFilter;
-
-import org.springframework.stereotype.Component;
+import org.glassfish.jersey.internal.inject.Injectee;
+import org.glassfish.jersey.internal.inject.InjectionResolver;
-@Component
@Singleton
-public class TestFilter implements ContainerRequestFilter {
+public class AutowiredInjectResolver implements InjectionResolver {
- @Inject
- private Counter counter;
+ @Override
+ public Object resolve(Injectee injectee) {
+ return null;
+ }
@Override
- public void filter(final ContainerRequestContext requestContext) throws IOException {
- counter.inc();
+ public boolean isConstructorParameterIndicator() {
+ return false;
}
+ @Override
+ public boolean isMethodParameterIndicator() {
+ return false;
+ }
+
+ @Override
+ public Class getAnnotation() {
+ return null;
+ }
}
diff --git a/ext/spring6/src/main/javaPre17/org/glassfish/jersey/server/spring/SpringComponentProvider.java b/ext/spring6/src/main/javaPre17/org/glassfish/jersey/server/spring/SpringComponentProvider.java
new file mode 100644
index 0000000000..5f85ffb28a
--- /dev/null
+++ b/ext/spring6/src/main/javaPre17/org/glassfish/jersey/server/spring/SpringComponentProvider.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2013, 2022 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
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.jersey.server.spring;
+
+import org.glassfish.jersey.internal.inject.InjectionManager;
+import org.glassfish.jersey.internal.util.JdkVersion;
+import org.glassfish.jersey.server.spi.ComponentProvider;
+
+import java.util.Set;
+
+/**
+ * Custom ComponentProvider class.
+ * Responsible for 1) bootstrapping Jersey 3 Spring integration and
+ * 2) making Jersey skip JAX-RS Spring component life-cycle management and leave it to us.
+ *
+ * @author Marko Asplund (marko.asplund at yahoo.com)
+ */
+public class SpringComponentProvider implements ComponentProvider {
+
+ @Override
+ public void initialize(InjectionManager injectionManager) {
+ if (JdkVersion.getJdkVersion().getMajor() < 17) {
+ throw new IllegalStateException(LocalizationMessages.NOT_SUPPORTED());
+ }
+ }
+
+ @Override
+ public boolean bind(Class component, Set> providerContracts) {
+ return false;
+ }
+
+ @Override
+ public void done() {
+
+ }
+}
diff --git a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/SpringLifecycleListener.java b/ext/spring6/src/main/javaPre17/org/glassfish/jersey/server/spring/SpringLifecycleListener.java
similarity index 62%
rename from ext/spring4/src/main/java/org/glassfish/jersey/server/spring/SpringLifecycleListener.java
rename to ext/spring6/src/main/javaPre17/org/glassfish/jersey/server/spring/SpringLifecycleListener.java
index 5a06926b94..15dd493a92 100644
--- a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/SpringLifecycleListener.java
+++ b/ext/spring6/src/main/javaPre17/org/glassfish/jersey/server/spring/SpringLifecycleListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
@@ -17,41 +17,25 @@
package org.glassfish.jersey.server.spring;
import jakarta.ws.rs.ext.Provider;
-
-import jakarta.inject.Inject;
-
+import org.glassfish.jersey.internal.util.JdkVersion;
import org.glassfish.jersey.server.spi.Container;
import org.glassfish.jersey.server.spi.ContainerLifecycleListener;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ConfigurableApplicationContext;
-
-/**
- * JAX-RS Provider class for processing Jersey 2 Spring integration container life-cycle events.
- *
- * @author Marko Asplund (marko.asplund at yahoo.com)
- */
@Provider
public class SpringLifecycleListener implements ContainerLifecycleListener {
- @Inject
- private ApplicationContext ctx;
-
@Override
public void onStartup(Container container) {
+ if (JdkVersion.getJdkVersion().getMajor() < 17) {
+ throw new IllegalStateException(LocalizationMessages.NOT_SUPPORTED());
+ }
}
@Override
public void onReload(Container container) {
- if (ctx instanceof ConfigurableApplicationContext) {
- ((ConfigurableApplicationContext) ctx).refresh();
- }
}
@Override
public void onShutdown(Container container) {
- if (ctx instanceof ConfigurableApplicationContext) {
- ((ConfigurableApplicationContext) ctx).close();
- }
}
}
diff --git a/ext/spring6/src/main/javaPre17/org/glassfish/jersey/server/spring/scope/RequestContextFilter.java b/ext/spring6/src/main/javaPre17/org/glassfish/jersey/server/spring/scope/RequestContextFilter.java
new file mode 100644
index 0000000000..9a41f804f8
--- /dev/null
+++ b/ext/spring6/src/main/javaPre17/org/glassfish/jersey/server/spring/scope/RequestContextFilter.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2013, 2022 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
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.jersey.server.spring.scope;
+
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.container.PreMatching;
+import jakarta.ws.rs.ext.Provider;
+import org.glassfish.jersey.internal.util.JdkVersion;
+import org.glassfish.jersey.server.spring.LocalizationMessages;
+
+import java.io.IOException;
+
+/**
+ * Spring filter to provide a bridge between JAX-RS and Spring request attributes.
+ *
+ * @author Marko Asplund (marko.asplund at yahoo.com)
+ * @author Jakub Podlesak
+ * @author Marek Potociar
+ */
+@Provider
+@PreMatching
+public final class RequestContextFilter implements ContainerRequestFilter, ContainerResponseFilter {
+
+ @Override
+ public void filter(ContainerRequestContext requestContext) throws IOException {
+ if (JdkVersion.getJdkVersion().getMajor() < 17) {
+ throw new IllegalStateException(LocalizationMessages.NOT_SUPPORTED());
+ }
+ }
+
+ @Override
+ public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) throws IOException {
+ if (JdkVersion.getJdkVersion().getMajor() < 17) {
+ throw new IllegalStateException(LocalizationMessages.NOT_SUPPORTED());
+ }
+ }
+}
diff --git a/ext/spring4/src/main/resources/META-INF/services/org.glassfish.jersey.server.spi.ComponentProvider b/ext/spring6/src/main/resources/META-INF/services/org.glassfish.jersey.server.spi.ComponentProvider
similarity index 100%
rename from ext/spring4/src/main/resources/META-INF/services/org.glassfish.jersey.server.spi.ComponentProvider
rename to ext/spring6/src/main/resources/META-INF/services/org.glassfish.jersey.server.spi.ComponentProvider
diff --git a/ext/spring4/src/main/resources/jersey-spring-applicationContext.xml b/ext/spring6/src/main/resources/jersey-spring-applicationContext.xml
similarity index 95%
rename from ext/spring4/src/main/resources/jersey-spring-applicationContext.xml
rename to ext/spring6/src/main/resources/jersey-spring-applicationContext.xml
index 00e4dda7f6..b563fd32eb 100644
--- a/ext/spring4/src/main/resources/jersey-spring-applicationContext.xml
+++ b/ext/spring6/src/main/resources/jersey-spring-applicationContext.xml
@@ -1,7 +1,7 @@
4.0.2.Final
diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml
index 19aa781494..6406f8de65 100644
--- a/tests/integration/pom.xml
+++ b/tests/integration/pom.xml
@@ -58,8 +58,6 @@
jersey-4697
jersey-4722
microprofile
-
-
reactive-streams
@@ -206,6 +204,15 @@
tracing-support
+
+ spring6-jdk17
+
+ [17,)
+
+
+ spring6
+
+
diff --git a/tests/integration/spring4/pom.xml b/tests/integration/spring4/pom.xml
deleted file mode 100644
index 66764b8783..0000000000
--- a/tests/integration/spring4/pom.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-
-
-
-
-
- 4.0.0
-
-
- org.glassfish.jersey.tests.integration
- project
- 3.0.0-SNAPSHOT
-
-
- spring4
-
- war
- jersey-tests-integration-spring4
-
-
- Jersey tests for Spring 4 integration
-
-
-
-
-
- jakarta.servlet
- jakarta.servlet-api
- ${servlet4.version}
- provided
-
-
-
- jakarta.ws.rs
- jakarta.ws.rs-api
- compile
-
-
-
- org.glassfish.jersey.ext
- jersey-spring4
- ${project.version}
- compile
-
-
-
- org.glassfish.jersey.test-framework
- jersey-test-framework-core
- test
-
-
-
- org.glassfish.jersey.containers
- jersey-container-servlet
- runtime
-
-
-
- org.glassfish.jersey.test-framework.providers
- jersey-test-framework-provider-external
- test
-
-
-
- commons-logging
- commons-logging
- runtime
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
-
-
- org.eclipse.jetty
- jetty-maven-plugin
-
-
- /
- .*$
-
-
-
-
-
-
-
-
- delayed-strategy-skip-test
-
-
- org.glassfish.jersey.injection.manager.strategy
- delayed
-
-
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
-
- true
-
-
-
-
-
-
- jakartification_exclude_tests
-
- [1.8,)
-
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
-
- true
-
-
-
-
-
-
- ignore.on.jdk16
-
-
- [16,)
-
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
-
- true
-
-
-
-
-
-
-
diff --git a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/AccountJerseyResource.java b/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/AccountJerseyResource.java
deleted file mode 100644
index bd10b50320..0000000000
--- a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/AccountJerseyResource.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-import java.math.BigDecimal;
-
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.core.MediaType;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-import jakarta.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-
-/**
- * Jersey managed JAX-RS resource for testing jersey-spring.
- *
- * @author Marko Asplund (marko.asplund at yahoo.com)
- */
-@Path("/jersey/account")
-public class AccountJerseyResource {
-
- @Inject
- @Named("AccountService-singleton")
- private AccountService accountServiceInject;
-
- @Autowired
- @Qualifier("AccountService-singleton")
- private AccountService accountServiceAutowired;
-
- @Inject
- @Named("AccountService-request-1")
- private AccountService accountServiceRequest1;
-
- @Autowired
- @Qualifier("AccountService-request-1")
- private AccountService accountServiceRequest2;
-
- @Autowired
- @Qualifier("AccountService-prototype-1")
- private AccountService accountServicePrototype1;
-
- @Autowired
- @Qualifier("AccountService-prototype-1")
- private AccountService accountServicePrototype2;
-
- @Autowired
- private HttpServletRequest httpServletRequest;
-
- @Inject
- private HK2ServiceSingleton hk2Singleton;
-
- @Inject
- private HK2ServiceRequestScoped hk2RequestScoped;
-
- @Inject
- private HK2ServicePerLookup hk2PerLookup;
-
- private String message = "n/a";
-
- // resource methods for testing resource class scope
- @GET
- @Path("message")
- public String getMessage() {
- return message;
- }
-
- @PUT
- @Path("message")
- @Consumes(MediaType.TEXT_PLAIN)
- public String setMessage(final String message) {
- this.message = message;
- return message;
- }
-
- // JERSEY-2506 FIX VERIFICATION
- @GET
- @Path("server")
- public String verifyServletRequestInjection() {
- return "PASSED: " + httpServletRequest.getServerName();
- }
-
- @GET
- @Path("singleton/server")
- public String verifyServletRequestInjectionIntoSingleton() {
- return accountServiceInject.verifyServletRequestInjection();
- }
-
- @GET
- @Path("singleton/autowired/server")
- public String verifyServletRequestInjectionIntoAutowiredSingleton() {
- return accountServiceAutowired.verifyServletRequestInjection();
- }
-
- @GET
- @Path("request/server")
- public String verifyServletRequestInjectionIntoRequestScopedBean() {
- return accountServiceRequest1.verifyServletRequestInjection();
- }
-
- @GET
- @Path("prototype/server")
- public String verifyServletRequestInjectionIntoPrototypeScopedBean() {
- return accountServicePrototype1.verifyServletRequestInjection();
- }
-
- // resource methods for testing singleton scoped beans
- @GET
- @Path("singleton/inject/{accountId}")
- public BigDecimal getAccountBalanceSingletonInject(@PathParam("accountId") final String accountId) {
- return accountServiceInject.getAccountBalance(accountId);
- }
-
- @GET
- @Path("singleton/autowired/{accountId}")
- public BigDecimal getAccountBalanceSingletonAutowired(@PathParam("accountId") final String accountId) {
- return accountServiceAutowired.getAccountBalance(accountId);
- }
-
- @PUT
- @Path("singleton/{accountId}")
- @Consumes(MediaType.TEXT_PLAIN)
- public void setAccountBalanceSingleton(@PathParam("accountId") final String accountId, final String balance) {
- accountServiceInject.setAccountBalance(accountId, new BigDecimal(balance));
- }
-
- // resource methods for testing request scoped beans
- @PUT
- @Path("request/{accountId}")
- @Consumes(MediaType.TEXT_PLAIN)
- public BigDecimal setAccountBalanceRequest(@PathParam("accountId") final String accountId, final String balance) {
- accountServiceRequest1.setAccountBalance(accountId, new BigDecimal(balance));
- return accountServiceRequest2.getAccountBalance(accountId);
- }
-
- // resource methods for testing prototype scoped beans
- @PUT
- @Path("prototype/{accountId}")
- @Consumes(MediaType.TEXT_PLAIN)
- public BigDecimal setAccountBalancePrototype(@PathParam("accountId") final String accountId, final String balance) {
- accountServicePrototype1.setAccountBalance(accountId, new BigDecimal(balance));
- return accountServicePrototype2.getAccountBalance(accountId);
- }
-}
diff --git a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/AccountService.java b/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/AccountService.java
deleted file mode 100644
index 851e21501c..0000000000
--- a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/AccountService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2013, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-import java.math.BigDecimal;
-
-/**
- * Simple account service to testify injection into different scopes.
- *
- * @author Marko Asplund (marko.asplund at yahoo.com)
- */
-public interface AccountService {
-
- void setAccountBalance(String accountId, BigDecimal balance);
-
- BigDecimal getAccountBalance(String accountId);
-
- String verifyServletRequestInjection();
-}
diff --git a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/AccountServiceImpl.java b/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/AccountServiceImpl.java
deleted file mode 100644
index e79d9bdfb5..0000000000
--- a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/AccountServiceImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2013, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
-
-import jakarta.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * AccountService implementation.
- *
- * @author Marko Asplund (marko.asplund at yahoo.com)
- */
-public class AccountServiceImpl implements AccountService {
-
- private Map accounts = new HashMap<>();
- private BigDecimal defaultAccountBalance;
-
- // JERSEY-2506 FIX VERIFICATION
- @Autowired
- private HttpServletRequest httpServletRequest;
-
- @Override
- public void setAccountBalance(String accountId, BigDecimal balance) {
- accounts.put(accountId, balance);
- }
-
- @Override
- public BigDecimal getAccountBalance(String accountId) {
- BigDecimal balance = accounts.get(accountId);
- if (balance == null) {
- return defaultAccountBalance;
- }
- return balance;
- }
-
- public void setDefaultAccountBalance(String defaultAccountBalance) {
- this.defaultAccountBalance = new BigDecimal(defaultAccountBalance);
- }
-
- public String verifyServletRequestInjection() {
- return "PASSED: " + httpServletRequest.getServerName();
- }
-
-}
diff --git a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/AccountSpringResource.java b/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/AccountSpringResource.java
deleted file mode 100644
index 0e5d2cfb85..0000000000
--- a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/AccountSpringResource.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-import java.math.BigDecimal;
-
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.core.MediaType;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-import jakarta.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-/**
- * Spring managed JAX-RS resource for testing jersey-spring.
- *
- * @author Marko Asplund (marko.asplund at yahoo.com)
- */
-@Path("/spring/account")
-@Component
-public class AccountSpringResource {
-
- @Inject
- @Named("AccountService-singleton")
- private AccountService accountServiceInject;
-
- @Autowired
- @Qualifier("AccountService-singleton")
- private AccountService accountServiceAutowired;
-
- @Inject
- @Named("AccountService-request-1")
- private AccountService accountServiceRequest1;
-
- @Autowired
- @Qualifier("AccountService-request-1")
- private AccountService accountServiceRequest2;
-
- @Autowired
- @Qualifier("AccountService-prototype-1")
- private AccountService accountServicePrototype1;
-
- @Autowired
- @Qualifier("AccountService-prototype-1")
- private AccountService accountServicePrototype2;
-
- @Autowired
- private HttpServletRequest httpServletRequest;
-
- @Inject
- private HK2ServiceSingleton hk2Singleton;
-
- @Inject
- private HK2ServiceRequestScoped hk2RequestScoped;
-
- @Inject
- private HK2ServicePerLookup hk2PerLookup;
-
- private String message = "n/a";
-
- // resource methods for testing resource class scope
- @GET
- @Path("message")
- public String getMessage() {
- return message;
- }
-
- @PUT
- @Path("message")
- @Consumes(MediaType.TEXT_PLAIN)
- public String setMessage(String message) {
- this.message = message;
- return message;
- }
-
- // JERSEY-2506 FIX VERIFICATION
- @GET
- @Path("server")
- public String verifyServletRequestInjection() {
- return "PASSED: " + httpServletRequest.getServerName();
- }
-
- @GET
- @Path("singleton/server")
- public String verifyServletRequestInjectionIntoSingleton() {
- return accountServiceInject.verifyServletRequestInjection();
- }
-
- @GET
- @Path("singleton/autowired/server")
- public String verifyServletRequestInjectionIntoAutowiredSingleton() {
- return accountServiceAutowired.verifyServletRequestInjection();
- }
-
- @GET
- @Path("request/server")
- public String verifyServletRequestInjectionIntoRequestScopedBean() {
- return accountServiceRequest1.verifyServletRequestInjection();
- }
-
- @GET
- @Path("prototype/server")
- public String verifyServletRequestInjectionIntoPrototypeScopedBean() {
- return accountServicePrototype1.verifyServletRequestInjection();
- }
-
- // resource methods for testing singleton scoped beans
- @GET
- @Path("singleton/inject/{accountId}")
- public BigDecimal getAccountBalanceSingletonInject(@PathParam("accountId") String accountId) {
- return accountServiceInject.getAccountBalance(accountId);
- }
-
- @GET
- @Path("singleton/autowired/{accountId}")
- public BigDecimal getAccountBalanceSingletonAutowired(@PathParam("accountId") String accountId) {
- return accountServiceAutowired.getAccountBalance(accountId);
- }
-
- @PUT
- @Path("singleton/{accountId}")
- @Consumes(MediaType.TEXT_PLAIN)
- public void setAccountBalanceSingleton(@PathParam("accountId") String accountId, String balance) {
- accountServiceInject.setAccountBalance(accountId, new BigDecimal(balance));
- }
-
- // resource methods for testing request scoped beans
- @PUT
- @Path("request/{accountId}")
- @Consumes(MediaType.TEXT_PLAIN)
- public BigDecimal setAccountBalanceRequest(@PathParam("accountId") String accountId, String balance) {
- accountServiceRequest1.setAccountBalance(accountId, new BigDecimal(balance));
- return accountServiceRequest2.getAccountBalance(accountId);
- }
-
- // resource methods for testing prototype scoped beans
- @PUT
- @Path("prototype/{accountId}")
- @Consumes(MediaType.TEXT_PLAIN)
- public BigDecimal setAccountBalancePrototype(@PathParam("accountId") String accountId, String balance) {
- accountServicePrototype1.setAccountBalance(accountId, new BigDecimal(balance));
- return accountServicePrototype2.getAccountBalance(accountId);
- }
-
-}
diff --git a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/EndpointResource.java b/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/EndpointResource.java
deleted file mode 100644
index d61ef3b479..0000000000
--- a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/EndpointResource.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.core.MediaType;
-
-/**
- * @author Konrad Garus (konrad.garus at gmail.com)
- */
-@Endpoint
-@Path("/spring/endpoint")
-public class EndpointResource {
-
- private String message;
-
- @PUT
- @Path("message")
- @Consumes(MediaType.TEXT_PLAIN)
- public String setMessage(final String message) {
- this.message = message;
- return message;
- }
-
- @GET
- @Path("message")
- public String getMessage() {
- return message;
- }
-}
diff --git a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServicePerLookup.java b/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServicePerLookup.java
deleted file mode 100644
index ff689c6e4f..0000000000
--- a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServicePerLookup.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2013, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-/**
- * Type to be handled as HK2 per-lookup bean.
- *
- * @author Marko Asplund (marko.asplund at yahoo.com)
- */
-public class HK2ServicePerLookup {
-}
diff --git a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServiceRequestScoped.java b/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServiceRequestScoped.java
deleted file mode 100644
index da45aeafab..0000000000
--- a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServiceRequestScoped.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2013, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-/**
- * Type to be handled as HK2 request scoped bean.
- *
- * @author Marko Asplund (marko.asplund at yahoo.com)
- */
-public class HK2ServiceRequestScoped {
-}
diff --git a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/MyApplication.java b/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/MyApplication.java
deleted file mode 100644
index b0f82c7d52..0000000000
--- a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/MyApplication.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-import jakarta.ws.rs.core.Application;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-
-import org.glassfish.jersey.internal.inject.AbstractBinder;
-import org.glassfish.jersey.internal.inject.Binder;
-import org.glassfish.jersey.internal.inject.InjectionManager;
-import org.glassfish.jersey.internal.inject.PerLookup;
-import org.glassfish.jersey.process.internal.RequestScoped;
-
-/**
- * JAX-RS application class for configuring injectable services in HK2 registry for testing purposes.
- *
- * @author Marko Asplund (marko.asplund at yahoo.com)
- */
-public class MyApplication extends Application {
-
- @Inject
- public MyApplication(final InjectionManager injectionManager) {
- Binder binder = new AbstractBinder() {
- @Override
- protected void configure() {
- bindAsContract(HK2ServiceSingleton.class).in(Singleton.class);
- bindAsContract(HK2ServiceRequestScoped.class).in(RequestScoped.class);
- bindAsContract(HK2ServicePerLookup.class).in(PerLookup.class);
- }
- };
-
- injectionManager.register(binder);
- }
-}
diff --git a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/RepositoryResource.java b/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/RepositoryResource.java
deleted file mode 100644
index b815fe02f4..0000000000
--- a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/RepositoryResource.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.core.MediaType;
-
-import org.springframework.stereotype.Repository;
-
-/**
- * @author Konrad Garus (konrad.garus at gmail.com)
- */
-@Repository
-@Path("/spring/repository")
-public class RepositoryResource {
-
- private String message;
-
- @PUT
- @Path("message")
- @Consumes(MediaType.TEXT_PLAIN)
- public String setMessage(final String message) {
- this.message = message;
- return message;
- }
-
- @GET
- @Path("message")
- public String getMessage() {
- return message;
- }
-}
diff --git a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/ServiceResource.java b/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/ServiceResource.java
deleted file mode 100644
index d50e5a6cc4..0000000000
--- a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/ServiceResource.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.core.MediaType;
-
-import org.springframework.stereotype.Service;
-
-/**
- * @author Konrad Garus (konrad.garus at gmail.com)
- */
-@Service
-@Path("/spring/service")
-public class ServiceResource {
-
- private String message;
-
- @PUT
- @Path("message")
- @Consumes(MediaType.TEXT_PLAIN)
- public String setMessage(final String message) {
- this.message = message;
- return message;
- }
-
- @GET
- @Path("message")
- public String getMessage() {
- return message;
- }
-}
diff --git a/tests/integration/spring4/src/main/resources/applicationContext.xml b/tests/integration/spring4/src/main/resources/applicationContext.xml
deleted file mode 100644
index c7e421eaa3..0000000000
--- a/tests/integration/spring4/src/main/resources/applicationContext.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
-
-
-
-
- org.springframework.beans.factory.annotation.Autowired
- org.springframework.beans.factory.annotation.Value
-
-
-
-
-
-
-
-
- org.springframework.beans.factory.annotation.Qualifier
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/integration/spring4/src/test/java/org/glassfish/jersey/server/spring/test/SpringManagedEndpointITCase.java b/tests/integration/spring4/src/test/java/org/glassfish/jersey/server/spring/test/SpringManagedEndpointITCase.java
deleted file mode 100644
index 79ade92c60..0000000000
--- a/tests/integration/spring4/src/test/java/org/glassfish/jersey/server/spring/test/SpringManagedEndpointITCase.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-import jakarta.ws.rs.client.Entity;
-import jakarta.ws.rs.client.WebTarget;
-
-import org.glassfish.jersey.server.ResourceConfig;
-
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-/**
- * Tests for Spring managed JAX-RS resources with custom composite
- * annotation that derives from @Component.
- *
- * @author Konrad Garus (konrad.garus at gmail.com)
- */
-public class SpringManagedEndpointITCase extends ResourceTestBase {
-
- @Override
- protected ResourceConfig configure(final ResourceConfig rc) {
- return rc.register(EndpointResource.class);
- }
-
- @Override
- protected String getResourcePath() {
- return "/spring/endpoint";
- }
-
- @Test
- public void testResourceScope() {
- final WebTarget t = target(getResourceFullPath());
- final String message = "hello, world";
- final String echo = t.path("message").request().put(Entity.text(message), String.class);
- assertEquals(message, echo);
- final String msg = t.path("message").request().get(String.class);
- assertEquals(message, msg);
- }
-}
diff --git a/tests/integration/spring5/README.txt b/tests/integration/spring5/README.txt
deleted file mode 100644
index 9a105f7bac..0000000000
--- a/tests/integration/spring5/README.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-
-tests
-=====
-
-Tests are located in jersey-spring-test module.
-The module contains a test webapp and test code.
-The tests can be run in Jersey test container or an external container.
-
-- Running tests in Jersey test container
- mvn clean test
-
-- Running tests in an external container
- build the test app
- deploy to an external container
- configure container connection info in jersey-spring-test/pom.xml, if needed
- run tests in integration test mode:
- mvn -Pit verify
-
-- Running tests in embedded Jetty instance
- build the test app
- deploy to Jetty:
- mvn -Pjetty jetty:run
- run tests in integration test mode in another console session:
- mvn -Pit verify
-
-test class naming conventions
-- *ITTest.java: run in unit and IT test mode
-- *Test.java: run as unit tests
-- *IT.java: run as IT tests
-
diff --git a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/ControllerResource.java b/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/ControllerResource.java
deleted file mode 100644
index 39dd5aa41c..0000000000
--- a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/ControllerResource.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.core.MediaType;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * @author Konrad Garus (konrad.garus at gmail.com)
- */
-@Controller
-@Path("/spring/controller")
-public class ControllerResource {
-
- private String message;
-
- @PUT
- @Path("message")
- @Consumes(MediaType.TEXT_PLAIN)
- public String setMessage(final String message) {
- this.message = message;
- return message;
- }
-
- @GET
- @Path("message")
- public String getMessage() {
- return message;
- }
-}
diff --git a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/Endpoint.java b/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/Endpoint.java
deleted file mode 100644
index 80f5d8c1ae..0000000000
--- a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/Endpoint.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2013, 2019 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.stereotype.Component;
-
-/**
- * @author Konrad Garus (konrad.garus at gmail.com)
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-@Component
-public @interface Endpoint {
-
-}
diff --git a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServiceSingleton.java b/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServiceSingleton.java
deleted file mode 100644
index 424f1866e8..0000000000
--- a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServiceSingleton.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2013, 2019 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-/**
- * Type to be handled as HK2 singleton.
- *
- * @author Marko Asplund (marko.asplund at yahoo.com)
- */
-public class HK2ServiceSingleton {
-}
diff --git a/tests/integration/spring5/src/main/webapp/WEB-INF/web.xml b/tests/integration/spring5/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 4004dd3c3c..0000000000
--- a/tests/integration/spring5/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
- jersey-spring-test
-
-
-
-
-
- org.glassfish.jersey.server.spring.test.MyApplication
-
-
- org.glassfish.jersey.server.spring.test.MyApplication
- /*
-
-
-
-
-
diff --git a/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/AccountResourceITCase.java b/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/AccountResourceITCase.java
deleted file mode 100644
index 77f2984d6c..0000000000
--- a/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/AccountResourceITCase.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-import jakarta.ws.rs.core.Application;
-
-import org.glassfish.jersey.test.external.ExternalTestContainerFactory;
-import org.glassfish.jersey.test.spi.TestContainerException;
-import org.glassfish.jersey.test.spi.TestContainerFactory;
-import org.glassfish.jersey.test.JerseyTest;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class AccountResourceITCase extends JerseyTest {
-
- @Override
- protected Application configure() {
- return new Application();
- }
-
- @Override
- protected TestContainerFactory getTestContainerFactory() throws TestContainerException {
- return new ExternalTestContainerFactory();
- }
-
- @Test
- public void testGet() throws Exception {
- final String r = target().path("/jersey/account/message").request().get(String.class);
- assertEquals(r, "n/a");
- }
-}
diff --git a/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/AccountResourceTestBase.java b/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/AccountResourceTestBase.java
deleted file mode 100644
index 5cc9fc750f..0000000000
--- a/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/AccountResourceTestBase.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-import java.math.BigDecimal;
-
-import jakarta.ws.rs.client.Entity;
-import jakarta.ws.rs.client.WebTarget;
-import jakarta.ws.rs.core.MediaType;
-
-import org.junit.Test;
-import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-/**
- * Base class for JAX-RS resource tests.
- *
- * @author Marko Asplund (marko.asplund at yahoo.com)
- */
-public abstract class AccountResourceTestBase extends ResourceTestBase {
-
- // test singleton scoped Spring bean injection using @Inject + @Autowired
- @Test
- public void testSingletonScopedSpringService() {
- final BigDecimal newBalance = new BigDecimal(Math.random());
- final WebTarget t = target(getResourceFullPath());
-
- t.path("/singleton/xyz123").request().put(Entity.entity(newBalance.toString(), MediaType.TEXT_PLAIN_TYPE));
- final BigDecimal balance = t.path("/singleton/autowired/xyz123").request().get(BigDecimal.class);
- assertEquals(newBalance, balance);
- }
-
- @Test
- public void testRequestScopedSpringService() {
- final BigDecimal newBalance = new BigDecimal(Math.random());
- final WebTarget t = target(getResourceFullPath());
- final BigDecimal balance = t.path("request/abc456").request().put(Entity.text(newBalance), BigDecimal.class);
- assertEquals(newBalance, balance);
- }
-
- @Test
- public void testPrototypeScopedSpringService() {
- final BigDecimal newBalance = new BigDecimal(Math.random());
- final WebTarget t = target(getResourceFullPath());
- final BigDecimal balance = t.path("prototype/abc456").request().put(Entity.text(newBalance), BigDecimal.class);
- assertEquals(new BigDecimal("987.65"), balance);
- }
-
- @Test
- public void testServletInjection() {
- final WebTarget t = target(getResourceFullPath());
-
- String server = t.path("server").request().get(String.class);
- assertThat(server, startsWith("PASSED: "));
-
- server = t.path("singleton/server").request().get(String.class);
- assertThat(server, startsWith("PASSED: "));
-
- server = t.path("singleton/autowired/server").request().get(String.class);
- assertThat(server, startsWith("PASSED: "));
-
- server = t.path("request/server").request().get(String.class);
- assertThat(server, startsWith("PASSED: "));
-
- server = t.path("prototype/server").request().get(String.class);
- assertThat(server, startsWith("PASSED: "));
- }
-}
diff --git a/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/JerseyManagedITCase.java b/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/JerseyManagedITCase.java
deleted file mode 100644
index fa3d1a2ff4..0000000000
--- a/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/JerseyManagedITCase.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-import jakarta.ws.rs.client.Entity;
-import jakarta.ws.rs.client.WebTarget;
-
-import org.glassfish.jersey.server.ResourceConfig;
-
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-/**
- * Tests for Jersey managed JAX-RS resources.
- *
- * @author Marko Asplund (marko.asplund at yahoo.com)
- */
-public class JerseyManagedITCase extends AccountResourceTestBase {
-
- @Override
- protected ResourceConfig configure(final ResourceConfig rc) {
- return rc.register(AccountJerseyResource.class);
- }
-
- @Override
- protected String getResourcePath() {
- return "/jersey/account";
- }
-
- @Test
- public void testResourceScope() {
- final WebTarget t = target(getResourceFullPath());
- final String message = "hello, world";
- final String echo = t.path("message").request().put(Entity.text(message), String.class);
- assertEquals(message, echo);
- final String msg = t.path("message").request().get(String.class);
- assertEquals("n/a", msg);
- }
-
-}
diff --git a/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/ResourceTestBase.java b/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/ResourceTestBase.java
deleted file mode 100644
index 08c4902e43..0000000000
--- a/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/ResourceTestBase.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-import jakarta.ws.rs.core.Application;
-
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.server.spring.SpringLifecycleListener;
-import org.glassfish.jersey.server.spring.scope.RequestContextFilter;
-import org.glassfish.jersey.test.JerseyTest;
-import org.glassfish.jersey.test.TestProperties;
-import org.glassfish.jersey.test.external.ExternalTestContainerFactory;
-import org.glassfish.jersey.test.spi.TestContainerException;
-import org.glassfish.jersey.test.spi.TestContainerFactory;
-
-/**
- * Base class for JAX-RS resource tests.
- *
- * @author Marko Asplund (marko.asplund at yahoo.com)
- */
-public abstract class ResourceTestBase extends JerseyTest {
-
- private static final String TEST_WEBAPP_CONTEXT_PATH = "jersey.spring.test.contextPath";
- private static final String TEST_CONTAINER_FACTORY_EXTERNAL = "org.glassfish.jersey.test.external"
- + ".ExternalTestContainerFactory";
-
- @Override
- protected TestContainerFactory getTestContainerFactory() throws TestContainerException {
- return new ExternalTestContainerFactory();
- }
-
- @Override
- protected Application configure() {
- final ResourceConfig rc = new ResourceConfig()
- .register(SpringLifecycleListener.class)
- .register(RequestContextFilter.class);
- TestUtil.registerHK2Services(rc);
- rc.property("contextConfigLocation", "classpath:applicationContext.xml");
- return configure(rc);
- }
-
- protected abstract ResourceConfig configure(ResourceConfig rc);
-
- protected abstract String getResourcePath();
-
- protected String getResourceFullPath() {
- final String containerFactory = System.getProperty(TestProperties.CONTAINER_FACTORY);
- if (TEST_CONTAINER_FACTORY_EXTERNAL.equals(containerFactory)) {
- return System.getProperty(TEST_WEBAPP_CONTEXT_PATH) + getResourcePath();
- }
- return getResourcePath();
- }
-}
diff --git a/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/SpringManagedControllerITCase.java b/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/SpringManagedControllerITCase.java
deleted file mode 100644
index 9b24994681..0000000000
--- a/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/SpringManagedControllerITCase.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-import jakarta.ws.rs.client.Entity;
-import jakarta.ws.rs.client.WebTarget;
-
-import org.glassfish.jersey.server.ResourceConfig;
-
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-/**
- * Tests for Spring managed JAX-RS resources with @Controller archetype.
- *
- * @author Konrad Garus (konrad.garus at gmail.com)
- */
-public class SpringManagedControllerITCase extends ResourceTestBase {
-
- @Override
- protected ResourceConfig configure(final ResourceConfig rc) {
- return rc.register(ControllerResource.class);
- }
-
- @Override
- protected String getResourcePath() {
- return "/spring/controller";
- }
-
- @Test
- public void testResourceScope() {
- final WebTarget t = target(getResourceFullPath());
- final String message = "hello, world";
- final String echo = t.path("message").request().put(Entity.text(message), String.class);
- assertEquals(message, echo);
- final String msg = t.path("message").request().get(String.class);
- assertEquals(message, msg);
- }
-}
diff --git a/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/SpringManagedITCase.java b/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/SpringManagedITCase.java
deleted file mode 100644
index 2b351f09de..0000000000
--- a/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/SpringManagedITCase.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-import jakarta.ws.rs.client.Entity;
-import jakarta.ws.rs.client.WebTarget;
-
-import org.glassfish.jersey.server.ResourceConfig;
-
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-/**
- * Tests for Spring managed JAX-RS resources.
- *
- * @author Marko Asplund (marko.asplund at yahoo.com)
- */
-public class SpringManagedITCase extends AccountResourceTestBase {
-
- @Override
- protected ResourceConfig configure(final ResourceConfig rc) {
- return rc.register(AccountSpringResource.class);
- }
-
- @Override
- protected String getResourcePath() {
- return "/spring/account";
- }
-
- @Test
- public void testResourceScope() {
- final WebTarget t = target(getResourceFullPath());
- final String message = "hello, world";
- final String echo = t.path("message").request().put(Entity.text(message), String.class);
- assertEquals(message, echo);
- final String msg = t.path("message").request().get(String.class);
- assertEquals(message, msg);
- }
-
-}
diff --git a/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/SpringManagedRepositoryITCase.java b/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/SpringManagedRepositoryITCase.java
deleted file mode 100644
index 0bfcd04b4e..0000000000
--- a/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/SpringManagedRepositoryITCase.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-import jakarta.ws.rs.client.Entity;
-import jakarta.ws.rs.client.WebTarget;
-
-import org.glassfish.jersey.server.ResourceConfig;
-
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-/**
- * Tests for Spring managed JAX-RS resources with @Repository archetype.
- *
- * @author Konrad Garus (konrad.garus at gmail.com)
- */
-public class SpringManagedRepositoryITCase extends ResourceTestBase {
-
- @Override
- protected ResourceConfig configure(final ResourceConfig rc) {
- return rc.register(RepositoryResource.class);
- }
-
- @Override
- protected String getResourcePath() {
- return "/spring/repository";
- }
-
- @Test
- public void testResourceScope() {
- final WebTarget t = target(getResourceFullPath());
- final String message = "hello, world";
- final String echo = t.path("message").request().put(Entity.text(message), String.class);
- assertEquals(message, echo);
- final String msg = t.path("message").request().get(String.class);
- assertEquals(message, msg);
- }
-}
diff --git a/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/SpringManagedServiceITCase.java b/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/SpringManagedServiceITCase.java
deleted file mode 100644
index fd31b990b1..0000000000
--- a/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/SpringManagedServiceITCase.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-import jakarta.ws.rs.client.Entity;
-import jakarta.ws.rs.client.WebTarget;
-
-import org.glassfish.jersey.server.ResourceConfig;
-
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-/**
- * Tests for Spring managed JAX-RS resources with @Service archetype.
- *
- * @author Konrad Garus (konrad.garus at gmail.com)
- */
-public class SpringManagedServiceITCase extends ResourceTestBase {
-
- @Override
- protected ResourceConfig configure(final ResourceConfig rc) {
- return rc.register(ServiceResource.class);
- }
-
- @Override
- protected String getResourcePath() {
- return "/spring/service";
- }
-
- @Test
- public void testResourceScope() {
- final WebTarget t = target(getResourceFullPath());
- final String message = "hello, world";
- final String echo = t.path("message").request().put(Entity.text(message), String.class);
- assertEquals(message, echo);
- final String msg = t.path("message").request().get(String.class);
- assertEquals(message, msg);
- }
-}
diff --git a/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/TestUtil.java b/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/TestUtil.java
deleted file mode 100644
index 8c837c8ac5..0000000000
--- a/tests/integration/spring5/src/test/java/org/glassfish/jersey/server/spring/test/TestUtil.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.server.spring.test;
-
-import jakarta.inject.Singleton;
-
-import org.glassfish.jersey.internal.inject.PerLookup;
-import org.glassfish.jersey.process.internal.RequestScoped;
-import org.glassfish.jersey.server.ResourceConfig;
-
-import org.glassfish.hk2.utilities.BuilderHelper;
-import org.glassfish.hk2.utilities.binding.AbstractBinder;
-
-class TestUtil {
-
- public static ResourceConfig registerHK2Services(final ResourceConfig rc) {
- rc
- .register(new AbstractBinder() {
- @Override
- protected void configure() {
- bind(BuilderHelper.link(HK2ServiceSingleton.class).in(Singleton.class).build());
- }
- })
- .register(new AbstractBinder() {
- @Override
- protected void configure() {
- bind(BuilderHelper.link(HK2ServiceRequestScoped.class).in(RequestScoped.class).build());
- }
- })
- .register(new AbstractBinder() {
- @Override
- protected void configure() {
- bind(BuilderHelper.link(HK2ServicePerLookup.class).in(PerLookup.class).build());
- }
- });
- return rc;
- }
-}
diff --git a/tests/integration/spring4/README.txt b/tests/integration/spring6/README.txt
similarity index 100%
rename from tests/integration/spring4/README.txt
rename to tests/integration/spring6/README.txt
diff --git a/tests/integration/spring5/pom.xml b/tests/integration/spring6/pom.xml
similarity index 73%
rename from tests/integration/spring5/pom.xml
rename to tests/integration/spring6/pom.xml
index 7a0712027f..e7df36c1d9 100644
--- a/tests/integration/spring5/pom.xml
+++ b/tests/integration/spring6/pom.xml
@@ -25,24 +25,32 @@
org.glassfish.jersey.tests.integration
project
- 3.0.0-SNAPSHOT
+ 3.1.0-SNAPSHOT
- spring5
+ spring6
war
- jersey-tests-integration-spring5
+ jersey-tests-integration-spring6
- Jersey tests for Spring 5 integration
+ Jersey tests for Spring 6 integration
+
+
+ Spring Repository
+ spring-repository
+ https://repo.spring.io/milestone
+
+
+
jakarta.servlet
jakarta.servlet-api
- ${servlet4.version}
+ ${servlet5.version}
provided
@@ -54,11 +62,41 @@
org.glassfish.jersey.ext
- jersey-spring5
+ jersey-spring6
${project.version}
compile
+
+ org.springframework
+ spring-beans
+ ${spring6.version}
+
+
+
+ org.springframework
+ spring-core
+ ${spring6.version}
+
+
+
+ org.springframework
+ spring-context
+ ${spring6.version}
+
+
+
+ org.springframework
+ spring-web
+ ${spring6.version}
+
+
+
+ org.springframework
+ spring-aop
+ ${spring6.version}
+
+
org.glassfish.jersey.test-framework
jersey-test-framework-core
@@ -93,16 +131,11 @@
org.apache.maven.plugins
maven-failsafe-plugin
-
-
-
- **/**/*.java
-
-
org.eclipse.jetty
jetty-maven-plugin
+ 11.0.7
/
diff --git a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/AccountJerseyResource.java b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/AccountJerseyResource.java
similarity index 98%
rename from tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/AccountJerseyResource.java
rename to tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/AccountJerseyResource.java
index bd10b50320..ab54e71067 100644
--- a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/AccountJerseyResource.java
+++ b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/AccountJerseyResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
diff --git a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/AccountService.java b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/AccountService.java
similarity index 94%
rename from tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/AccountService.java
rename to tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/AccountService.java
index 70d90b05d5..2a764dcaa4 100644
--- a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/AccountService.java
+++ b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/AccountService.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
diff --git a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/AccountServiceImpl.java b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/AccountServiceImpl.java
similarity index 96%
rename from tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/AccountServiceImpl.java
rename to tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/AccountServiceImpl.java
index b7fb876d15..58919af734 100644
--- a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/AccountServiceImpl.java
+++ b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/AccountServiceImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
diff --git a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/AccountSpringResource.java b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/AccountSpringResource.java
similarity index 98%
rename from tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/AccountSpringResource.java
rename to tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/AccountSpringResource.java
index 0e5d2cfb85..e6e8e437e4 100644
--- a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/AccountSpringResource.java
+++ b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/AccountSpringResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
diff --git a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/ControllerResource.java b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/ControllerResource.java
similarity index 95%
rename from tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/ControllerResource.java
rename to tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/ControllerResource.java
index 39dd5aa41c..8cf0a7e6a3 100644
--- a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/ControllerResource.java
+++ b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/ControllerResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
diff --git a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/Endpoint.java b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/Endpoint.java
similarity index 94%
rename from tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/Endpoint.java
rename to tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/Endpoint.java
index da9f1707b7..53a9ef14e0 100644
--- a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/Endpoint.java
+++ b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/Endpoint.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
diff --git a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/EndpointResource.java b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/EndpointResource.java
similarity index 95%
rename from tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/EndpointResource.java
rename to tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/EndpointResource.java
index d61ef3b479..a1d8682e01 100644
--- a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/EndpointResource.java
+++ b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/EndpointResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
diff --git a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServicePerLookup.java b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServicePerLookup.java
similarity index 92%
rename from tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServicePerLookup.java
rename to tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServicePerLookup.java
index 4b6bbf57ae..0fb4f768a4 100644
--- a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServicePerLookup.java
+++ b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServicePerLookup.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
diff --git a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServiceRequestScoped.java b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServiceRequestScoped.java
similarity index 92%
rename from tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServiceRequestScoped.java
rename to tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServiceRequestScoped.java
index 3bde89d214..f55662ada9 100644
--- a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServiceRequestScoped.java
+++ b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServiceRequestScoped.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
diff --git a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServiceSingleton.java b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServiceSingleton.java
similarity index 92%
rename from tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServiceSingleton.java
rename to tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServiceSingleton.java
index a7b8fa8837..64ea0ba6d4 100644
--- a/tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServiceSingleton.java
+++ b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/HK2ServiceSingleton.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
diff --git a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/MyApplication.java b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/MyApplication.java
similarity index 96%
rename from tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/MyApplication.java
rename to tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/MyApplication.java
index b0f82c7d52..e0f0c99317 100644
--- a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/MyApplication.java
+++ b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/MyApplication.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
diff --git a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/RepositoryResource.java b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/RepositoryResource.java
similarity index 95%
rename from tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/RepositoryResource.java
rename to tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/RepositoryResource.java
index b815fe02f4..52a8b6444d 100644
--- a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/RepositoryResource.java
+++ b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/RepositoryResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
diff --git a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/ServiceResource.java b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/ServiceResource.java
similarity index 95%
rename from tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/ServiceResource.java
rename to tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/ServiceResource.java
index d50e5a6cc4..75cf5afc5e 100644
--- a/tests/integration/spring5/src/main/java/org/glassfish/jersey/server/spring/test/ServiceResource.java
+++ b/tests/integration/spring6/src/main/java/org/glassfish/jersey/server/spring/test/ServiceResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
diff --git a/tests/integration/spring5/src/main/resources/applicationContext.xml b/tests/integration/spring6/src/main/resources/applicationContext.xml
similarity index 98%
rename from tests/integration/spring5/src/main/resources/applicationContext.xml
rename to tests/integration/spring6/src/main/resources/applicationContext.xml
index c7e421eaa3..c36223ca48 100644
--- a/tests/integration/spring5/src/main/resources/applicationContext.xml
+++ b/tests/integration/spring6/src/main/resources/applicationContext.xml
@@ -1,7 +1,7 @@
From 43a9e18418388a8dad13e2bcf81e6fce0d45bc00 Mon Sep 17 00:00:00 2001
From: "Nuno M. Santos"
Date: Mon, 2 May 2022 11:58:08 +0100
Subject: [PATCH 034/305] Redact HTTP headers on LoggingFeature (#5025)
---
.../jersey/logging/ClientLoggingFilter.java | 3 +-
.../jersey/logging/LoggingFeature.java | 49 +++-
.../LoggingFeatureAutoDiscoverable.java | 14 +-
.../jersey/logging/LoggingInterceptor.java | 58 +++-
.../jersey/logging/ServerLoggingFilter.java | 3 +-
docs/src/main/docbook/appendix-properties.xml | 33 +++
docs/src/main/docbook/jersey.ent | 8 +
docs/src/main/docbook/logging.xml | 15 +-
.../tests/e2e/common/LoggingFeatureTest.java | 265 ++++++++++++++++++
9 files changed, 428 insertions(+), 20 deletions(-)
diff --git a/core-common/src/main/java/org/glassfish/jersey/logging/ClientLoggingFilter.java b/core-common/src/main/java/org/glassfish/jersey/logging/ClientLoggingFilter.java
index 07c3dbeca6..b250915db6 100644
--- a/core-common/src/main/java/org/glassfish/jersey/logging/ClientLoggingFilter.java
+++ b/core-common/src/main/java/org/glassfish/jersey/logging/ClientLoggingFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022 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
@@ -64,6 +64,7 @@ final class ClientLoggingFilter extends LoggingInterceptor implements ClientRequ
* logging filter will print (and buffer in memory) only the specified number of bytes
* and print "...more..." string at the end. Negative values are interpreted as zero.
* separator delimiter for particular log lines. Default is Linux new line delimiter
+ * redactHeaders a collection of HTTP headers to be redacted when logging.
*/
public ClientLoggingFilter(LoggingFeature.LoggingFeatureBuilder builder) {
super(builder);
diff --git a/core-common/src/main/java/org/glassfish/jersey/logging/LoggingFeature.java b/core-common/src/main/java/org/glassfish/jersey/logging/LoggingFeature.java
index f9b4d51a5d..214eaa2dfc 100644
--- a/core-common/src/main/java/org/glassfish/jersey/logging/LoggingFeature.java
+++ b/core-common/src/main/java/org/glassfish/jersey/logging/LoggingFeature.java
@@ -16,6 +16,8 @@
package org.glassfish.jersey.logging;
+import java.util.Arrays;
+import java.util.Collection;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -23,6 +25,7 @@
import javax.ws.rs.RuntimeType;
import javax.ws.rs.core.Feature;
import javax.ws.rs.core.FeatureContext;
+import javax.ws.rs.core.HttpHeaders;
import org.glassfish.jersey.CommonProperties;
@@ -41,6 +44,7 @@
* {@link #LOGGING_FEATURE_VERBOSITY}
* {@link #LOGGING_FEATURE_MAX_ENTITY_SIZE}
* {@link #LOGGING_FEATURE_SEPARATOR}
+ * {@link #LOGGING_FEATURE_REDACT_HEADERS}
*
*
* If any of the configuration value is not set, following default values are applied:
@@ -50,6 +54,7 @@
*
verbosity: {@link Verbosity#PAYLOAD_TEXT}
* maximum entity size: {@value #DEFAULT_MAX_ENTITY_SIZE}
* line separator: {@link #DEFAULT_SEPARATOR}
+ * redact headers: {@value #DEFAULT_REDACT_HEADERS}
*
*
* Server configurable properties:
@@ -59,6 +64,7 @@
*
{@link #LOGGING_FEATURE_VERBOSITY_SERVER}
* {@link #LOGGING_FEATURE_MAX_ENTITY_SIZE_SERVER}
* {@link #LOGGING_FEATURE_SEPARATOR_SERVER}
+ * {@link #LOGGING_FEATURE_REDACT_HEADERS_SERVER}
*
* Client configurable properties:
*
@@ -67,6 +73,7 @@
* - {@link #LOGGING_FEATURE_VERBOSITY_CLIENT}
* - {@link #LOGGING_FEATURE_MAX_ENTITY_SIZE_CLIENT}
* - {@link #LOGGING_FEATURE_SEPARATOR_CLIENT}
+ * - {@link #LOGGING_FEATURE_REDACT_HEADERS_CLIENT}
*
*
* @author Ondrej Kosatka
@@ -94,12 +101,17 @@ public class LoggingFeature implements Feature {
* Default separator for entity logging.
*/
public static final String DEFAULT_SEPARATOR = "\n";
+ /**
+ * Default headers to be redacted. If multiple, separate each header with a semicolon.
+ */
+ public static final String DEFAULT_REDACT_HEADERS = HttpHeaders.AUTHORIZATION;
private static final String LOGGER_NAME_POSTFIX = ".logger.name";
private static final String LOGGER_LEVEL_POSTFIX = ".logger.level";
private static final String VERBOSITY_POSTFIX = ".verbosity";
private static final String MAX_ENTITY_POSTFIX = ".entity.maxSize";
private static final String SEPARATOR_POSTFIX = ".separator";
+ private static final String REDACT_HEADERS_POSTFIX = ".headers.redact";
private static final String LOGGING_FEATURE_COMMON_PREFIX = "jersey.config.logging";
/**
* Common logger name property.
@@ -121,6 +133,10 @@ public class LoggingFeature implements Feature {
* Common property for configuring logging separator.
*/
public static final String LOGGING_FEATURE_SEPARATOR = LOGGING_FEATURE_COMMON_PREFIX + SEPARATOR_POSTFIX;
+ /**
+ * Common property for configuring headers to be redacted. The headers are semicolon-separated.
+ */
+ public static final String LOGGING_FEATURE_REDACT_HEADERS = LOGGING_FEATURE_COMMON_PREFIX + REDACT_HEADERS_POSTFIX;
private static final String LOGGING_FEATURE_SERVER_PREFIX = "jersey.config.server.logging";
/**
@@ -143,6 +159,11 @@ public class LoggingFeature implements Feature {
* Server property for configuring separator.
*/
public static final String LOGGING_FEATURE_SEPARATOR_SERVER = LOGGING_FEATURE_SERVER_PREFIX + SEPARATOR_POSTFIX;
+ /**
+ * Server property for configuring headers to be redacted. The headers are semicolon-separated.
+ */
+ public static final String LOGGING_FEATURE_REDACT_HEADERS_SERVER =
+ LOGGING_FEATURE_SERVER_PREFIX + REDACT_HEADERS_POSTFIX;
private static final String LOGGING_FEATURE_CLIENT_PREFIX = "jersey.config.client.logging";
/**
@@ -165,6 +186,11 @@ public class LoggingFeature implements Feature {
* Client property for logging separator.
*/
public static final String LOGGING_FEATURE_SEPARATOR_CLIENT = LOGGING_FEATURE_CLIENT_PREFIX + SEPARATOR_POSTFIX;
+ /**
+ * Client property for configuring headers to be redacted. The headers are semicolon-separated.
+ */
+ public static final String LOGGING_FEATURE_REDACT_HEADERS_CLIENT =
+ LOGGING_FEATURE_CLIENT_PREFIX + REDACT_HEADERS_POSTFIX;
private final LoggingFeatureBuilder builder;
@@ -269,7 +295,7 @@ private LoggingInterceptor createLoggingFilter(FeatureContext context, RuntimeTy
private static LoggingFeatureBuilder configureBuilderParameters(LoggingFeatureBuilder builder,
FeatureContext context, RuntimeType runtimeType) {
- final Map properties = context.getConfiguration().getProperties();
+ final Map properties = context.getConfiguration().getProperties();
//get values from properties (if any)
final String filterLoggerName = CommonProperties.getValue(
properties,
@@ -283,14 +309,14 @@ private static LoggingFeatureBuilder configureBuilderParameters(LoggingFeatureBu
properties,
runtimeType == RuntimeType.SERVER ? LOGGING_FEATURE_LOGGER_LEVEL_SERVER : LOGGING_FEATURE_LOGGER_LEVEL_CLIENT,
CommonProperties.getValue(
- context.getConfiguration().getProperties(),
+ properties,
LOGGING_FEATURE_LOGGER_LEVEL,
DEFAULT_LOGGER_LEVEL));
final String filterSeparator = CommonProperties.getValue(
properties,
runtimeType == RuntimeType.SERVER ? LOGGING_FEATURE_SEPARATOR_SERVER : LOGGING_FEATURE_SEPARATOR_CLIENT,
CommonProperties.getValue(
- context.getConfiguration().getProperties(),
+ properties,
LOGGING_FEATURE_SEPARATOR,
DEFAULT_SEPARATOR));
final Verbosity filterVerbosity = CommonProperties.getValue(
@@ -310,6 +336,14 @@ private static LoggingFeatureBuilder configureBuilderParameters(LoggingFeatureBu
LOGGING_FEATURE_MAX_ENTITY_SIZE,
DEFAULT_MAX_ENTITY_SIZE
));
+ final String redactHeaders = CommonProperties.getValue(
+ properties,
+ runtimeType == RuntimeType.SERVER
+ ? LOGGING_FEATURE_REDACT_HEADERS_SERVER : LOGGING_FEATURE_REDACT_HEADERS_CLIENT,
+ CommonProperties.getValue(
+ properties,
+ LOGGING_FEATURE_REDACT_HEADERS,
+ DEFAULT_REDACT_HEADERS));
final Level loggerLevel = Level.parse(filterLevel);
@@ -319,6 +353,8 @@ private static LoggingFeatureBuilder configureBuilderParameters(LoggingFeatureBu
builder.maxEntitySize = builder.maxEntitySize == null ? filterMaxEntitySize : builder.maxEntitySize;
builder.level = builder.level == null ? loggerLevel : builder.level;
builder.separator = builder.separator == null ? filterSeparator : builder.separator;
+ builder.redactHeaders = builder.redactHeaders == null
+ ? Arrays.asList(redactHeaders.split(";")) : builder.redactHeaders;
return builder;
}
@@ -376,6 +412,7 @@ public static class LoggingFeatureBuilder {
Integer maxEntitySize;
Level level;
String separator;
+ Collection redactHeaders;
public LoggingFeatureBuilder() {
@@ -400,9 +437,13 @@ public LoggingFeatureBuilder separator(String separator) {
this.separator = separator;
return this;
}
+ public LoggingFeatureBuilder redactHeaders(Collection redactHeaders) {
+ this.redactHeaders = redactHeaders;
+ return this;
+ }
public LoggingFeature build() {
return new LoggingFeature(this);
}
}
-}
\ No newline at end of file
+}
diff --git a/core-common/src/main/java/org/glassfish/jersey/logging/LoggingFeatureAutoDiscoverable.java b/core-common/src/main/java/org/glassfish/jersey/logging/LoggingFeatureAutoDiscoverable.java
index 01e61a5e9d..84ca349bbd 100644
--- a/core-common/src/main/java/org/glassfish/jersey/logging/LoggingFeatureAutoDiscoverable.java
+++ b/core-common/src/main/java/org/glassfish/jersey/logging/LoggingFeatureAutoDiscoverable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022 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
@@ -34,6 +34,9 @@
import static org.glassfish.jersey.logging.LoggingFeature.LOGGING_FEATURE_MAX_ENTITY_SIZE;
import static org.glassfish.jersey.logging.LoggingFeature.LOGGING_FEATURE_MAX_ENTITY_SIZE_CLIENT;
import static org.glassfish.jersey.logging.LoggingFeature.LOGGING_FEATURE_MAX_ENTITY_SIZE_SERVER;
+import static org.glassfish.jersey.logging.LoggingFeature.LOGGING_FEATURE_REDACT_HEADERS;
+import static org.glassfish.jersey.logging.LoggingFeature.LOGGING_FEATURE_REDACT_HEADERS_CLIENT;
+import static org.glassfish.jersey.logging.LoggingFeature.LOGGING_FEATURE_REDACT_HEADERS_SERVER;
import static org.glassfish.jersey.logging.LoggingFeature.LOGGING_FEATURE_SEPARATOR;
import static org.glassfish.jersey.logging.LoggingFeature.LOGGING_FEATURE_SEPARATOR_CLIENT;
import static org.glassfish.jersey.logging.LoggingFeature.LOGGING_FEATURE_SEPARATOR_SERVER;
@@ -75,7 +78,8 @@ private boolean commonPropertyConfigured(Map properties) {
|| properties.containsKey(LOGGING_FEATURE_LOGGER_LEVEL)
|| properties.containsKey(LOGGING_FEATURE_VERBOSITY)
|| properties.containsKey(LOGGING_FEATURE_MAX_ENTITY_SIZE)
- || properties.containsKey(LOGGING_FEATURE_SEPARATOR);
+ || properties.containsKey(LOGGING_FEATURE_SEPARATOR)
+ || properties.containsKey(LOGGING_FEATURE_REDACT_HEADERS);
}
private boolean clientConfigured(Map properties) {
@@ -83,7 +87,8 @@ private boolean clientConfigured(Map properties) {
|| properties.containsKey(LOGGING_FEATURE_LOGGER_LEVEL_CLIENT)
|| properties.containsKey(LOGGING_FEATURE_VERBOSITY_CLIENT)
|| properties.containsKey(LOGGING_FEATURE_MAX_ENTITY_SIZE_CLIENT)
- || properties.containsKey(LOGGING_FEATURE_SEPARATOR_CLIENT);
+ || properties.containsKey(LOGGING_FEATURE_SEPARATOR_CLIENT)
+ || properties.containsKey(LOGGING_FEATURE_REDACT_HEADERS_CLIENT);
}
private boolean serverConfigured(Map properties) {
@@ -91,6 +96,7 @@ private boolean serverConfigured(Map properties) {
|| properties.containsKey(LOGGING_FEATURE_LOGGER_LEVEL_SERVER)
|| properties.containsKey(LOGGING_FEATURE_VERBOSITY_SERVER)
|| properties.containsKey(LOGGING_FEATURE_MAX_ENTITY_SIZE_SERVER)
- || properties.containsKey(LOGGING_FEATURE_SEPARATOR_SERVER);
+ || properties.containsKey(LOGGING_FEATURE_SEPARATOR_SERVER)
+ || properties.containsKey(LOGGING_FEATURE_REDACT_HEADERS_SERVER);
}
}
diff --git a/core-common/src/main/java/org/glassfish/jersey/logging/LoggingInterceptor.java b/core-common/src/main/java/org/glassfish/jersey/logging/LoggingInterceptor.java
index fd1791b7d8..ec152508c9 100644
--- a/core-common/src/main/java/org/glassfish/jersey/logging/LoggingInterceptor.java
+++ b/core-common/src/main/java/org/glassfish/jersey/logging/LoggingInterceptor.java
@@ -24,15 +24,21 @@
import java.io.OutputStream;
import java.net.URI;
import java.nio.charset.Charset;
+import java.util.Collection;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.BiConsumer;
+import java.util.function.Predicate;
import java.util.logging.Level;
import java.util.logging.Logger;
+import java.util.stream.Collectors;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
@@ -40,6 +46,7 @@
import javax.ws.rs.ext.WriterInterceptor;
import javax.ws.rs.ext.WriterInterceptorContext;
+import org.glassfish.jersey.internal.guava.Predicates;
import org.glassfish.jersey.logging.LoggingFeature.Verbosity;
import org.glassfish.jersey.message.MessageUtils;
@@ -104,6 +111,7 @@ public int compare(final Map.Entry> o1, final Map.Entry redactHeaderPredicate;
/**
* Creates a logging filter using builder instance with custom logger and entity logging turned on,
@@ -117,6 +125,7 @@ public int compare(final Map.Entry> o1, final Map.Entry> o1, final Map.Entry false;
}
/**
@@ -169,20 +181,28 @@ void printPrefixedHeaders(final StringBuilder b,
final List val = headerEntry.getValue();
final String header = headerEntry.getKey();
- if (val.size() == 1) {
- prefixId(b, id).append(prefix).append(header).append(": ").append(val.get(0)).append(separator);
- } else {
- final StringBuilder sb = new StringBuilder();
+ prefixId(b, id).append(prefix).append(header).append(": ");
+ getValuesAppender(header, val).accept(b, val);
+ b.append(separator);
+ }
+ }
+
+ private BiConsumer> getValuesAppender(String header, List values) {
+ if (redactHeaderPredicate.test(header)) {
+ return (b, v) -> b.append("[redacted]");
+ } else if (values.size() == 1) {
+ return (b, v) -> b.append(v.get(0));
+ } else {
+ return (b, v) -> {
boolean add = false;
- for (final Object s : val) {
+ for (final Object s : v) {
if (add) {
- sb.append(',');
+ b.append(',');
}
add = true;
- sb.append(s);
+ b.append(s);
}
- prefixId(b, id).append(prefix).append(header).append(": ").append(sb.toString()).append(separator);
- }
+ };
}
}
@@ -312,4 +332,24 @@ public void write(byte[] ba, int off, int len) throws IOException {
}
}
+ private static final class RedactHeaderPredicate implements Predicate {
+ private final Set headersToRedact;
+
+ RedactHeaderPredicate(Collection headersToRedact) {
+ this.headersToRedact = headersToRedact.stream()
+ .filter(Objects::nonNull)
+ .filter(Predicates.not(String::isEmpty))
+ .map(RedactHeaderPredicate::normalize)
+ .collect(Collectors.toSet());
+ }
+
+ @Override
+ public boolean test(String header) {
+ return headersToRedact.contains(normalize(header));
+ }
+
+ private static String normalize(String input) {
+ return input.trim().toLowerCase(Locale.ROOT);
+ }
+ }
}
diff --git a/core-common/src/main/java/org/glassfish/jersey/logging/ServerLoggingFilter.java b/core-common/src/main/java/org/glassfish/jersey/logging/ServerLoggingFilter.java
index b1c2c7b393..87cac240c1 100644
--- a/core-common/src/main/java/org/glassfish/jersey/logging/ServerLoggingFilter.java
+++ b/core-common/src/main/java/org/glassfish/jersey/logging/ServerLoggingFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022 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
@@ -64,6 +64,7 @@ final class ServerLoggingFilter extends LoggingInterceptor implements ContainerR
* logging filter will print (and buffer in memory) only the specified number of bytes
* and print "...more..." string at the end. Negative values are interpreted as zero.
* separator delimiter for particular log lines. Default is Linux new line delimiter
+ * redactHeaders a collection of HTTP headers to be redacted when logging.
*/
public ServerLoggingFilter(final LoggingFeature.LoggingFeatureBuilder builder) {
super(builder);
diff --git a/docs/src/main/docbook/appendix-properties.xml b/docs/src/main/docbook/appendix-properties.xml
index b957da7398..2dd099d228 100644
--- a/docs/src/main/docbook/appendix-properties.xml
+++ b/docs/src/main/docbook/appendix-properties.xml
@@ -206,6 +206,17 @@
See logging chapter for more information.
+
+ &jersey.logging.LoggingFeature.LOGGING_FEATURE_REDACT_HEADERS;
+
+
+ jersey.config.logging.headers.redact
+
+
+ The HTTP headers (semicolon separated) to be redacted when logging.
+ See logging chapter for more information.
+
+
@@ -669,6 +680,17 @@
See logging chapter for more information.
+
+ &jersey.logging.LoggingFeature.LOGGING_FEATURE_REDACT_HEADERS_SERVER;
+
+
+ jersey.config.server.logging.headers.redact
+
+
+ The HTTP headers (semicolon separated) to be redacted when logging.
+ See logging chapter for more information.
+
+
@@ -1053,6 +1075,17 @@
See logging chapter for more information.
+
+ &jersey.logging.LoggingFeature.LOGGING_FEATURE_REDACT_HEADERS_CLIENT;
+
+
+ jersey.config.client.logging.headers.redact
+
+
+ The HTTP headers (semicolon separated) to be redacted when logging.
+ See logging chapter for more information.
+
+
diff --git a/docs/src/main/docbook/jersey.ent b/docs/src/main/docbook/jersey.ent
index cbe231e8a6..88d5f4f471 100644
--- a/docs/src/main/docbook/jersey.ent
+++ b/docs/src/main/docbook/jersey.ent
@@ -475,21 +475,25 @@
LoggingFeature.DEFAULT_LOGGER_LEVEL">
LoggingFeature.DEFAULT_VERBOSITY">
LoggingFeature.DEFAULT_MAX_ENTITY_SIZE">
+LoggingFeature.DEFAULT_REDACT_HEADERS">
LoggingFeature.LOGGING_FEATURE_LOGGER_NAME">
LoggingFeature.LOGGING_FEATURE_LOGGER_LEVEL">
LoggingFeature.LOGGING_FEATURE_VERBOSITY">
LoggingFeature.LOGGING_FEATURE_MAX_ENTITY_SIZE">
LoggingFeature.LOGGING_FEATURE_SEPARATOR">
+LoggingFeature.LOGGING_FEATURE_REDACT_HEADERS">
LoggingFeature.LOGGING_FEATURE_LOGGER_NAME_CLIENT">
LoggingFeature.LOGGING_FEATURE_LOGGER_LEVEL_CLIENT">
LoggingFeature.LOGGING_FEATURE_VERBOSITY_CLIENT">
LoggingFeature.LOGGING_FEATURE_MAX_ENTITY_SIZE_CLIENT">
LoggingFeature.LOGGING_FEATURE_SEPARATOR_CLIENT">
+LoggingFeature.LOGGING_FEATURE_REDACT_HEADERS_CLIENT">
LoggingFeature.LOGGING_FEATURE_LOGGER_NAME_SERVER">
LoggingFeature.LOGGING_FEATURE_LOGGER_LEVEL_SERVER">
LoggingFeature.LOGGING_FEATURE_VERBOSITY_SERVER">
LoggingFeature.LOGGING_FEATURE_MAX_ENTITY_SIZE_SERVER">
LoggingFeature.LOGGING_FEATURE_SEPARATOR_SERVER">
+LoggingFeature.LOGGING_FEATURE_REDACT_HEADERS_SERVER">
LoggingFeature.Verbosity">
LoggingFeature.Verbosity.HEADERS_ONLY">
LoggingFeature.Verbosity.PAYLOAD_ANY">
@@ -963,21 +967,25 @@
LoggingFeature.DEFAULT_LOGGER_LEVEL">
LoggingFeature.DEFAULT_VERBOSITY">
LoggingFeature.DEFAULT_MAX_ENTITY_SIZE">
+LoggingFeature.DEFAULT_REDACT_HEADERS">
LoggingFeature.LOGGING_FEATURE_LOGGER_NAME">
LoggingFeature.LOGGING_FEATURE_LOGGER_LEVEL">
LoggingFeature.LOGGING_FEATURE_VERBOSITY">
LoggingFeature.LOGGING_FEATURE_MAX_ENTITY_SIZE">
LoggingFeature.LOGGING_FEATURE_SEPARATOR">
+LoggingFeature.LOGGING_FEATURE_REDACT_HEADERS">
LoggingFeature.LOGGING_FEATURE_LOGGER_NAME_CLIENT">
LoggingFeature.LOGGING_FEATURE_LOGGER_LEVEL_CLIENT">
LoggingFeature.LOGGING_FEATURE_VERBOSITY_CLIENT">
LoggingFeature.LOGGING_FEATURE_MAX_ENTITY_SIZE_CLIENT">
LoggingFeature.LOGGING_FEATURE_SEPARATOR_CLIENT">
+LoggingFeature.LOGGING_FEATURE_REDACT_HEADERS_CLIENT">
LoggingFeature.LOGGING_FEATURE_LOGGER_NAME_SERVER">
LoggingFeature.LOGGING_FEATURE_LOGGER_LEVEL_SERVER">
LoggingFeature.LOGGING_FEATURE_VERBOSITY_SERVER">
LoggingFeature.LOGGING_FEATURE_MAX_ENTITY_SIZE_SERVER">
LoggingFeature.LOGGING_FEATURE_SEPARATOR_SERVER">
+LoggingFeature.LOGGING_FEATURE_REDACT_HEADERS_SERVER">
LoggingFeature.Verbosity">
LoggingFeature.Verbosity.HEADERS_ONLY">
LoggingFeature.Verbosity.PAYLOAD_ANY">
diff --git a/docs/src/main/docbook/logging.xml b/docs/src/main/docbook/logging.xml
index b3bf59e8c8..9849f6ca5a 100644
--- a/docs/src/main/docbook/logging.xml
+++ b/docs/src/main/docbook/logging.xml
@@ -1,7 +1,7 @@
From f308afa285249ec603e6022184dd98dacce5dcb9 Mon Sep 17 00:00:00 2001
From: jansupol <15908245+jansupol@users.noreply.github.com>
Date: Fri, 13 May 2022 06:44:53 +0200
Subject: [PATCH 039/305] Rename Java Connector to JavaNetHttp Connector
(#5066)
Signed-off-by: jansupol
---
bom/pom.xml | 2 +-
bundles/apidocs/pom.xml | 5 ++
.../java/connector/JavaClientProperties.java | 51 ---------------
.../{java-connector => jnh-connector}/pom.xml | 8 +--
.../JavaNetHttpClientProperties.java | 63 +++++++++++++++++++
.../jnh/connector/JavaNetHttpConnector.java} | 20 +++---
.../JavaNetHttpConnectorProvider.java} | 22 +++----
.../jersey/jnh}/connector/package-info.java | 4 +-
.../jnh}/connector/localization.properties | 2 +-
.../connector/AbstractJavaConnectorTest.java | 8 +--
.../jersey/jnh}/connector/AsyncTest.java | 4 +-
.../jnh}/connector/BodyPublisherTest.java | 4 +-
.../jnh}/connector/OptionsMethodTest.java | 4 +-
.../jersey/jnh}/connector/RedirectTest.java | 4 +-
...veHttpClientFromConnectorProviderTest.java | 14 ++---
connectors/pom.xml | 2 +-
docs/src/main/docbook/appendix-properties.xml | 51 +++++++++++++++
docs/src/main/docbook/client.xml | 5 ++
docs/src/main/docbook/jersey.ent | 5 ++
tests/e2e-client/pom.xml | 5 ++
.../e2e/client/connector/HttpPatchTest.java | 2 +
.../RequestHeaderModificationsTest.java | 5 +-
.../ssl/AbstractConnectorServerTest.java | 4 +-
.../ssl/SslConnectorHostnameVerifierTest.java | 11 +++-
.../Expect100ContinueTest.java | 4 +-
25 files changed, 202 insertions(+), 107 deletions(-)
delete mode 100644 connectors/java-connector/src/main/java/org/glassfish/jersey/java/connector/JavaClientProperties.java
rename connectors/{java-connector => jnh-connector}/pom.xml (90%)
create mode 100644 connectors/jnh-connector/src/main/java/org/glassfish/jersey/jnh/connector/JavaNetHttpClientProperties.java
rename connectors/{java-connector/src/main/java/org/glassfish/jersey/java/connector/JavaConnector.java => jnh-connector/src/main/java/org/glassfish/jersey/jnh/connector/JavaNetHttpConnector.java} (92%)
rename connectors/{java-connector/src/main/java/org/glassfish/jersey/java/connector/JavaConnectorProvider.java => jnh-connector/src/main/java/org/glassfish/jersey/jnh/connector/JavaNetHttpConnectorProvider.java} (79%)
rename connectors/{java-connector/src/main/java/org/glassfish/jersey/java => jnh-connector/src/main/java/org/glassfish/jersey/jnh}/connector/package-info.java (86%)
rename connectors/{java-connector/src/main/resources/org/glassfish/jersey/java => jnh-connector/src/main/resources/org/glassfish/jersey/jnh}/connector/localization.properties (92%)
rename connectors/{java-connector/src/test/java/org/glassfish/jersey/java => jnh-connector/src/test/java/org/glassfish/jersey/jnh}/connector/AbstractJavaConnectorTest.java (93%)
rename connectors/{java-connector/src/test/java/org/glassfish/jersey/java => jnh-connector/src/test/java/org/glassfish/jersey/jnh}/connector/AsyncTest.java (96%)
rename connectors/{java-connector/src/test/java/org/glassfish/jersey/java => jnh-connector/src/test/java/org/glassfish/jersey/jnh}/connector/BodyPublisherTest.java (94%)
rename connectors/{java-connector/src/test/java/org/glassfish/jersey/java => jnh-connector/src/test/java/org/glassfish/jersey/jnh}/connector/OptionsMethodTest.java (90%)
rename connectors/{java-connector/src/test/java/org/glassfish/jersey/java => jnh-connector/src/test/java/org/glassfish/jersey/jnh}/connector/RedirectTest.java (92%)
rename connectors/{java-connector/src/test/java/org/glassfish/jersey/java => jnh-connector/src/test/java/org/glassfish/jersey/jnh}/connector/RetrieveHttpClientFromConnectorProviderTest.java (68%)
diff --git a/bom/pom.xml b/bom/pom.xml
index 32bf17d055..8584f5132d 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -80,7 +80,7 @@
org.glassfish.jersey.connectors
- jersey-java-connector
+ jersey-jnh-connector
${project.version}
diff --git a/bundles/apidocs/pom.xml b/bundles/apidocs/pom.xml
index 7e3c65c302..bd175fb442 100644
--- a/bundles/apidocs/pom.xml
+++ b/bundles/apidocs/pom.xml
@@ -73,6 +73,11 @@
jersey-helidon-connector
${project.version}
+
+ org.glassfish.jersey.connectors
+ jersey-jnh-connector
+ ${project.version}
+
org.glassfish.jersey.connectors
jersey-jdk-connector
diff --git a/connectors/java-connector/src/main/java/org/glassfish/jersey/java/connector/JavaClientProperties.java b/connectors/java-connector/src/main/java/org/glassfish/jersey/java/connector/JavaClientProperties.java
deleted file mode 100644
index cb8f60e8c2..0000000000
--- a/connectors/java-connector/src/main/java/org/glassfish/jersey/java/connector/JavaClientProperties.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2021 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.java.connector;
-
-import org.glassfish.jersey.internal.util.PropertiesClass;
-
-import java.net.http.HttpClient;
-
-/**
- * Provides configuration properties for a {@link JavaConnector}.
- *
- * @author Steffen Nießing
- */
-@PropertiesClass
-public class JavaClientProperties {
- /**
- * Configuration of the {@link java.net.CookieHandler} that should be used by the {@link HttpClient}.
- * If this option is not set, {@link HttpClient#cookieHandler()} will return an empty {@link java.util.Optional}
- * and therefore no cookie handler will be used.
- *
- * A provided value to this option has to be of type {@link java.net.CookieHandler}.
- */
- public static final String COOKIE_HANDLER = "jersey.config.java.client.cookieHandler";
-
- /**
- * Configuration of SSL parameters used by the {@link HttpClient}.
- * If this option is not set, then the {@link HttpClient} will use implementation specific default values.
- *
- * A provided value to this option has to be of type {@link javax.net.ssl.SSLParameters}.
- */
- public static final String SSL_PARAMETERS = "jersey.config.java.client.sslParameters";
-
- /**
- * Prevent this class from instantiation.
- */
- private JavaClientProperties() {}
-}
diff --git a/connectors/java-connector/pom.xml b/connectors/jnh-connector/pom.xml
similarity index 90%
rename from connectors/java-connector/pom.xml
rename to connectors/jnh-connector/pom.xml
index c2f1ef073f..df184decb9 100644
--- a/connectors/java-connector/pom.xml
+++ b/connectors/jnh-connector/pom.xml
@@ -1,7 +1,7 @@
diff --git a/docs/src/main/docbook/appendix-properties.xml b/docs/src/main/docbook/appendix-properties.xml
index a3232c67a2..dcd681b0d4 100644
--- a/docs/src/main/docbook/appendix-properties.xml
+++ b/docs/src/main/docbook/appendix-properties.xml
@@ -1849,4 +1849,55 @@
+
+ Java Net HTTP client configuration properties
+
+
+ List of client configuration properties that can be found in &jersey.jnh.JavaNetHttpClientProperties; class.
+
+
+
+ List of Java Net HTTP client configuration properties
+
+
+
+ Constant
+ Value
+ Description
+
+
+
+
+ &jersey.jnh.JavaNetHttpClientProperties.COOKIE_HANDLER;
+ jersey.config.jnh.client.cookieHandler
+
+
+ Configuration of the java.net.CookieHandler that should be used by the
+ java.net.http.HttpClient. If this option is not set,
+ java.net.http.HttpClient#cookieHandler() will return an empty
+ java.util.Optional and therefore no cookie handler will be used.
+
+
+ A provided value to this option has to be of type java.net.CookieHandler.
+
+
+
+
+ &jersey.jnh.JavaNetHttpClientProperties.SSL_PARAMETERS;
+ jersey.config.jnh.client.sslParameters
+
+
+ Configuration of SSL parameters used by the java.net.http.HttpClient.
+ If this option is not set, then the java.net.http.HttpClient will use
+ implementation specific default values.
+
+
+ A provided value to this option has to be of type javax.net.ssl.SSLParameters.
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/docs/src/main/docbook/client.xml b/docs/src/main/docbook/client.xml
index 1ba38d2d64..8d3fd7497e 100644
--- a/docs/src/main/docbook/client.xml
+++ b/docs/src/main/docbook/client.xml
@@ -670,6 +670,11 @@ webTarget.request().post(Entity.entity(f, MediaType.TEXT_PLAIN_TYPE));
&jersey.jdk.JdkConnectorProvider;
org.glassfish.jersey.connectors:jersey-jdk-connector
+
+ Java java.net.http client
+ &jersey.jnh.JavaNetHttpConnectorProvider;
+ org.glassfish.jersey.connectors:jersey-jnh-connector
+
diff --git a/docs/src/main/docbook/jersey.ent b/docs/src/main/docbook/jersey.ent
index 4ffb0df942..bc123fe1b1 100644
--- a/docs/src/main/docbook/jersey.ent
+++ b/docs/src/main/docbook/jersey.ent
@@ -475,6 +475,11 @@
JettyHttpContainerFactory">
JettyHttpContainerProvider">
JettyWebContainerFactory">
+JavaNetHttpConnectorProvider">
+JavaNetHttpClientProperties">
+JavaNetHttpClientProperties">
+JavaNetHttpClientProperties.COOKIE_HANDLER">
+JavaNetHttpClientProperties.SSL_PARAMETERS">
DeclarativeLinkingFeature">
LoggingFeature">
LoggingFeature.DEFAULT_LOGGER_NAME">
diff --git a/tests/e2e-client/pom.xml b/tests/e2e-client/pom.xml
index b52fcd74dd..e58048f55b 100644
--- a/tests/e2e-client/pom.xml
+++ b/tests/e2e-client/pom.xml
@@ -127,6 +127,11 @@
jersey-grizzly-connector
test
+
+ org.glassfish.jersey.connectors
+ jersey-jnh-connector
+ test
+
org.glassfish.jersey.connectors
jersey-jdk-connector
diff --git a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/HttpPatchTest.java b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/HttpPatchTest.java
index 4a4fabed3a..bfc5bb03cf 100644
--- a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/HttpPatchTest.java
+++ b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/HttpPatchTest.java
@@ -37,6 +37,7 @@
import org.glassfish.jersey.grizzly.connector.GrizzlyConnectorProvider;
import org.glassfish.jersey.jdk.connector.JdkConnectorProvider;
import org.glassfish.jersey.jetty.connector.JettyConnectorProvider;
+import org.glassfish.jersey.jnh.connector.JavaNetHttpConnectorProvider;
import org.glassfish.jersey.logging.LoggingFeature;
import org.glassfish.jersey.netty.connector.NettyConnectorProvider;
import org.glassfish.jersey.server.ResourceConfig;
@@ -66,6 +67,7 @@ public static List testData() {
{Apache5ConnectorProvider.class},
{NettyConnectorProvider.class},
{JdkConnectorProvider.class},
+ {JavaNetHttpConnectorProvider.class}
}));
}
diff --git a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/RequestHeaderModificationsTest.java b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/RequestHeaderModificationsTest.java
index d955ff300f..2299309257 100644
--- a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/RequestHeaderModificationsTest.java
+++ b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/RequestHeaderModificationsTest.java
@@ -56,9 +56,10 @@
import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.client.HttpUrlConnectorProvider;
import org.glassfish.jersey.client.spi.ConnectorProvider;
+import org.glassfish.jersey.jetty.connector.JettyConnectorProvider;
+import org.glassfish.jersey.jnh.connector.JavaNetHttpConnectorProvider;
import org.glassfish.jersey.logging.LoggingFeature;
import org.glassfish.jersey.grizzly.connector.GrizzlyConnectorProvider;
-import org.glassfish.jersey.jetty.connector.JettyConnectorProvider;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
import org.glassfish.jersey.test.TestProperties;
@@ -105,11 +106,13 @@ public static List testData() {
{JettyConnectorProvider.class, false, false}, // change to true when JERSEY-2341 fixed
{ApacheConnectorProvider.class, false, false}, // change to true when JERSEY-2341 fixed
{Apache5ConnectorProvider.class, false, false}, // change to true when JERSEY-2341 fixed
+ {JavaNetHttpConnectorProvider.class, true, false},
{HttpUrlConnectorProvider.class, true, true},
{GrizzlyConnectorProvider.class, false, true}, // change to true when JERSEY-2341 fixed
{JettyConnectorProvider.class, false, true}, // change to true when JERSEY-2341 fixed
{ApacheConnectorProvider.class, false, true}, // change to true when JERSEY-2341 fixed
{Apache5ConnectorProvider.class, false, true}, // change to true when JERSEY-2341 fixed
+ {JavaNetHttpConnectorProvider.class, true, true},
}));
}
diff --git a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/ssl/AbstractConnectorServerTest.java b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/ssl/AbstractConnectorServerTest.java
index f26fca912b..79d944d31a 100644
--- a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/ssl/AbstractConnectorServerTest.java
+++ b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/ssl/AbstractConnectorServerTest.java
@@ -29,6 +29,7 @@
import org.glassfish.jersey.client.spi.ConnectorProvider;
import org.glassfish.jersey.grizzly.connector.GrizzlyConnectorProvider;
import org.glassfish.jersey.jetty.connector.JettyConnectorProvider;
+import org.glassfish.jersey.jnh.connector.JavaNetHttpConnectorProvider;
import org.glassfish.jersey.tests.e2e.client.connector.ProviderFiltering;
import org.junit.After;
@@ -63,7 +64,8 @@ public static Iterable testData() {
{new GrizzlyConnectorProvider()},
{new JettyConnectorProvider()},
{new ApacheConnectorProvider()},
- {new Apache5ConnectorProvider()}
+ {new Apache5ConnectorProvider()},
+ {new JavaNetHttpConnectorProvider()}
}));
}
diff --git a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/ssl/SslConnectorHostnameVerifierTest.java b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/ssl/SslConnectorHostnameVerifierTest.java
index 1e21173258..e96268445e 100644
--- a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/ssl/SslConnectorHostnameVerifierTest.java
+++ b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/ssl/SslConnectorHostnameVerifierTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022 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
@@ -32,6 +32,7 @@
import org.glassfish.jersey.client.spi.ConnectorProvider;
import org.glassfish.jersey.grizzly.connector.GrizzlyConnectorProvider;
import org.glassfish.jersey.jetty.connector.JettyConnectorProvider;
+import org.glassfish.jersey.jnh.connector.JavaNetHttpConnectorProvider;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -67,8 +68,12 @@ protected String clientTrustStore() {
*/
@Test
public void testHostnameVerifierApplied() throws Exception {
- // Grizzly and Jetty connectors don't support Hostname Verification
- if (isExcluded(Arrays.asList(GrizzlyConnectorProvider.class, JettyConnectorProvider.class))) {
+ // Grizzly, JavaNetHttp, and Jetty connectors don't support Hostname Verification
+ if (isExcluded(Arrays.asList(
+ GrizzlyConnectorProvider.class,
+ JettyConnectorProvider.class,
+ JavaNetHttpConnectorProvider.class)
+ )) {
return;
}
diff --git a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/httpurlconnector/Expect100ContinueTest.java b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/httpurlconnector/Expect100ContinueTest.java
index 176e4d3471..cae89b9628 100644
--- a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/httpurlconnector/Expect100ContinueTest.java
+++ b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/httpurlconnector/Expect100ContinueTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022 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,9 +16,7 @@
package org.glassfish.jersey.tests.e2e.client.httpurlconnector;
-import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.client.ClientProperties;
-import org.glassfish.jersey.client.HttpUrlConnectorProvider;
import org.glassfish.jersey.client.RequestEntityProcessing;
import org.glassfish.jersey.client.http.Expect100ContinueFeature;
import org.glassfish.jersey.server.ResourceConfig;
From 91ede06376e30f1a9ead9f08586d0ab39bf93d21 Mon Sep 17 00:00:00 2001
From: dansiviter
Date: Fri, 13 May 2022 06:34:45 +0100
Subject: [PATCH 040/305] Use Jsonb more effectively (#5047)
---
.../jsonb/internal/JsonBindingProvider.java | 23 +++++++++----------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/media/json-binding/src/main/java/org/glassfish/jersey/jsonb/internal/JsonBindingProvider.java b/media/json-binding/src/main/java/org/glassfish/jersey/jsonb/internal/JsonBindingProvider.java
index 98ea299fc6..efc7c814e4 100644
--- a/media/json-binding/src/main/java/org/glassfish/jersey/jsonb/internal/JsonBindingProvider.java
+++ b/media/json-binding/src/main/java/org/glassfish/jersey/jsonb/internal/JsonBindingProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022 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
@@ -19,9 +19,17 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.io.OutputStreamWriter;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+import org.glassfish.jersey.jsonb.LocalizationMessages;
+import org.glassfish.jersey.message.internal.AbstractMessageReaderWriterProvider;
+import org.glassfish.jersey.message.internal.EntityInputStream;
+
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+import jakarta.json.bind.JsonbException;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.ProcessingException;
import jakarta.ws.rs.Produces;
@@ -34,14 +42,6 @@
import jakarta.ws.rs.ext.Provider;
import jakarta.ws.rs.ext.Providers;
-import jakarta.json.bind.Jsonb;
-import jakarta.json.bind.JsonbBuilder;
-import jakarta.json.bind.JsonbException;
-
-import org.glassfish.jersey.jsonb.LocalizationMessages;
-import org.glassfish.jersey.message.internal.AbstractMessageReaderWriterProvider;
-import org.glassfish.jersey.message.internal.EntityInputStream;
-
/**
* Entity provider (reader and writer) for JSONB.
*
@@ -100,9 +100,8 @@ public void writeTo(Object o, Class type, Type genericType,
OutputStream entityStream) throws IOException, WebApplicationException {
Jsonb jsonb = getJsonb(type);
try {
- entityStream.write(jsonb.toJson(o).getBytes(AbstractMessageReaderWriterProvider.getCharset(mediaType)));
- entityStream.flush();
- } catch (IOException e) {
+ jsonb.toJson(o, genericType, new OutputStreamWriter(entityStream, getCharset(mediaType)));
+ } catch (JsonbException e) {
throw new ProcessingException(LocalizationMessages.ERROR_JSONB_SERIALIZATION(), e);
}
}
From c0ed81dd7ffa686d9181f86c9e1469ff6312f038 Mon Sep 17 00:00:00 2001
From: jbescos
Date: Tue, 17 May 2022 16:05:58 +0200
Subject: [PATCH 041/305] Netty Connector doesn't support Followredirects
(#5048)
Signed-off-by: Jorge Bescos Gascon
---
.../netty/connector/JerseyClientHandler.java | 62 ++++++-
.../connector/NettyClientProperties.java | 14 ++
.../netty/connector/NettyConnector.java | 29 ++--
.../connector/internal/RedirectException.java | 62 +++++++
.../netty/connector/localization.properties | 7 +-
.../netty/connector/FollowRedirectsTest.java | 163 ++++++++++++++++++
docs/src/main/docbook/appendix-properties.xml | 12 ++
docs/src/main/docbook/jersey.ent | 1 +
8 files changed, 332 insertions(+), 18 deletions(-)
create mode 100644 connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/internal/RedirectException.java
create mode 100644 connectors/netty-connector/src/test/java/org/glassfish/jersey/netty/connector/FollowRedirectsTest.java
diff --git a/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/JerseyClientHandler.java b/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/JerseyClientHandler.java
index 93e20c25a3..af8fa5a158 100644
--- a/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/JerseyClientHandler.java
+++ b/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/JerseyClientHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022 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
@@ -18,15 +18,20 @@
import java.io.IOException;
import java.io.InputStream;
+import java.net.URI;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeoutException;
+import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
+import org.glassfish.jersey.client.ClientProperties;
import org.glassfish.jersey.client.ClientRequest;
import org.glassfish.jersey.client.ClientResponse;
import org.glassfish.jersey.netty.connector.internal.NettyInputStream;
+import org.glassfish.jersey.netty.connector.internal.RedirectException;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
@@ -35,6 +40,7 @@
import io.netty.handler.codec.http.HttpHeaderNames;
import io.netty.handler.codec.http.HttpObject;
import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.handler.codec.http.HttpUtil;
import io.netty.handler.codec.http.LastHttpContent;
import io.netty.handler.timeout.IdleStateEvent;
@@ -46,21 +52,32 @@
*/
class JerseyClientHandler extends SimpleChannelInboundHandler {
+ private static final int DEFAULT_MAX_REDIRECTS = 5;
+
+ // Modified only by the same thread. No need to synchronize it.
+ private final Set redirectUriHistory;
private final ClientRequest jerseyRequest;
private final CompletableFuture responseAvailable;
private final CompletableFuture responseDone;
+ private final boolean followRedirects;
+ private final int maxRedirects;
+ private final NettyConnector connector;
private NettyInputStream nis;
private ClientResponse jerseyResponse;
private boolean readTimedOut;
- JerseyClientHandler(ClientRequest request,
- CompletableFuture responseAvailable,
- CompletableFuture responseDone) {
+ JerseyClientHandler(ClientRequest request, CompletableFuture responseAvailable,
+ CompletableFuture responseDone, Set redirectUriHistory, NettyConnector connector) {
+ this.redirectUriHistory = redirectUriHistory;
this.jerseyRequest = request;
this.responseAvailable = responseAvailable;
this.responseDone = responseDone;
+ // Follow redirects by default
+ this.followRedirects = jerseyRequest.resolveProperty(ClientProperties.FOLLOW_REDIRECTS, true);
+ this.maxRedirects = jerseyRequest.resolveProperty(NettyClientProperties.MAX_REDIRECTS, DEFAULT_MAX_REDIRECTS);
+ this.connector = connector;
}
@Override
@@ -83,7 +100,41 @@ protected void notifyResponse() {
if (jerseyResponse != null) {
ClientResponse cr = jerseyResponse;
jerseyResponse = null;
- responseAvailable.complete(cr);
+ int responseStatus = cr.getStatus();
+ if (followRedirects
+ && (responseStatus == HttpResponseStatus.MOVED_PERMANENTLY.code()
+ || responseStatus == HttpResponseStatus.FOUND.code()
+ || responseStatus == HttpResponseStatus.SEE_OTHER.code()
+ || responseStatus == HttpResponseStatus.TEMPORARY_REDIRECT.code()
+ || responseStatus == HttpResponseStatus.PERMANENT_REDIRECT.code())) {
+ String location = cr.getHeaderString(HttpHeaders.LOCATION);
+ if (location == null || location.isEmpty()) {
+ responseAvailable.completeExceptionally(new RedirectException(LocalizationMessages.REDIRECT_NO_LOCATION()));
+ } else {
+ try {
+ URI newUri = URI.create(location);
+ boolean alreadyRequested = !redirectUriHistory.add(newUri);
+ if (alreadyRequested) {
+ // infinite loop detection
+ responseAvailable.completeExceptionally(
+ new RedirectException(LocalizationMessages.REDIRECT_INFINITE_LOOP()));
+ } else if (redirectUriHistory.size() > maxRedirects) {
+ // maximal number of redirection
+ responseAvailable.completeExceptionally(
+ new RedirectException(LocalizationMessages.REDIRECT_LIMIT_REACHED(maxRedirects)));
+ } else {
+ ClientRequest newReq = new ClientRequest(jerseyRequest);
+ newReq.setUri(newUri);
+ connector.execute(newReq, redirectUriHistory, responseAvailable);
+ }
+ } catch (IllegalArgumentException e) {
+ responseAvailable.completeExceptionally(
+ new RedirectException(LocalizationMessages.REDIRECT_ERROR_DETERMINING_LOCATION(location)));
+ }
+ }
+ } else {
+ responseAvailable.complete(cr);
+ }
}
}
@@ -91,7 +142,6 @@ protected void notifyResponse() {
public void channelRead0(ChannelHandlerContext ctx, HttpObject msg) {
if (msg instanceof HttpResponse) {
final HttpResponse response = (HttpResponse) msg;
-
jerseyResponse = new ClientResponse(new Response.StatusType() {
@Override
public int getStatusCode() {
diff --git a/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/NettyClientProperties.java b/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/NettyClientProperties.java
index bf34699708..671b08ff25 100644
--- a/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/NettyClientProperties.java
+++ b/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/NettyClientProperties.java
@@ -68,4 +68,18 @@ public class NettyClientProperties {
* @see javax.net.ssl.SSLParameters#setEndpointIdentificationAlgorithm(String)
*/
public static final String ENABLE_SSL_HOSTNAME_VERIFICATION = "jersey.config.client.tls.enableHostnameVerification";
+
+ /**
+ * The maximal number of redirects during single request.
+ *
+ * Value is expected to be positive {@link Integer}. Default value is {@value #DEFAULT_MAX_REDIRECTS}.
+ *
+ * HTTP redirection must be enabled by property {@link org.glassfish.jersey.client.ClientProperties#FOLLOW_REDIRECTS},
+ * otherwise {@code MAX_REDIRECTS} is not applied.
+ *
+ * @since 2.36
+ * @see org.glassfish.jersey.client.ClientProperties#FOLLOW_REDIRECTS
+ * @see org.glassfish.jersey.netty.connector.internal.RedirectException
+ */
+ public static final String MAX_REDIRECTS = "jersey.config.client.NettyConnectorProvider.maxRedirects";
}
diff --git a/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/NettyConnector.java b/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/NettyConnector.java
index c97ea2e16c..ba1f8c2354 100644
--- a/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/NettyConnector.java
+++ b/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/NettyConnector.java
@@ -22,9 +22,11 @@
import java.net.URI;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
+import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.ExecutorService;
@@ -151,7 +153,9 @@ class NettyConnector implements Connector {
@Override
public ClientResponse apply(ClientRequest jerseyRequest) {
try {
- return execute(jerseyRequest).join();
+ CompletableFuture response = new CompletableFuture<>();
+ execute(jerseyRequest, new HashSet<>(), response);
+ return response.join();
} catch (CompletionException cex) {
final Throwable t = cex.getCause() == null ? cex : cex.getCause();
throw new ProcessingException(t.getMessage(), t);
@@ -162,19 +166,25 @@ public ClientResponse apply(ClientRequest jerseyRequest) {
@Override
public Future apply(final ClientRequest jerseyRequest, final AsyncConnectorCallback jerseyCallback) {
- return execute(jerseyRequest).whenCompleteAsync((r, th) -> {
- if (th == null) jerseyCallback.response(r);
- else jerseyCallback.failure(th);
- }, executorService);
+ CompletableFuture response = new CompletableFuture<>();
+ response.whenCompleteAsync((r, th) -> {
+ if (th == null) {
+ jerseyCallback.response(r);
+ } else {
+ jerseyCallback.failure(th);
+ }
+ }, executorService);
+ execute(jerseyRequest, new HashSet<>(), response);
+ return response;
}
- protected CompletableFuture execute(final ClientRequest jerseyRequest) {
+ protected void execute(final ClientRequest jerseyRequest, final Set redirectUriHistory,
+ final CompletableFuture responseAvailable) {
Integer timeout = jerseyRequest.resolveProperty(ClientProperties.READ_TIMEOUT, 0);
if (timeout == null || timeout < 0) {
throw new ProcessingException(LocalizationMessages.WRONG_READ_TIMEOUT(timeout));
}
- final CompletableFuture responseAvailable = new CompletableFuture<>();
final CompletableFuture responseDone = new CompletableFuture<>();
final URI requestUri = jerseyRequest.getUri();
@@ -290,7 +300,8 @@ protected void initChannel(SocketChannel ch) throws Exception {
// assert: it is ok to abort the entire response, if responseDone is completed exceptionally - in particular, nothing
// will leak
final Channel ch = chan;
- JerseyClientHandler clientHandler = new JerseyClientHandler(jerseyRequest, responseAvailable, responseDone);
+ JerseyClientHandler clientHandler =
+ new JerseyClientHandler(jerseyRequest, responseAvailable, responseDone, redirectUriHistory, this);
// read timeout makes sense really as an inactivity timeout
ch.pipeline().addLast(READ_TIMEOUT_HANDLER,
new IdleStateHandler(0, 0, timeout, TimeUnit.MILLISECONDS));
@@ -411,8 +422,6 @@ public void run() {
} catch (InterruptedException e) {
responseDone.completeExceptionally(e);
}
-
- return responseAvailable;
}
private String buildPathWithQueryParameters(URI requestUri) {
diff --git a/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/internal/RedirectException.java b/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/internal/RedirectException.java
new file mode 100644
index 0000000000..bef04e1803
--- /dev/null
+++ b/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/internal/RedirectException.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2022 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
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.jersey.netty.connector.internal;
+
+import org.glassfish.jersey.client.ClientProperties;
+
+/**
+ * This Exception is used only if {@link ClientProperties#FOLLOW_REDIRECTS} is set to {@code true}.
+ *
+ * This exception is thrown when any of the Redirect HTTP response status codes (301, 302, 303, 307, 308) is received and:
+ *
+ * -
+ * the chained redirection count exceeds the value of
+ * {@link org.glassfish.jersey.netty.connector.NettyClientProperties#MAX_REDIRECTS}
+ *
+ * -
+ * or an infinite redirection loop is detected
+ *
+ * -
+ * or Location response header is missing, empty or does not contain a valid {@link java.net.URI}.
+ *
+ *
+ *
+ */
+public class RedirectException extends Exception {
+
+ private static final long serialVersionUID = 4357724300486801294L;
+
+ /**
+ * Constructor.
+ *
+ * @param message the detail message. The detail message is saved for
+ * later retrieval by the {@link #getMessage()} method.
+ */
+ public RedirectException(String message) {
+ super(message);
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param message the detail message. The detail message is saved for
+ * later retrieval by the {@link #getMessage()} method.
+ */
+ public RedirectException(String message, Throwable t) {
+ super(message, t);
+ }
+}
diff --git a/connectors/netty-connector/src/main/resources/org/glassfish/jersey/netty/connector/localization.properties b/connectors/netty-connector/src/main/resources/org/glassfish/jersey/netty/connector/localization.properties
index bf12db6c02..9055d6277a 100644
--- a/connectors/netty-connector/src/main/resources/org/glassfish/jersey/netty/connector/localization.properties
+++ b/connectors/netty-connector/src/main/resources/org/glassfish/jersey/netty/connector/localization.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2016, 2021 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2022 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
@@ -19,4 +19,7 @@ wrong.read.timeout=Unexpected ("{0}") READ_TIMEOUT.
wrong.max.pool.size=Unexpected ("{0}") maximum number of connections per destination.
wrong.max.pool.total=Unexpected ("{0}") maximum number of connections total.
wrong.max.pool.idle=Unexpected ("{0}") maximum number of idle seconds.
-
+redirect.no.location="Received redirect that does not contain a location or the location is empty."
+redirect.error.determining.location="Error determining redirect location: ({0})."
+redirect.infinite.loop="Infinite loop in chained redirects detected."
+redirect.limit.reached="Max chained redirect limit ({0}) exceeded."
diff --git a/connectors/netty-connector/src/test/java/org/glassfish/jersey/netty/connector/FollowRedirectsTest.java b/connectors/netty-connector/src/test/java/org/glassfish/jersey/netty/connector/FollowRedirectsTest.java
new file mode 100644
index 0000000000..269562297d
--- /dev/null
+++ b/connectors/netty-connector/src/test/java/org/glassfish/jersey/netty/connector/FollowRedirectsTest.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2022 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
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.jersey.netty.connector;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.net.URI;
+import java.util.logging.Logger;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Response;
+
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.ClientProperties;
+import org.glassfish.jersey.logging.LoggingFeature;
+import org.glassfish.jersey.netty.connector.internal.RedirectException;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.test.JerseyTest;
+import org.junit.Test;
+
+public class FollowRedirectsTest extends JerseyTest {
+
+ private static final Logger LOGGER = Logger.getLogger(FollowRedirectsTest.class.getName());
+ private static final String TEST_URL = "http://localhost:9998/test";
+
+ @Path("/test")
+ public static class RedirectResource {
+ @GET
+ public String get() {
+ return "GET";
+ }
+
+ @GET
+ @Path("redirect")
+ public Response redirect() {
+ return Response.seeOther(URI.create(TEST_URL)).build();
+ }
+
+ @GET
+ @Path("loop")
+ public Response loop() {
+ return Response.seeOther(URI.create(TEST_URL + "/loop")).build();
+ }
+
+ @GET
+ @Path("redirect2")
+ public Response redirect2() {
+ return Response.seeOther(URI.create(TEST_URL + "/redirect")).build();
+ }
+ }
+
+ @Override
+ protected Application configure() {
+ ResourceConfig config = new ResourceConfig(RedirectResource.class);
+ config.register(new LoggingFeature(LOGGER, LoggingFeature.Verbosity.PAYLOAD_ANY));
+ return config;
+ }
+
+ @Override
+ protected void configureClient(ClientConfig config) {
+ config.property(ClientProperties.FOLLOW_REDIRECTS, false);
+ config.connectorProvider(new NettyConnectorProvider());
+ }
+
+ @Test
+ public void testDoFollow() {
+ final URI u = target().getUri();
+ ClientConfig config = new ClientConfig().property(ClientProperties.FOLLOW_REDIRECTS, true);
+ config.connectorProvider(new NettyConnectorProvider());
+ Client c = ClientBuilder.newClient(config);
+ WebTarget t = c.target(u);
+ Response r = t.path("test/redirect")
+ .request().get();
+ assertEquals(200, r.getStatus());
+ assertEquals("GET", r.readEntity(String.class));
+ c.close();
+ }
+
+ @Test
+ public void testDoFollowPerRequestOverride() {
+ WebTarget t = target("test/redirect");
+ t.property(ClientProperties.FOLLOW_REDIRECTS, true);
+ Response r = t.request().get();
+ assertEquals(200, r.getStatus());
+ assertEquals("GET", r.readEntity(String.class));
+ }
+
+ @Test
+ public void testDontFollow() {
+ WebTarget t = target("test/redirect");
+ assertEquals(303, t.request().get().getStatus());
+ }
+
+ @Test
+ public void testDontFollowPerRequestOverride() {
+ final URI u = target().getUri();
+ ClientConfig config = new ClientConfig().property(ClientProperties.FOLLOW_REDIRECTS, true);
+ config.connectorProvider(new NettyConnectorProvider());
+ Client client = ClientBuilder.newClient(config);
+ WebTarget t = client.target(u);
+ t.property(ClientProperties.FOLLOW_REDIRECTS, false);
+ Response r = t.path("test/redirect").request().get();
+ assertEquals(303, r.getStatus());
+ client.close();
+ }
+
+ @Test
+ public void testInfiniteLoop() {
+ WebTarget t = target("test/loop");
+ t.property(ClientProperties.FOLLOW_REDIRECTS, true);
+ try {
+ t.request().get();
+ fail("Expected exception");
+ } catch (ProcessingException e) {
+ assertEquals(RedirectException.class, e.getCause().getClass());
+ assertEquals(LocalizationMessages.REDIRECT_INFINITE_LOOP(), e.getCause().getMessage());
+ }
+ }
+
+ @Test
+ public void testRedirectLimitReached() {
+ WebTarget t = target("test/redirect2");
+ t.property(ClientProperties.FOLLOW_REDIRECTS, true);
+ t.property(NettyClientProperties.MAX_REDIRECTS, 1);
+ try {
+ t.request().get();
+ fail("Expected exception");
+ } catch (ProcessingException e) {
+ assertEquals(RedirectException.class, e.getCause().getClass());
+ assertEquals(LocalizationMessages.REDIRECT_LIMIT_REACHED(1), e.getCause().getMessage());
+ }
+ }
+
+ @Test
+ public void testRedirectNoLimitReached() {
+ WebTarget t = target("test/redirect2");
+ t.property(ClientProperties.FOLLOW_REDIRECTS, true);
+ Response r = t.request().get();
+ assertEquals(200, r.getStatus());
+ assertEquals("GET", r.readEntity(String.class));
+ }
+}
diff --git a/docs/src/main/docbook/appendix-properties.xml b/docs/src/main/docbook/appendix-properties.xml
index 2dd099d228..0f085eb6d4 100644
--- a/docs/src/main/docbook/appendix-properties.xml
+++ b/docs/src/main/docbook/appendix-properties.xml
@@ -1810,6 +1810,18 @@
+
+ &jersey.netty.NettyClientProperties.MAX_REDIRECTS;
+ jersey.config.client.NettyConnectorProvider.maxRedirect
+
+
+ This property determines the maximal number of redirects during single request. Value is expected to be
+ positive number. Default value is 5.
+ HTTP redirection must be enabled by property org.glassfish.jersey.client.ClientProperties.FOLLOW_REDIRECTS
+ otherwise &jersey.netty.NettyClientProperties.MAX_REDIRECTS; is not applied.
+
+
+
diff --git a/docs/src/main/docbook/jersey.ent b/docs/src/main/docbook/jersey.ent
index 88d5f4f471..1c8bdb0564 100644
--- a/docs/src/main/docbook/jersey.ent
+++ b/docs/src/main/docbook/jersey.ent
@@ -537,6 +537,7 @@
NettyClientProperties.IDLE_CONNECTION_PRUNE_TIMEOUT" >
NettyClientProperties.MAX_CONNECTIONS" >
NettyClientProperties.MAX_CONNECTIONS_TOTAL" >
+NettyClientProperties.MAX_REDIRECTS" >
NettyConnectorProvider">
ApplicationHandler">
@BackgroundScheduler">
From 31f6557fce90b7dade46afacfc4c97b65883bb2c Mon Sep 17 00:00:00 2001
From: jansupol
Date: Thu, 14 Apr 2022 21:13:23 +0200
Subject: [PATCH 042/305] Adopt ASM 9.3
Signed-off-by: jansupol
---
NOTICE.md | 2 +-
.../org/objectweb/asm/AnnotationVisitor.java | 16 ++++-----
.../org/objectweb/asm/ByteVector.java | 12 +++++++
.../org/objectweb/asm/ClassReader.java | 15 ++++----
.../org/objectweb/asm/ClassVisitor.java | 17 +++++----
.../org/objectweb/asm/ClassWriter.java | 34 ++++++++++++++----
.../org/objectweb/asm/FieldVisitor.java | 19 +++++-----
.../org/objectweb/asm/MethodVisitor.java | 30 ++++++++--------
.../org/objectweb/asm/MethodWriter.java | 35 ++++++++++---------
.../org/objectweb/asm/ModuleVisitor.java | 4 +--
.../repackaged/org/objectweb/asm/Opcodes.java | 1 +
.../objectweb/asm/RecordComponentVisitor.java | 4 +--
.../repackaged/org/objectweb/asm/Type.java | 2 +-
.../scanning/AnnotationAcceptingListener.java | 4 +--
.../main/resources/META-INF/NOTICE.markdown | 2 +-
pom.xml | 2 +-
16 files changed, 116 insertions(+), 83 deletions(-)
diff --git a/NOTICE.md b/NOTICE.md
index c0ef15f056..7a27297587 100644
--- a/NOTICE.md
+++ b/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 8.0
+org.objectweb.asm Version 9.3
* License: Modified BSD (https://asm.ow2.io/license.html)
* Copyright (c) 2000-2011 INRIA, France Telecom. All rights reserved.
diff --git a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/AnnotationVisitor.java b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/AnnotationVisitor.java
index 8ca2039014..0654582e49 100644
--- a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/AnnotationVisitor.java
+++ b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/AnnotationVisitor.java
@@ -38,8 +38,8 @@
public abstract class AnnotationVisitor {
/**
- * The ASM API version implemented by this visitor. The value of this field must be one of {@link
- * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+ * The ASM API version implemented by this visitor. The value of this field must be one of the
+ * {@code ASM}x values in {@link Opcodes}.
*/
protected final int api;
@@ -52,22 +52,22 @@ public abstract class AnnotationVisitor {
/**
* Constructs a new {@link AnnotationVisitor}.
*
- * @param api the ASM API version implemented by this visitor. Must be one of {@link
- * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+ * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+ * ASM}x values in {@link Opcodes}.
*/
- public AnnotationVisitor(final int api) {
+ protected AnnotationVisitor(final int api) {
this(api, null);
}
/**
* Constructs a new {@link AnnotationVisitor}.
*
- * @param api the ASM API version implemented by this visitor. Must be one of {@link
- * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+ * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+ * ASM}x values in {@link Opcodes}.
* @param annotationVisitor the annotation visitor to which this visitor must delegate method
* calls. May be {@literal null}.
*/
- public AnnotationVisitor(final int api, final AnnotationVisitor annotationVisitor) {
+ protected AnnotationVisitor(final int api, final AnnotationVisitor annotationVisitor) {
if (api != Opcodes.ASM9
&& api != Opcodes.ASM8
&& api != Opcodes.ASM7
diff --git a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ByteVector.java b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ByteVector.java
index 7b386a06f2..472318f820 100644
--- a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ByteVector.java
+++ b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ByteVector.java
@@ -65,6 +65,15 @@ public ByteVector(final int initialCapacity) {
this.length = data.length;
}
+ /**
+ * Returns the actual number of bytes in this vector.
+ *
+ * @return the actual number of bytes in this vector.
+ */
+ public int size() {
+ return length;
+ }
+
/**
* Puts a byte into this byte vector. The byte vector is automatically enlarged if necessary.
*
@@ -352,6 +361,9 @@ public ByteVector putByteArray(
* @param size number of additional bytes that this byte vector should be able to receive.
*/
private void enlarge(final int size) {
+ if (length > data.length) {
+ throw new AssertionError("Internal error");
+ }
int doubleCapacity = 2 * data.length;
int minimalCapacity = length + size;
byte[] newData = new byte[doubleCapacity > minimalCapacity ? doubleCapacity : minimalCapacity];
diff --git a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ClassReader.java b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ClassReader.java
index b0173c8141..cd4a6bb5ad 100644
--- a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ClassReader.java
+++ b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ClassReader.java
@@ -194,7 +194,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.V18) {
+ if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V19) {
throw new IllegalArgumentException(
"Unsupported class file major version " + readShort(classFileOffset + 6));
}
@@ -308,12 +308,13 @@ public ClassReader(final String className) throws IOException {
* @return the content of the given input stream.
* @throws IOException if a problem occurs during reading.
*/
+ @SuppressWarnings("PMD.UseTryWithResources")
private static byte[] readStream(final InputStream inputStream, final boolean close)
throws IOException {
if (inputStream == null) {
throw new IOException("Class not found");
}
- int bufferSize = calculateBufferSize(inputStream);
+ int bufferSize = computeBufferSize(inputStream);
try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
byte[] data = new byte[bufferSize];
int bytesRead;
@@ -334,19 +335,19 @@ private static byte[] readStream(final InputStream inputStream, final boolean cl
}
}
- private static int calculateBufferSize(final InputStream inputStream) throws IOException {
+ private static int computeBufferSize(final InputStream inputStream) throws IOException {
int expectedLength = inputStream.available();
/*
- * Some implementations can return 0 while holding available data
- * (e.g. new FileInputStream("/proc/a_file"))
- * Also in some pathological cases a very small number might be returned,
- * and in this case we use default size
+ * Some implementations can return 0 while holding available data (e.g. new
+ * FileInputStream("/proc/a_file")). Also in some pathological cases a very small number might
+ * be returned, and in this case we use a default size.
*/
if (expectedLength < 256) {
return INPUT_STREAM_DATA_CHUNK_SIZE;
}
return Math.min(expectedLength, MAX_BUFFER_SIZE);
}
+
// -----------------------------------------------------------------------------------------------
// Accessors
// -----------------------------------------------------------------------------------------------
diff --git a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ClassVisitor.java b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ClassVisitor.java
index e3a5b605f2..8ebf594f64 100644
--- a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ClassVisitor.java
+++ b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ClassVisitor.java
@@ -40,8 +40,8 @@
public abstract class ClassVisitor {
/**
- * The ASM API version implemented by this visitor. The value of this field must be one of {@link
- * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+ * The ASM API version implemented by this visitor. The value of this field must be one of the
+ * {@code ASM}x values in {@link Opcodes}.
*/
protected final int api;
@@ -51,23 +51,22 @@ public abstract class ClassVisitor {
/**
* Constructs a new {@link ClassVisitor}.
*
- * @param api the ASM API version implemented by this visitor. Must be one of {@link
- * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+ * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+ * ASM}x values in {@link Opcodes}.
*/
- public ClassVisitor(final int api) {
+ protected ClassVisitor(final int api) {
this(api, null);
}
/**
* Constructs a new {@link ClassVisitor}.
*
- * @param api the ASM API version implemented by this visitor. Must be one of {@link
- * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
- * Opcodes#ASM8} or {@link Opcodes#ASM9}.
+ * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+ * ASM}x values in {@link Opcodes}.
* @param classVisitor the class visitor to which this visitor must delegate method calls. May be
* null.
*/
- public ClassVisitor(final int api, final ClassVisitor classVisitor) {
+ protected ClassVisitor(final int api, final ClassVisitor classVisitor) {
if (api != Opcodes.ASM9
&& api != Opcodes.ASM8
&& api != Opcodes.ASM7
diff --git a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ClassWriter.java b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ClassWriter.java
index 81176b8cc9..de2c44194a 100644
--- a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ClassWriter.java
+++ b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ClassWriter.java
@@ -65,6 +65,12 @@ public class ClassWriter extends ClassVisitor {
*/
public static final int COMPUTE_FRAMES = 2;
+ /**
+ * The flags passed to the constructor. Must be zero or more of {@link #COMPUTE_MAXS} and {@link
+ * #COMPUTE_FRAMES}.
+ */
+ private final int flags;
+
// Note: fields are ordered as in the ClassFile structure, and those related to attributes are
// ordered as in Section 4.7 of the JVMS.
@@ -248,23 +254,39 @@ public ClassWriter(final int flags) {
* @param classReader the {@link ClassReader} used to read the original class. It will be used to
* copy the entire constant pool and bootstrap methods from the original class and also to
* copy other fragments of original bytecode where applicable.
- * @param flags option flags that can be used to modify the default behavior of this class.Must be
- * zero or more of {@link #COMPUTE_MAXS} and {@link #COMPUTE_FRAMES}. These option flags do
- * not affect methods that are copied as is in the new class. This means that neither the
+ * @param flags option flags that can be used to modify the default behavior of this class. Must
+ * be zero or more of {@link #COMPUTE_MAXS} and {@link #COMPUTE_FRAMES}. These option flags
+ * do not affect methods that are copied as is in the new class. This means that neither the
* maximum stack size nor the stack frames will be computed for these methods.
*/
public ClassWriter(final ClassReader classReader, final int flags) {
super(/* latest api = */ Opcodes.ASM9);
+ this.flags = flags;
symbolTable = classReader == null ? new SymbolTable(this) : new SymbolTable(this, classReader);
if ((flags & COMPUTE_FRAMES) != 0) {
- this.compute = MethodWriter.COMPUTE_ALL_FRAMES;
+ compute = MethodWriter.COMPUTE_ALL_FRAMES;
} else if ((flags & COMPUTE_MAXS) != 0) {
- this.compute = MethodWriter.COMPUTE_MAX_STACK_AND_LOCAL;
+ compute = MethodWriter.COMPUTE_MAX_STACK_AND_LOCAL;
} else {
- this.compute = MethodWriter.COMPUTE_NOTHING;
+ compute = MethodWriter.COMPUTE_NOTHING;
}
}
+ // -----------------------------------------------------------------------------------------------
+ // Accessors
+ // -----------------------------------------------------------------------------------------------
+
+ /**
+ * Returns true if all the given flags were passed to the constructor.
+ *
+ * @param flags some option flags. Must be zero or more of {@link #COMPUTE_MAXS} and {@link
+ * #COMPUTE_FRAMES}.
+ * @return true if all the given flags, or more, were passed to the constructor.
+ */
+ public boolean hasFlags(final int flags) {
+ return (this.flags & flags) == flags;
+ }
+
// -----------------------------------------------------------------------------------------------
// Implementation of the ClassVisitor abstract class
// -----------------------------------------------------------------------------------------------
diff --git a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/FieldVisitor.java b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/FieldVisitor.java
index 716d6b0fbe..64865d6d9a 100644
--- a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/FieldVisitor.java
+++ b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/FieldVisitor.java
@@ -37,9 +37,8 @@
public abstract class FieldVisitor {
/**
- * The ASM API version implemented by this visitor. The value of this field must be one of {@link
- * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
- * Opcodes#ASM8} or {@link Opcodes#ASM9}.
+ * The ASM API version implemented by this visitor. The value of this field must be one of the
+ * {@code ASM}x values in {@link Opcodes}.
*/
protected final int api;
@@ -49,24 +48,22 @@ public abstract class FieldVisitor {
/**
* Constructs a new {@link FieldVisitor}.
*
- * @param api the ASM API version implemented by this visitor. Must be one of {@link
- * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
- * Opcodes#ASM8} or {@link Opcodes#ASM9}.
+ * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+ * ASM}x values in {@link Opcodes}.
*/
- public FieldVisitor(final int api) {
+ protected FieldVisitor(final int api) {
this(api, null);
}
/**
* Constructs a new {@link FieldVisitor}.
*
- * @param api the ASM API version implemented by this visitor. Must be one of {@link
- * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
- * Opcodes#ASM8}.
+ * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+ * ASM}x values in {@link Opcodes}.
* @param fieldVisitor the field visitor to which this visitor must delegate method calls. May be
* null.
*/
- public FieldVisitor(final int api, final FieldVisitor fieldVisitor) {
+ protected FieldVisitor(final int api, final FieldVisitor fieldVisitor) {
if (api != Opcodes.ASM9
&& api != Opcodes.ASM8
&& api != Opcodes.ASM7
diff --git a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/MethodVisitor.java b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/MethodVisitor.java
index 77392c7fec..805aed5017 100644
--- a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/MethodVisitor.java
+++ b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/MethodVisitor.java
@@ -51,8 +51,8 @@ public abstract class MethodVisitor {
private static final String REQUIRES_ASM5 = "This feature requires ASM5";
/**
- * The ASM API version implemented by this visitor. The value of this field must be one of {@link
- * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+ * The ASM API version implemented by this visitor. The value of this field must be one of the
+ * {@code ASM}x values in {@link Opcodes}.
*/
protected final int api;
@@ -64,22 +64,22 @@ public abstract class MethodVisitor {
/**
* Constructs a new {@link MethodVisitor}.
*
- * @param api the ASM API version implemented by this visitor. Must be one of {@link
- * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+ * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+ * ASM}x values in {@link Opcodes}.
*/
- public MethodVisitor(final int api) {
+ protected MethodVisitor(final int api) {
this(api, null);
}
/**
* Constructs a new {@link MethodVisitor}.
*
- * @param api the ASM API version implemented by this visitor. Must be one of {@link
- * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+ * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+ * ASM}x values in {@link Opcodes}.
* @param methodVisitor the method visitor to which this visitor must delegate method calls. May
* be null.
*/
- public MethodVisitor(final int api, final MethodVisitor methodVisitor) {
+ protected MethodVisitor(final int api, final MethodVisitor methodVisitor) {
if (api != Opcodes.ASM9
&& api != Opcodes.ASM8
&& api != Opcodes.ASM7
@@ -351,12 +351,12 @@ public void visitIntInsn(final int opcode, final int operand) {
*
* @param opcode the opcode of the local variable instruction to be visited. This opcode is either
* ILOAD, LLOAD, FLOAD, DLOAD, ALOAD, ISTORE, LSTORE, FSTORE, DSTORE, ASTORE or RET.
- * @param var the operand of the instruction to be visited. This operand is the index of a local
- * variable.
+ * @param varIndex the operand of the instruction to be visited. This operand is the index of a
+ * local variable.
*/
- public void visitVarInsn(final int opcode, final int var) {
+ public void visitVarInsn(final int opcode, final int varIndex) {
if (mv != null) {
- mv.visitVarInsn(opcode, var);
+ mv.visitVarInsn(opcode, varIndex);
}
}
@@ -554,12 +554,12 @@ public void visitLdcInsn(final Object value) {
/**
* Visits an IINC instruction.
*
- * @param var index of the local variable to be incremented.
+ * @param varIndex index of the local variable to be incremented.
* @param increment amount to increment the local variable by.
*/
- public void visitIincInsn(final int var, final int increment) {
+ public void visitIincInsn(final int varIndex, final int increment) {
if (mv != null) {
- mv.visitIincInsn(var, increment);
+ mv.visitIincInsn(varIndex, increment);
}
}
diff --git a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/MethodWriter.java b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/MethodWriter.java
index 24f7f6182c..ea2e4e48ed 100644
--- a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/MethodWriter.java
+++ b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/MethodWriter.java
@@ -466,7 +466,8 @@ final class MethodWriter extends MethodVisitor {
/**
* Indicates what must be computed. Must be one of {@link #COMPUTE_ALL_FRAMES}, {@link
- * #COMPUTE_INSERTED_FRAMES}, {@link #COMPUTE_MAX_STACK_AND_LOCAL} or {@link #COMPUTE_NOTHING}.
+ * #COMPUTE_INSERTED_FRAMES}, {@link COMPUTE_MAX_STACK_AND_LOCAL_FROM_FRAMES}, {@link
+ * #COMPUTE_MAX_STACK_AND_LOCAL} or {@link #COMPUTE_NOTHING}.
*/
private final int compute;
@@ -904,26 +905,26 @@ public void visitIntInsn(final int opcode, final int operand) {
}
@Override
- public void visitVarInsn(final int opcode, final int var) {
+ public void visitVarInsn(final int opcode, final int varIndex) {
lastBytecodeOffset = code.length;
// Add the instruction to the bytecode of the method.
- if (var < 4 && opcode != Opcodes.RET) {
+ if (varIndex < 4 && opcode != Opcodes.RET) {
int optimizedOpcode;
if (opcode < Opcodes.ISTORE) {
- optimizedOpcode = Constants.ILOAD_0 + ((opcode - Opcodes.ILOAD) << 2) + var;
+ optimizedOpcode = Constants.ILOAD_0 + ((opcode - Opcodes.ILOAD) << 2) + varIndex;
} else {
- optimizedOpcode = Constants.ISTORE_0 + ((opcode - Opcodes.ISTORE) << 2) + var;
+ optimizedOpcode = Constants.ISTORE_0 + ((opcode - Opcodes.ISTORE) << 2) + varIndex;
}
code.putByte(optimizedOpcode);
- } else if (var >= 256) {
- code.putByte(Constants.WIDE).put12(opcode, var);
+ } else if (varIndex >= 256) {
+ code.putByte(Constants.WIDE).put12(opcode, varIndex);
} else {
- code.put11(opcode, var);
+ code.put11(opcode, varIndex);
}
// If needed, update the maximum stack size and number of locals, and stack map frames.
if (currentBasicBlock != null) {
if (compute == COMPUTE_ALL_FRAMES || compute == COMPUTE_INSERTED_FRAMES) {
- currentBasicBlock.frame.execute(opcode, var, null, null);
+ currentBasicBlock.frame.execute(opcode, varIndex, null, null);
} else {
if (opcode == Opcodes.RET) {
// No stack size delta.
@@ -945,9 +946,9 @@ public void visitVarInsn(final int opcode, final int var) {
|| opcode == Opcodes.DLOAD
|| opcode == Opcodes.LSTORE
|| opcode == Opcodes.DSTORE) {
- currentMaxLocals = var + 2;
+ currentMaxLocals = varIndex + 2;
} else {
- currentMaxLocals = var + 1;
+ currentMaxLocals = varIndex + 1;
}
if (currentMaxLocals > maxLocals) {
maxLocals = currentMaxLocals;
@@ -1307,21 +1308,21 @@ public void visitLdcInsn(final Object value) {
}
@Override
- public void visitIincInsn(final int var, final int increment) {
+ public void visitIincInsn(final int varIndex, final int increment) {
lastBytecodeOffset = code.length;
// Add the instruction to the bytecode of the method.
- if ((var > 255) || (increment > 127) || (increment < -128)) {
- code.putByte(Constants.WIDE).put12(Opcodes.IINC, var).putShort(increment);
+ if ((varIndex > 255) || (increment > 127) || (increment < -128)) {
+ code.putByte(Constants.WIDE).put12(Opcodes.IINC, varIndex).putShort(increment);
} else {
- code.putByte(Opcodes.IINC).put11(var, increment);
+ code.putByte(Opcodes.IINC).put11(varIndex, increment);
}
// If needed, update the maximum stack size and number of locals, and stack map frames.
if (currentBasicBlock != null
&& (compute == COMPUTE_ALL_FRAMES || compute == COMPUTE_INSERTED_FRAMES)) {
- currentBasicBlock.frame.execute(Opcodes.IINC, var, null, null);
+ currentBasicBlock.frame.execute(Opcodes.IINC, varIndex, null, null);
}
if (compute != COMPUTE_NOTHING) {
- int currentMaxLocals = var + 1;
+ int currentMaxLocals = varIndex + 1;
if (currentMaxLocals > maxLocals) {
maxLocals = currentMaxLocals;
}
diff --git a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ModuleVisitor.java b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ModuleVisitor.java
index 0089d06a4f..96675909fa 100644
--- a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ModuleVisitor.java
+++ b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ModuleVisitor.java
@@ -53,7 +53,7 @@ public abstract class ModuleVisitor {
* @param api the ASM API version implemented by this visitor. Must be one of {@link Opcodes#ASM6}
* or {@link Opcodes#ASM7}.
*/
- public ModuleVisitor(final int api) {
+ protected ModuleVisitor(final int api) {
this(api, null);
}
@@ -65,7 +65,7 @@ public ModuleVisitor(final int api) {
* @param moduleVisitor the module visitor to which this visitor must delegate method calls. May
* be null.
*/
- public ModuleVisitor(final int api, final ModuleVisitor moduleVisitor) {
+ protected ModuleVisitor(final int api, final ModuleVisitor moduleVisitor) {
if (api != Opcodes.ASM9
&& api != Opcodes.ASM8
&& api != Opcodes.ASM7
diff --git a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/Opcodes.java b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/Opcodes.java
index 7850f21013..0a591eccd8 100644
--- a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/Opcodes.java
+++ b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/Opcodes.java
@@ -284,6 +284,7 @@ public interface Opcodes {
int V16 = 0 << 16 | 60;
int V17 = 0 << 16 | 61;
int V18 = 0 << 16 | 62;
+ int V19 = 0 << 16 | 63;
/**
* Version flag indicating that the class is using 'preview' features.
diff --git a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/RecordComponentVisitor.java b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/RecordComponentVisitor.java
index bab13adeb3..65cf92c9c8 100644
--- a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/RecordComponentVisitor.java
+++ b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/RecordComponentVisitor.java
@@ -53,7 +53,7 @@ public abstract class RecordComponentVisitor {
* @param api the ASM API version implemented by this visitor. Must be one of {@link Opcodes#ASM8}
* or {@link Opcodes#ASM9}.
*/
- public RecordComponentVisitor(final int api) {
+ protected RecordComponentVisitor(final int api) {
this(api, null);
}
@@ -64,7 +64,7 @@ public RecordComponentVisitor(final int api) {
* @param recordComponentVisitor the record component visitor to which this visitor must delegate
* method calls. May be null.
*/
- public RecordComponentVisitor(
+ protected RecordComponentVisitor(
final int api, final RecordComponentVisitor recordComponentVisitor) {
if (api != Opcodes.ASM9
&& api != Opcodes.ASM8
diff --git a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/Type.java b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/Type.java
index dbe11cce59..ab8687e4e8 100644
--- a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/Type.java
+++ b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/Type.java
@@ -440,7 +440,7 @@ private static Type getTypeInternal(
case '(':
return new Type(METHOD, descriptorBuffer, descriptorBegin, descriptorEnd);
default:
- throw new IllegalArgumentException();
+ throw new IllegalArgumentException("Invalid descriptor: " + descriptorBuffer);
}
}
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/internal/scanning/AnnotationAcceptingListener.java b/core-server/src/main/java/org/glassfish/jersey/server/internal/scanning/AnnotationAcceptingListener.java
index 99c098134e..df41359f48 100644
--- a/core-server/src/main/java/org/glassfish/jersey/server/internal/scanning/AnnotationAcceptingListener.java
+++ b/core-server/src/main/java/org/glassfish/jersey/server/internal/scanning/AnnotationAcceptingListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022 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
@@ -303,7 +303,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.V18;
+ private static final int WARN_VERSION = Opcodes.V19;
private static final int INPUT_STREAM_DATA_CHUNK_SIZE = 4096;
private final byte[] b;
diff --git a/core-server/src/main/resources/META-INF/NOTICE.markdown b/core-server/src/main/resources/META-INF/NOTICE.markdown
index f975c4963c..9399ca7152 100644
--- a/core-server/src/main/resources/META-INF/NOTICE.markdown
+++ b/core-server/src/main/resources/META-INF/NOTICE.markdown
@@ -36,7 +36,7 @@ org.glassfish.jersey.server.internal.monitoring.core
* Copyright (c) 2015-2018 Oracle and/or its affiliates. All rights reserved.
* Copyright 2010-2013 Coda Hale and Yammer, Inc.
-org.objectweb.asm Version 8.0
+org.objectweb.asm Version 9.3
* License: Modified BSD (https://asm.ow2.io/license.html)
* Copyright: (c) 2000-2011 INRIA, France Telecom. All rights reserved.
diff --git a/pom.xml b/pom.xml
index 4f2ea78880..983da586ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2108,7 +2108,7 @@
${project.version}
- 9.2
+ 9.3
2.3.6
1.1
2.0.2
From f40c630b60f018da7938d63895f5c29ef13ce0f5 Mon Sep 17 00:00:00 2001
From: jansupol
Date: Fri, 20 May 2022 20:22:29 +0200
Subject: [PATCH 043/305] Prevent LoggingFeature timeout on context#hasEntity
for HEADERS_ONLY
Signed-off-by: jansupol
---
.../jersey/logging/ClientLoggingFilter.java | 4 +-
.../jersey/logging/ServerLoggingFilter.java | 4 +-
.../jersey/logging/HasEntityTimeoutTest.java | 277 ++++++++++++++++++
3 files changed, 281 insertions(+), 4 deletions(-)
create mode 100644 core-common/src/test/java/org/glassfish/jersey/logging/HasEntityTimeoutTest.java
diff --git a/core-common/src/main/java/org/glassfish/jersey/logging/ClientLoggingFilter.java b/core-common/src/main/java/org/glassfish/jersey/logging/ClientLoggingFilter.java
index b250915db6..8b9b6fb042 100644
--- a/core-common/src/main/java/org/glassfish/jersey/logging/ClientLoggingFilter.java
+++ b/core-common/src/main/java/org/glassfish/jersey/logging/ClientLoggingFilter.java
@@ -83,7 +83,7 @@ public void filter(final ClientRequestContext context) throws IOException {
printRequestLine(b, "Sending client request", id, context.getMethod(), context.getUri());
printPrefixedHeaders(b, id, REQUEST_PREFIX, context.getStringHeaders());
- if (context.hasEntity() && printEntity(verbosity, context.getMediaType())) {
+ if (printEntity(verbosity, context.getMediaType()) && context.hasEntity()) {
final OutputStream stream = new LoggingStream(b, context.getEntityStream());
context.setEntityStream(stream);
context.setProperty(ENTITY_LOGGER_PROPERTY, stream);
@@ -107,7 +107,7 @@ public void filter(final ClientRequestContext requestContext, final ClientRespon
printResponseLine(b, "Client response received", id, responseContext.getStatus());
printPrefixedHeaders(b, id, RESPONSE_PREFIX, responseContext.getHeaders());
- if (responseContext.hasEntity() && printEntity(verbosity, responseContext.getMediaType())) {
+ if (printEntity(verbosity, responseContext.getMediaType()) && responseContext.hasEntity()) {
responseContext.setEntityStream(logInboundEntity(b, responseContext.getEntityStream(),
MessageUtils.getCharset(responseContext.getMediaType())));
}
diff --git a/core-common/src/main/java/org/glassfish/jersey/logging/ServerLoggingFilter.java b/core-common/src/main/java/org/glassfish/jersey/logging/ServerLoggingFilter.java
index 87cac240c1..b0f8523b7c 100644
--- a/core-common/src/main/java/org/glassfish/jersey/logging/ServerLoggingFilter.java
+++ b/core-common/src/main/java/org/glassfish/jersey/logging/ServerLoggingFilter.java
@@ -83,7 +83,7 @@ public void filter(final ContainerRequestContext context) throws IOException {
printRequestLine(b, "Server has received a request", id, context.getMethod(), context.getUriInfo().getRequestUri());
printPrefixedHeaders(b, id, REQUEST_PREFIX, context.getHeaders());
- if (context.hasEntity() && printEntity(verbosity, context.getMediaType())) {
+ if (printEntity(verbosity, context.getMediaType()) && context.hasEntity()) {
context.setEntityStream(
logInboundEntity(b, context.getEntityStream(), MessageUtils.getCharset(context.getMediaType())));
}
@@ -105,7 +105,7 @@ public void filter(final ContainerRequestContext requestContext, final Container
printResponseLine(b, "Server responded with a response", id, responseContext.getStatus());
printPrefixedHeaders(b, id, RESPONSE_PREFIX, responseContext.getStringHeaders());
- if (responseContext.hasEntity() && printEntity(verbosity, responseContext.getMediaType())) {
+ if (printEntity(verbosity, responseContext.getMediaType()) && responseContext.hasEntity()) {
final OutputStream stream = new LoggingStream(b, responseContext.getEntityStream());
responseContext.setEntityStream(stream);
requestContext.setProperty(ENTITY_LOGGER_PROPERTY, stream);
diff --git a/core-common/src/test/java/org/glassfish/jersey/logging/HasEntityTimeoutTest.java b/core-common/src/test/java/org/glassfish/jersey/logging/HasEntityTimeoutTest.java
new file mode 100644
index 0000000000..35459f9422
--- /dev/null
+++ b/core-common/src/test/java/org/glassfish/jersey/logging/HasEntityTimeoutTest.java
@@ -0,0 +1,277 @@
+/*
+ * Copyright (c) 2022 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
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.jersey.logging;
+
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientResponseContext;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.UriInfo;
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.net.SocketTimeoutException;
+import java.net.URI;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
+public class HasEntityTimeoutTest {
+
+ private enum DirectionType {
+ INBOUND,
+ OUTBOUND
+ }
+
+ private static class UriInfoHandler implements InvocationHandler {
+
+ @Override
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ switch (method.getName()) {
+ case "getRequestUri":
+ return URI.create("http://localhost:8080/get");
+ }
+ return null;
+ }
+ }
+
+ private static class RequestResponseHandler implements InvocationHandler {
+ private final DirectionType type;
+
+ private RequestResponseHandler(DirectionType type) {
+ this.type = type;
+ }
+
+ @Override
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ switch (method.getName()) {
+ case "hasEntity":
+ throw new ProcessingException(new SocketTimeoutException("Read timed out"));
+ case "getUri":
+ return URI.create("http://localhost:8080");
+ case "getStringHeaders":
+ case "getHeaders":
+ return new MultivaluedHashMap();
+ case "getMethod":
+ return "GET";
+ case "getMediaType":
+ return MediaType.SERVER_SENT_EVENTS_TYPE;
+ case "getEntityStream":
+ return type == DirectionType.OUTBOUND
+ ? new ByteArrayOutputStream()
+ : new ByteArrayInputStream("entity".getBytes());
+ case "getStatus":
+ return 200;
+ case "getUriInfo":
+ return Proxy.newProxyInstance(
+ UriInfo.class.getClassLoader(),
+ new Class[]{UriInfo.class},
+ new UriInfoHandler());
+ }
+ return null;
+ }
+ }
+
+ @Test
+ public void testClientFilterTimedOut() throws IOException {
+ ClientLoggingFilter loggingFilter = new ClientLoggingFilter(
+ LoggingFeature.builder()
+ .withLogger(Logger.getLogger(LoggingFeature.DEFAULT_LOGGER_NAME))
+ .level(Level.INFO)
+ .verbosity(LoggingFeature.Verbosity.HEADERS_ONLY)
+ .maxEntitySize(10)
+ );
+
+ ClientRequestContext clientRequestContext = (ClientRequestContext) Proxy.newProxyInstance(
+ ClientRequestContext.class.getClassLoader(),
+ new Class[]{ClientRequestContext.class},
+ new RequestResponseHandler(DirectionType.OUTBOUND));
+ loggingFilter.filter(clientRequestContext);
+ }
+
+ @Test
+ public void testClientFilterTimedOutException() throws IOException {
+ ClientLoggingFilter loggingFilter = new ClientLoggingFilter(
+ LoggingFeature.builder()
+ .withLogger(Logger.getLogger(LoggingFeature.DEFAULT_LOGGER_NAME))
+ .level(Level.INFO)
+ .verbosity(LoggingFeature.Verbosity.PAYLOAD_ANY)
+ .maxEntitySize(10)
+ );
+
+ ClientRequestContext clientRequestContext = (ClientRequestContext) Proxy.newProxyInstance(
+ ClientRequestContext.class.getClassLoader(),
+ new Class[]{ClientRequestContext.class},
+ new RequestResponseHandler(DirectionType.OUTBOUND));
+ try {
+ loggingFilter.filter(clientRequestContext);
+ throw new RuntimeException("The expected exception has not been thrown");
+ } catch (ProcessingException pe) {
+ // expected
+ }
+ }
+
+ @Test
+ public void testClientFilterResponseTimedOut() throws IOException {
+ ClientLoggingFilter loggingFilter = new ClientLoggingFilter(
+ LoggingFeature.builder()
+ .withLogger(Logger.getLogger(LoggingFeature.DEFAULT_LOGGER_NAME))
+ .level(Level.INFO)
+ .verbosity(LoggingFeature.Verbosity.HEADERS_ONLY)
+ .maxEntitySize(10)
+ );
+
+ ClientRequestContext clientRequestContext = (ClientRequestContext) Proxy.newProxyInstance(
+ ClientRequestContext.class.getClassLoader(),
+ new Class[]{ClientRequestContext.class},
+ new RequestResponseHandler(DirectionType.OUTBOUND));
+
+ ClientResponseContext clientResponseContext = (ClientResponseContext) Proxy.newProxyInstance(
+ ClientResponseContext.class.getClassLoader(),
+ new Class[]{ClientResponseContext.class},
+ new RequestResponseHandler(DirectionType.INBOUND));
+ loggingFilter.filter(clientRequestContext, clientResponseContext);
+ }
+
+ @Test
+ public void testClientFilterResponseTimedOutException() throws IOException {
+ ClientLoggingFilter loggingFilter = new ClientLoggingFilter(
+ LoggingFeature.builder()
+ .withLogger(Logger.getLogger(LoggingFeature.DEFAULT_LOGGER_NAME))
+ .level(Level.INFO)
+ .verbosity(LoggingFeature.Verbosity.PAYLOAD_ANY)
+ .maxEntitySize(10)
+ );
+
+ ClientRequestContext clientRequestContext = (ClientRequestContext) Proxy.newProxyInstance(
+ ClientRequestContext.class.getClassLoader(),
+ new Class[]{ClientRequestContext.class},
+ new RequestResponseHandler(DirectionType.OUTBOUND));
+
+ ClientResponseContext clientResponseContext = (ClientResponseContext) Proxy.newProxyInstance(
+ ClientResponseContext.class.getClassLoader(),
+ new Class[]{ClientResponseContext.class},
+ new RequestResponseHandler(DirectionType.INBOUND));
+
+ try {
+ loggingFilter.filter(clientRequestContext, clientResponseContext);
+ throw new RuntimeException("The expected exception has not been thrown");
+ } catch (ProcessingException pe) {
+ // expected
+ }
+ }
+
+ @Test
+ public void testServerFilterTimedOut() throws IOException {
+ ServerLoggingFilter loggingFilter = new ServerLoggingFilter(
+ LoggingFeature.builder()
+ .withLogger(Logger.getLogger(LoggingFeature.DEFAULT_LOGGER_NAME))
+ .level(Level.INFO)
+ .verbosity(LoggingFeature.Verbosity.HEADERS_ONLY)
+ .maxEntitySize(10)
+ );
+
+ ContainerRequestContext containerRequestContext = (ContainerRequestContext) Proxy.newProxyInstance(
+ ContainerRequestContext.class.getClassLoader(),
+ new Class[]{ContainerRequestContext.class},
+ new RequestResponseHandler(DirectionType.INBOUND));
+ loggingFilter.filter(containerRequestContext);
+ }
+
+ @Test
+ public void testServerFilterTimedOutException() throws IOException {
+ ServerLoggingFilter loggingFilter = new ServerLoggingFilter(
+ LoggingFeature.builder()
+ .withLogger(Logger.getLogger(LoggingFeature.DEFAULT_LOGGER_NAME))
+ .level(Level.INFO)
+ .verbosity(LoggingFeature.Verbosity.PAYLOAD_ANY)
+ .maxEntitySize(10)
+ );
+
+ ContainerRequestContext containerRequestContext = (ContainerRequestContext) Proxy.newProxyInstance(
+ ContainerRequestContext.class.getClassLoader(),
+ new Class[]{ContainerRequestContext.class},
+ new RequestResponseHandler(DirectionType.INBOUND));
+
+ try {
+ loggingFilter.filter(containerRequestContext);
+ throw new RuntimeException("The expected exception has not been thrown");
+ } catch (ProcessingException pe) {
+ // expected
+ }
+ }
+
+ @Test
+ public void testServerFilterResponseTimedOut() throws IOException {
+ ServerLoggingFilter loggingFilter = new ServerLoggingFilter(
+ LoggingFeature.builder()
+ .withLogger(Logger.getLogger(LoggingFeature.DEFAULT_LOGGER_NAME))
+ .level(Level.INFO)
+ .verbosity(LoggingFeature.Verbosity.HEADERS_ONLY)
+ .maxEntitySize(10)
+ );
+
+ ContainerRequestContext containerRequestContext = (ContainerRequestContext) Proxy.newProxyInstance(
+ ContainerRequestContext.class.getClassLoader(),
+ new Class[]{ContainerRequestContext.class},
+ new RequestResponseHandler(DirectionType.INBOUND));
+
+ ContainerResponseContext containerResponseContext = (ContainerResponseContext) Proxy.newProxyInstance(
+ ContainerResponseContext.class.getClassLoader(),
+ new Class[]{ContainerResponseContext.class},
+ new RequestResponseHandler(DirectionType.OUTBOUND));
+
+ loggingFilter.filter(containerRequestContext, containerResponseContext);
+ }
+
+ @Test
+ public void testServerFilterResponseTimedOutException() throws IOException {
+ ServerLoggingFilter loggingFilter = new ServerLoggingFilter(
+ LoggingFeature.builder()
+ .withLogger(Logger.getLogger(LoggingFeature.DEFAULT_LOGGER_NAME))
+ .level(Level.INFO)
+ .verbosity(LoggingFeature.Verbosity.PAYLOAD_ANY)
+ .maxEntitySize(10)
+ );
+
+ ContainerRequestContext containerRequestContext = (ContainerRequestContext) Proxy.newProxyInstance(
+ ContainerRequestContext.class.getClassLoader(),
+ new Class[]{ContainerRequestContext.class},
+ new RequestResponseHandler(DirectionType.INBOUND));
+
+ ContainerResponseContext containerResponseContext = (ContainerResponseContext) Proxy.newProxyInstance(
+ ContainerResponseContext.class.getClassLoader(),
+ new Class[]{ContainerResponseContext.class},
+ new RequestResponseHandler(DirectionType.OUTBOUND));
+
+ try {
+ loggingFilter.filter(containerRequestContext, containerResponseContext);
+ throw new RuntimeException("The expected exception has not been thrown");
+ } catch (ProcessingException pe) {
+ // expected
+ }
+ }
+
+}
From bf6dd3db9f52f2511ed66430a5d51a6464754ace Mon Sep 17 00:00:00 2001
From: jansupol
Date: Thu, 26 May 2022 14:31:55 +0200
Subject: [PATCH 044/305] Remove Spring 4 from Bom pom
Signed-off-by: jansupol
---
bom/pom.xml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 235c34e779..eebaa713f3 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -198,11 +198,6 @@
jersey-servlet-portability
${project.version}
-
- org.glassfish.jersey.ext
- jersey-spring4
- ${project.version}
-
org.glassfish.jersey.ext
jersey-spring5
From ff90a43bec44c444878afbac68dcb346798ec211 Mon Sep 17 00:00:00 2001
From: jansupol
Date: Mon, 6 Jun 2022 14:55:50 +0200
Subject: [PATCH 045/305] Possibly use jersey WebServer with
SeBootstrap.Configurator Document SeBootstrap API
Signed-off-by: jansupol
---
.../httpserver/GrizzlyHttpServerProvider.java | 17 +-
.../GrizzlyHttpServerProviderTest.java | 12 +-
.../jersey/jdkhttp/JdkHttpServerProvider.java | 15 +-
.../jdkhttp/JdkHttpServerProviderTest.java | 12 +-
.../jersey/jetty/JettyHttpServerProvider.java | 17 +-
.../jetty/JettyHttpServerProviderTest.java | 11 +-
.../httpserver/NettyHttpServerProvider.java | 15 +-
.../NettyHttpServerProviderTest.java | 11 +-
.../simple/SimpleHttpServerProvider.java | 15 +-
.../simple/SimpleHttpServerProviderTest.java | 11 +-
.../JerseySeBootstrapConfiguration.java | 2 +-
.../jersey/server/ServerProperties.java | 4 +-
.../jersey/server/WebServerFactory.java | 7 +-
.../server/internal/RuntimeDelegateImpl.java | 10 +-
.../jersey/server/spi/WebServerProvider.java | 29 +++-
.../server/spi/WebServerProviderTest.java | 159 ++++++++++++++++++
docs/src/main/docbook/appendix-properties.xml | 72 ++++++++
docs/src/main/docbook/deployment.xml | 82 +++++++++
docs/src/main/docbook/jersey.ent | 11 ++
.../jmockit/server/WebServerFactoryTest.java | 10 +-
20 files changed, 426 insertions(+), 96 deletions(-)
create mode 100644 core-server/src/test/java/org/glassfish/jersey/server/spi/WebServerProviderTest.java
diff --git a/containers/grizzly2-http/src/main/java/org/glassfish/jersey/grizzly2/httpserver/GrizzlyHttpServerProvider.java b/containers/grizzly2-http/src/main/java/org/glassfish/jersey/grizzly2/httpserver/GrizzlyHttpServerProvider.java
index a3f911c61f..f9cfac2163 100644
--- a/containers/grizzly2-http/src/main/java/org/glassfish/jersey/grizzly2/httpserver/GrizzlyHttpServerProvider.java
+++ b/containers/grizzly2-http/src/main/java/org/glassfish/jersey/grizzly2/httpserver/GrizzlyHttpServerProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -17,6 +17,7 @@
package org.glassfish.jersey.grizzly2.httpserver;
+import jakarta.ws.rs.SeBootstrap;
import jakarta.ws.rs.core.Application;
import org.glassfish.grizzly.http.server.HttpServer;
@@ -33,18 +34,18 @@
public final class GrizzlyHttpServerProvider implements WebServerProvider {
@Override
- public final T createServer(final Class type, final Application application,
- final JerseySeBootstrapConfiguration configuration) {
- return GrizzlyHttpServer.class == type || WebServer.class == type
- ? type.cast(new GrizzlyHttpServer(application, configuration))
+ public T createServer(final Class type, final Application application,
+ final SeBootstrap.Configuration configuration) {
+ return WebServerProvider.isSupportedWebServer(GrizzlyHttpServer.class, type, configuration)
+ ? type.cast(new GrizzlyHttpServer(application, JerseySeBootstrapConfiguration.from(configuration)))
: null;
}
@Override
public T createServer(Class type, Class applicationClass,
- JerseySeBootstrapConfiguration configuration) {
- return GrizzlyHttpServer.class == type || WebServer.class == type
- ? type.cast(new GrizzlyHttpServer(applicationClass, configuration))
+ SeBootstrap.Configuration configuration) {
+ return WebServerProvider.isSupportedWebServer(GrizzlyHttpServer.class, type, configuration)
+ ? type.cast(new GrizzlyHttpServer(applicationClass, JerseySeBootstrapConfiguration.from(configuration)))
: null;
}
}
diff --git a/containers/grizzly2-http/src/test/java/org/glassfish/jersey/grizzly2/httpserver/GrizzlyHttpServerProviderTest.java b/containers/grizzly2-http/src/test/java/org/glassfish/jersey/grizzly2/httpserver/GrizzlyHttpServerProviderTest.java
index a7310d048d..6f933cddcd 100644
--- a/containers/grizzly2-http/src/test/java/org/glassfish/jersey/grizzly2/httpserver/GrizzlyHttpServerProviderTest.java
+++ b/containers/grizzly2-http/src/test/java/org/glassfish/jersey/grizzly2/httpserver/GrizzlyHttpServerProviderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -17,7 +17,6 @@
package org.glassfish.jersey.grizzly2.httpserver;
-import static java.lang.Boolean.FALSE;
import static java.lang.Boolean.TRUE;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
@@ -45,7 +44,6 @@
import org.glassfish.grizzly.http.server.HttpServer;
import org.glassfish.jersey.internal.util.PropertiesHelper;
-import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
import org.glassfish.jersey.server.ServerProperties;
import org.glassfish.jersey.server.spi.Container;
import org.glassfish.jersey.server.spi.WebServer;
@@ -82,10 +80,9 @@ private void shouldProvideServer(final Object application, final Resource resour
final SeBootstrap.Configuration configuration = configuration(getPort());
// when
- final JerseySeBootstrapConfiguration jerseySeConfig = JerseySeBootstrapConfiguration.from(configuration);
final WebServer webServer = Application.class.isInstance(application)
- ? webServerProvider.createServer(WebServer.class, (Application) application, jerseySeConfig)
- : webServerProvider.createServer(WebServer.class, (Class) application, jerseySeConfig);
+ ? webServerProvider.createServer(WebServer.class, (Application) application, configuration)
+ : webServerProvider.createServer(WebServer.class, (Class) application, configuration);
final Object nativeHandle = webServer.unwrap(Object.class);
final CompletionStage start = webServer.start();
final Object startResult = start.toCompletableFuture().get();
@@ -157,8 +154,7 @@ public void shouldScanFreePort() {
final SeBootstrap.Configuration configuration = configuration(SeBootstrap.Configuration.FREE_PORT);
// when
- final JerseySeBootstrapConfiguration jerseySeConfig = JerseySeBootstrapConfiguration.from(configuration);
- final WebServer webServer = webServerProvider.createServer(WebServer.class, application, jerseySeConfig);
+ final WebServer webServer = webServerProvider.createServer(WebServer.class, application, configuration);
// then
assertThat(webServer.port(), is(greaterThan(0)));
diff --git a/containers/jdk-http/src/main/java/org/glassfish/jersey/jdkhttp/JdkHttpServerProvider.java b/containers/jdk-http/src/main/java/org/glassfish/jersey/jdkhttp/JdkHttpServerProvider.java
index 4510c53fc8..b9edb3022c 100644
--- a/containers/jdk-http/src/main/java/org/glassfish/jersey/jdkhttp/JdkHttpServerProvider.java
+++ b/containers/jdk-http/src/main/java/org/glassfish/jersey/jdkhttp/JdkHttpServerProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -17,6 +17,7 @@
package org.glassfish.jersey.jdkhttp;
+import jakarta.ws.rs.SeBootstrap;
import jakarta.ws.rs.core.Application;
import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
@@ -35,17 +36,17 @@ public final class JdkHttpServerProvider implements WebServerProvider {
@Override
public T createServer(final Class type, final Application application,
- final JerseySeBootstrapConfiguration configuration) {
- return JdkHttpServer.class == type || WebServer.class == type
- ? type.cast(new JdkHttpServer(application, configuration))
+ final SeBootstrap.Configuration configuration) {
+ return WebServerProvider.isSupportedWebServer(JdkHttpServer.class, type, configuration)
+ ? type.cast(new JdkHttpServer(application, JerseySeBootstrapConfiguration.from(configuration)))
: null;
}
@Override
public T createServer(final Class type, final Class applicationClass,
- final JerseySeBootstrapConfiguration configuration) {
- return JdkHttpServer.class == type || WebServer.class == type
- ? type.cast(new JdkHttpServer(applicationClass, configuration))
+ final SeBootstrap.Configuration configuration) {
+ return WebServerProvider.isSupportedWebServer(JdkHttpServer.class, type, configuration)
+ ? type.cast(new JdkHttpServer(applicationClass, JerseySeBootstrapConfiguration.from(configuration)))
: null;
}
}
diff --git a/containers/jdk-http/src/test/java/org/glassfish/jersey/jdkhttp/JdkHttpServerProviderTest.java b/containers/jdk-http/src/test/java/org/glassfish/jersey/jdkhttp/JdkHttpServerProviderTest.java
index ade52847c5..c37f7670b1 100644
--- a/containers/jdk-http/src/test/java/org/glassfish/jersey/jdkhttp/JdkHttpServerProviderTest.java
+++ b/containers/jdk-http/src/test/java/org/glassfish/jersey/jdkhttp/JdkHttpServerProviderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -18,7 +18,6 @@
package org.glassfish.jersey.jdkhttp;
import static java.lang.Boolean.FALSE;
-import static java.lang.Boolean.TRUE;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.Matchers.greaterThan;
@@ -44,7 +43,6 @@
import jakarta.ws.rs.core.UriBuilder;
import org.glassfish.jersey.internal.util.PropertiesHelper;
-import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
import org.glassfish.jersey.server.ServerProperties;
import org.glassfish.jersey.server.spi.Container;
import org.glassfish.jersey.server.spi.WebServer;
@@ -83,10 +81,9 @@ private void shouldProvideServer(final Object application, final Resource resour
final SeBootstrap.Configuration configuration = configuration(getPort());
// when
- final JerseySeBootstrapConfiguration jerseySeConfig = JerseySeBootstrapConfiguration.from(configuration);
final WebServer webServer = Application.class.isInstance(application)
- ? webServerProvider.createServer(WebServer.class, (Application) application, jerseySeConfig)
- : webServerProvider.createServer(WebServer.class, (Class) application, jerseySeConfig);
+ ? webServerProvider.createServer(WebServer.class, (Application) application, configuration)
+ : webServerProvider.createServer(WebServer.class, (Class) application, configuration);
final Object nativeHandle = webServer.unwrap(Object.class);
final CompletionStage start = webServer.start();
final Object startResult = start.toCompletableFuture().get();
@@ -158,8 +155,7 @@ public final void shouldScanFreePort() throws InterruptedException, ExecutionExc
final SeBootstrap.Configuration configuration = configuration(SeBootstrap.Configuration.FREE_PORT);
// when
- final JerseySeBootstrapConfiguration jerseySeConfig = JerseySeBootstrapConfiguration.from(configuration);
- final WebServer webServer = webServerProvider.createServer(WebServer.class, application, jerseySeConfig);
+ final WebServer webServer = webServerProvider.createServer(WebServer.class, application, configuration);
// then
assertThat(webServer.port(), is(greaterThan(0)));
diff --git a/containers/jetty-http/src/main/java/org/glassfish/jersey/jetty/JettyHttpServerProvider.java b/containers/jetty-http/src/main/java/org/glassfish/jersey/jetty/JettyHttpServerProvider.java
index fe776b9f40..5122435d85 100644
--- a/containers/jetty-http/src/main/java/org/glassfish/jersey/jetty/JettyHttpServerProvider.java
+++ b/containers/jetty-http/src/main/java/org/glassfish/jersey/jetty/JettyHttpServerProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -17,6 +17,7 @@
package org.glassfish.jersey.jetty;
+import jakarta.ws.rs.SeBootstrap;
import jakarta.ws.rs.core.Application;
import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
@@ -33,18 +34,18 @@
public final class JettyHttpServerProvider implements WebServerProvider {
@Override
- public final T createServer(final Class type, final Application application,
- final JerseySeBootstrapConfiguration configuration) {
- return JettyHttpServer.class == type || WebServer.class == type
- ? type.cast(new JettyHttpServer(application, configuration))
+ public T createServer(final Class type, final Application application,
+ final SeBootstrap.Configuration configuration) {
+ return WebServerProvider.isSupportedWebServer(JettyHttpServer.class, type, configuration)
+ ? type.cast(new JettyHttpServer(application, JerseySeBootstrapConfiguration.from(configuration)))
: null;
}
@Override
public T createServer(final Class type, final Class applicationClass,
- final JerseySeBootstrapConfiguration configuration) {
- return JettyHttpServer.class == type || WebServer.class == type
- ? type.cast(new JettyHttpServer(applicationClass, configuration))
+ final SeBootstrap.Configuration configuration) {
+ return WebServerProvider.isSupportedWebServer(JettyHttpServer.class, type, configuration)
+ ? type.cast(new JettyHttpServer(applicationClass, JerseySeBootstrapConfiguration.from(configuration)))
: null;
}
}
diff --git a/containers/jetty-http/src/test/java/org/glassfish/jersey/jetty/JettyHttpServerProviderTest.java b/containers/jetty-http/src/test/java/org/glassfish/jersey/jetty/JettyHttpServerProviderTest.java
index 1aa8b45495..81c1bd6c84 100644
--- a/containers/jetty-http/src/test/java/org/glassfish/jersey/jetty/JettyHttpServerProviderTest.java
+++ b/containers/jetty-http/src/test/java/org/glassfish/jersey/jetty/JettyHttpServerProviderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -45,7 +45,6 @@
import jakarta.ws.rs.core.UriBuilder;
import org.glassfish.jersey.internal.util.PropertiesHelper;
-import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
import org.glassfish.jersey.server.ServerProperties;
import org.glassfish.jersey.server.spi.Container;
import org.glassfish.jersey.server.spi.WebServer;
@@ -82,10 +81,9 @@ private void shouldProvideServer(final Object application, final Resource resour
final SeBootstrap.Configuration configuration = configuration(getPort(), FALSE);
// when
- final JerseySeBootstrapConfiguration jerseySeConfig = JerseySeBootstrapConfiguration.from(configuration);
final WebServer webServer = Application.class.isInstance(application)
- ? webServerProvider.createServer(WebServer.class, (Application) application, jerseySeConfig)
- : webServerProvider.createServer(WebServer.class, (Class) application, jerseySeConfig);
+ ? webServerProvider.createServer(WebServer.class, (Application) application, configuration)
+ : webServerProvider.createServer(WebServer.class, (Class) application, configuration);
final Object nativeHandle = webServer.unwrap(Object.class);
final CompletionStage start = webServer.start();
final Object startResult = start.toCompletableFuture().get();
@@ -157,8 +155,7 @@ public final void shouldScanFreePort() throws InterruptedException, ExecutionExc
final SeBootstrap.Configuration configuration = configuration(SeBootstrap.Configuration.FREE_PORT, TRUE);
// when
- final JerseySeBootstrapConfiguration jerseySeConfig = JerseySeBootstrapConfiguration.from(configuration);
- final WebServer webServer = webServerProvider.createServer(WebServer.class, application, jerseySeConfig);
+ final WebServer webServer = webServerProvider.createServer(WebServer.class, application, configuration);
// then
assertThat(webServer.port(), is(greaterThan(0)));
diff --git a/containers/netty-http/src/main/java/org/glassfish/jersey/netty/httpserver/NettyHttpServerProvider.java b/containers/netty-http/src/main/java/org/glassfish/jersey/netty/httpserver/NettyHttpServerProvider.java
index 34c700e104..0749369a1f 100644
--- a/containers/netty-http/src/main/java/org/glassfish/jersey/netty/httpserver/NettyHttpServerProvider.java
+++ b/containers/netty-http/src/main/java/org/glassfish/jersey/netty/httpserver/NettyHttpServerProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -17,6 +17,7 @@
package org.glassfish.jersey.netty.httpserver;
+import jakarta.ws.rs.SeBootstrap;
import jakarta.ws.rs.core.Application;
import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
@@ -35,17 +36,17 @@ public final class NettyHttpServerProvider implements WebServerProvider {
@Override
public T createServer(final Class type, final Application application,
- final JerseySeBootstrapConfiguration configuration) {
- return NettyHttpServer.class == type || WebServer.class == type
- ? type.cast(new NettyHttpServer(application, configuration))
+ final SeBootstrap.Configuration configuration) {
+ return WebServerProvider.isSupportedWebServer(NettyHttpServer.class, type, configuration)
+ ? type.cast(new NettyHttpServer(application, JerseySeBootstrapConfiguration.from(configuration)))
: null;
}
@Override
public T createServer(final Class type, final Class applicationClass,
- final JerseySeBootstrapConfiguration configuration) {
- return NettyHttpServer.class == type || WebServer.class == type
- ? type.cast(new NettyHttpServer(applicationClass, configuration))
+ final SeBootstrap.Configuration configuration) {
+ return WebServerProvider.isSupportedWebServer(NettyHttpServer.class, type, configuration)
+ ? type.cast(new NettyHttpServer(applicationClass, JerseySeBootstrapConfiguration.from(configuration)))
: null;
}
}
diff --git a/containers/netty-http/src/test/java/org/glassfish/jersey/netty/httpserver/NettyHttpServerProviderTest.java b/containers/netty-http/src/test/java/org/glassfish/jersey/netty/httpserver/NettyHttpServerProviderTest.java
index 3837377475..69b2e7e4cd 100644
--- a/containers/netty-http/src/test/java/org/glassfish/jersey/netty/httpserver/NettyHttpServerProviderTest.java
+++ b/containers/netty-http/src/test/java/org/glassfish/jersey/netty/httpserver/NettyHttpServerProviderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -44,7 +44,6 @@
import jakarta.ws.rs.core.UriBuilder;
import org.glassfish.jersey.internal.util.PropertiesHelper;
-import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
import org.glassfish.jersey.server.ServerProperties;
import org.glassfish.jersey.server.spi.Container;
import org.glassfish.jersey.server.spi.WebServer;
@@ -84,10 +83,9 @@ private void shouldProvideServer(final Object application, final Resource resour
final SeBootstrap.Configuration configuration = configuration(getPort(), FALSE);
// when
- final JerseySeBootstrapConfiguration jerseySeConfig = JerseySeBootstrapConfiguration.from(configuration);
final WebServer webServer = Application.class.isInstance(application)
- ? webServerProvider.createServer(WebServer.class, (Application) application, jerseySeConfig)
- : webServerProvider.createServer(WebServer.class, (Class) application, jerseySeConfig);
+ ? webServerProvider.createServer(WebServer.class, (Application) application, configuration)
+ : webServerProvider.createServer(WebServer.class, (Class) application, configuration);
final Object nativeHandle = webServer.unwrap(Object.class);
final CompletionStage start = webServer.start();
final Object startResult = start.toCompletableFuture().get();
@@ -160,8 +158,7 @@ public final void shouldScanFreePort() throws InterruptedException, ExecutionExc
final SeBootstrap.Configuration configuration = configuration(SeBootstrap.Configuration.FREE_PORT, TRUE);
// when
- final JerseySeBootstrapConfiguration jerseySeConfig = JerseySeBootstrapConfiguration.from(configuration);
- final WebServer webServer = webServerProvider.createServer(WebServer.class, application, jerseySeConfig);
+ final WebServer webServer = webServerProvider.createServer(WebServer.class, application, configuration);
// then
assertThat(webServer.port(), is(greaterThan(0)));
diff --git a/containers/simple-http/src/main/java/org/glassfish/jersey/simple/SimpleHttpServerProvider.java b/containers/simple-http/src/main/java/org/glassfish/jersey/simple/SimpleHttpServerProvider.java
index c4a26a7d98..33bd6a7dc5 100644
--- a/containers/simple-http/src/main/java/org/glassfish/jersey/simple/SimpleHttpServerProvider.java
+++ b/containers/simple-http/src/main/java/org/glassfish/jersey/simple/SimpleHttpServerProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -17,6 +17,7 @@
package org.glassfish.jersey.simple;
+import jakarta.ws.rs.SeBootstrap;
import jakarta.ws.rs.core.Application;
import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
@@ -33,17 +34,17 @@ public final class SimpleHttpServerProvider implements WebServerProvider {
@Override
public T createServer(final Class type, final Application application,
- final JerseySeBootstrapConfiguration configuration) {
- return SimpleHttpServer.class == type || WebServer.class == type
- ? type.cast(new SimpleHttpServer(application, configuration))
+ final SeBootstrap.Configuration configuration) {
+ return WebServerProvider.isSupportedWebServer(SimpleHttpServer.class, type, configuration)
+ ? type.cast(new SimpleHttpServer(application, JerseySeBootstrapConfiguration.from(configuration)))
: null;
}
@Override
public T createServer(final Class type, final Class applicationClass,
- final JerseySeBootstrapConfiguration configuration) {
- return SimpleHttpServer.class == type || WebServer.class == type
- ? type.cast(new SimpleHttpServer(applicationClass, configuration))
+ final SeBootstrap.Configuration configuration) {
+ return WebServerProvider.isSupportedWebServer(SimpleHttpServer.class, type, configuration)
+ ? type.cast(new SimpleHttpServer(applicationClass, JerseySeBootstrapConfiguration.from(configuration)))
: null;
}
}
diff --git a/containers/simple-http/src/test/java/org/glassfish/jersey/simple/SimpleHttpServerProviderTest.java b/containers/simple-http/src/test/java/org/glassfish/jersey/simple/SimpleHttpServerProviderTest.java
index 02314ea784..c32e77caac 100644
--- a/containers/simple-http/src/test/java/org/glassfish/jersey/simple/SimpleHttpServerProviderTest.java
+++ b/containers/simple-http/src/test/java/org/glassfish/jersey/simple/SimpleHttpServerProviderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -44,7 +44,6 @@
import jakarta.ws.rs.core.UriBuilder;
import org.glassfish.jersey.internal.util.PropertiesHelper;
-import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
import org.glassfish.jersey.server.ServerProperties;
import org.glassfish.jersey.server.spi.Container;
import org.glassfish.jersey.server.spi.WebServer;
@@ -82,10 +81,9 @@ private void shouldProvideServer(final Object application, final Resource resour
final SeBootstrap.Configuration configuration = configuration(getPort(), FALSE);
// when
- final JerseySeBootstrapConfiguration jerseySeConfig = JerseySeBootstrapConfiguration.from(configuration);
final WebServer webServer = Application.class.isInstance(application)
- ? webServerProvider.createServer(WebServer.class, (Application) application, jerseySeConfig)
- : webServerProvider.createServer(WebServer.class, (Class) application, jerseySeConfig);
+ ? webServerProvider.createServer(WebServer.class, (Application) application, configuration)
+ : webServerProvider.createServer(WebServer.class, (Class) application, configuration);
final Object nativeHandle = webServer.unwrap(Object.class);
final CompletionStage start = webServer.start();
final Object startResult = start.toCompletableFuture().get();
@@ -157,8 +155,7 @@ public final void shouldScanFreePort() throws InterruptedException, ExecutionExc
final SeBootstrap.Configuration configuration = configuration(SeBootstrap.Configuration.FREE_PORT, TRUE);
// when
- final JerseySeBootstrapConfiguration jerseySeConfig = JerseySeBootstrapConfiguration.from(configuration);
- final WebServer webServer = webServerProvider.createServer(WebServer.class, application, jerseySeConfig);
+ final WebServer webServer = webServerProvider.createServer(WebServer.class, application, configuration);
// then
assertThat(webServer.port(), is(greaterThan(0)));
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/JerseySeBootstrapConfiguration.java b/core-server/src/main/java/org/glassfish/jersey/server/JerseySeBootstrapConfiguration.java
index 3bfe5db775..0f1d6d7e67 100644
--- a/core-server/src/main/java/org/glassfish/jersey/server/JerseySeBootstrapConfiguration.java
+++ b/core-server/src/main/java/org/glassfish/jersey/server/JerseySeBootstrapConfiguration.java
@@ -96,7 +96,7 @@ private int resolvePort() {
}
private int _resolvePort(boolean allowPrivilegedPort) {
- final int basePort = allowPrivilegedPort ? 0 : 1023;
+ final int basePort = allowPrivilegedPort ? 0 : 1024;
// Get the initial range parameters
final int lower = basePort;
final int range = 0xFFFF;
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/ServerProperties.java b/core-server/src/main/java/org/glassfish/jersey/server/ServerProperties.java
index 099ce70229..5d8a3ad16d 100644
--- a/core-server/src/main/java/org/glassfish/jersey/server/ServerProperties.java
+++ b/core-server/src/main/java/org/glassfish/jersey/server/ServerProperties.java
@@ -775,8 +775,8 @@ public final class ServerProperties {
* {@code WEBSERVER_ALLOW_PRIVILEGED_PORTS} is {@code false}.
*
*
- * If {@link jakarta.ws.rs.SeBootstrap.Configuration#PORT} is set to {@code 0}, the implementation chooses random ports
- * (0-65535) when {@code WEBSERVER_ALLOW_PRIVILEGED_PORTS} is {@code true}, or (1024-65535) when
+ * If {@link jakarta.ws.rs.SeBootstrap.Configuration#PORT} is set to {@code 0}, the implementation scans for random unused
+ * port (0-65535) when {@code WEBSERVER_ALLOW_PRIVILEGED_PORTS} is {@code true}, or (1024-65535) when
* {@code WEBSERVER_ALLOW_PRIVILEGED_PORTS} is {@code false.}
*
*
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/WebServerFactory.java b/core-server/src/main/java/org/glassfish/jersey/server/WebServerFactory.java
index 6454fc1732..2b61d4ae54 100644
--- a/core-server/src/main/java/org/glassfish/jersey/server/WebServerFactory.java
+++ b/core-server/src/main/java/org/glassfish/jersey/server/WebServerFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -18,6 +18,7 @@
package org.glassfish.jersey.server;
import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.SeBootstrap;
import jakarta.ws.rs.core.Application;
import org.glassfish.jersey.internal.ServiceFinder;
@@ -63,7 +64,7 @@ private WebServerFactory() {
* if no server provider supports the type.
*/
public static T createServer(final Class type, final Application application,
- final JerseySeBootstrapConfiguration configuration) {
+ final SeBootstrap.Configuration configuration) {
for (final WebServerProvider webServerProvider : ServiceFinder.find(WebServerProvider.class)) {
final T server = webServerProvider.createServer(type, application, configuration);
if (server != null) {
@@ -99,7 +100,7 @@ public static T createServer(final Class type, final Ap
* if no server provider supports the type.
*/
public static T createServer(final Class type, final Class application,
- final JerseySeBootstrapConfiguration configuration) {
+ final SeBootstrap.Configuration configuration) {
for (final WebServerProvider webServerProvider : ServiceFinder.find(WebServerProvider.class)) {
final T server = webServerProvider.createServer(type, application, configuration);
if (server != null) {
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/internal/RuntimeDelegateImpl.java b/core-server/src/main/java/org/glassfish/jersey/server/internal/RuntimeDelegateImpl.java
index 1af9a406bb..bfaad0e108 100644
--- a/core-server/src/main/java/org/glassfish/jersey/server/internal/RuntimeDelegateImpl.java
+++ b/core-server/src/main/java/org/glassfish/jersey/server/internal/RuntimeDelegateImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022 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
@@ -72,10 +72,8 @@ public CompletableFuture bootstrap(final Application appli
? (Class) configuration.property(ServerProperties.WEBSERVER_CLASS)
: WebServer.class;
- final JerseySeBootstrapConfiguration jerseySeConfiguration
- = JerseySeBootstrapConfiguration.from(configuration);
final WebServer webServer
- = WebServerFactory.createServer(httpServerClass, application, jerseySeConfiguration);
+ = WebServerFactory.createServer(httpServerClass, application, configuration);
return instance(configuration, webServer);
});
}
@@ -89,10 +87,8 @@ public CompletableFuture bootstrap(final Class) configuration.property(ServerProperties.WEBSERVER_CLASS)
: WebServer.class;
- final JerseySeBootstrapConfiguration jerseySeConfiguration
- = JerseySeBootstrapConfiguration.from(configuration);
final WebServer webServer
- = WebServerFactory.createServer(httpServerClass, applicationClass, jerseySeConfiguration);
+ = WebServerFactory.createServer(httpServerClass, applicationClass, configuration);
return instance(configuration, webServer);
});
}
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/spi/WebServerProvider.java b/core-server/src/main/java/org/glassfish/jersey/server/spi/WebServerProvider.java
index 63453ee106..d1d5d2c40d 100644
--- a/core-server/src/main/java/org/glassfish/jersey/server/spi/WebServerProvider.java
+++ b/core-server/src/main/java/org/glassfish/jersey/server/spi/WebServerProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
import jakarta.ws.rs.core.Application;
import org.glassfish.jersey.server.ApplicationHandler;
-import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
+import org.glassfish.jersey.server.ServerProperties;
import org.glassfish.jersey.spi.Contract;
/**
@@ -86,7 +86,7 @@ public interface WebServerProvider {
*/
T createServer(Class type,
Application application,
- JerseySeBootstrapConfiguration configuration) throws ProcessingException;
+ SeBootstrap.Configuration configuration) throws ProcessingException;
/**
* Creates a server of a given type which runs the given application using the
@@ -108,5 +108,26 @@ T createServer(Class type,
*/
T createServer(Class type,
Class applicationClass,
- JerseySeBootstrapConfiguration configuration) throws ProcessingException;
+ SeBootstrap.Configuration configuration) throws ProcessingException;
+
+
+ /**
+ * Utility function that matches {@code WebServerProvider} supported type with the user type passed either
+ * as {@link ServerProperties#WEBSERVER_CLASS} property (higher priority) or by the {@code userType} argument
+ * (lower priority).
+ * @param supportedType The type supported by the {@code WebServerProvider} implementation
+ * @param userType The user type passed in by the user, usually {@link WebServer} class.
+ * @param configuration The configuration to check {@link ServerProperties#WEBSERVER_CLASS} property
+ * @param The {@link WebServer} subtype
+ * @return @{code true} if the user provided type matches the supported type.
+ */
+ static boolean isSupportedWebServer(
+ Class supportedType, Class userType, SeBootstrap.Configuration configuration) {
+ final Object webServerObj = configuration.property(ServerProperties.WEBSERVER_CLASS);
+ final Class webServerCls = webServerObj == null || WebServer.class.equals(webServerObj)
+ ? null : (Class) webServerObj;
+ // WebServer.class.equals(webServerObj) is the default, and then we want userType
+ return (webServerCls != null && webServerCls.isAssignableFrom(supportedType))
+ || (webServerCls == null && userType.isAssignableFrom(supportedType));
+ }
}
diff --git a/core-server/src/test/java/org/glassfish/jersey/server/spi/WebServerProviderTest.java b/core-server/src/test/java/org/glassfish/jersey/server/spi/WebServerProviderTest.java
new file mode 100644
index 0000000000..553f76dc0d
--- /dev/null
+++ b/core-server/src/test/java/org/glassfish/jersey/server/spi/WebServerProviderTest.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2022 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
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.jersey.server.spi;
+
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.SeBootstrap;
+import jakarta.ws.rs.core.Application;
+import org.glassfish.jersey.server.ServerProperties;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.concurrent.CompletionStage;
+
+public class WebServerProviderTest {
+ @Test
+ public void testPropertySetsDifferentClass() {
+ SeBootstrap.Configuration config =
+ SeBootstrap.Configuration.builder().property(ServerProperties.WEBSERVER_CLASS, WebServerTestImpl2.class).build();
+
+ Assert.assertNull(new WebServerProviderTestImpl().createServer(WebServerTestImpl.class, Application.class, config));
+ }
+
+ @Test
+ public void testPropertySetsCorrectClass() {
+ SeBootstrap.Configuration config =
+ SeBootstrap.Configuration.builder().property(ServerProperties.WEBSERVER_CLASS, WebServerTestImpl.class).build();
+
+ Assert.assertTrue(
+ WebServerTestImpl.class.isInstance(
+ new WebServerProviderTestImpl().createServer(WebServerTestImpl2.class, Application.class, config)
+ )
+ );
+ }
+
+ @Test
+ public void testPropertySetsNothingUserTypeIsWrong() {
+ SeBootstrap.Configuration config =
+ SeBootstrap.Configuration.builder().build();
+
+ Assert.assertNull(new WebServerProviderTestImpl().createServer(WebServerTestImpl2.class, Application.class, config));
+ }
+
+ @Test
+ public void testPropertySetsNothingUserTypeIsCorrectClass() {
+ SeBootstrap.Configuration config =
+ SeBootstrap.Configuration.builder().build();
+
+ Assert.assertTrue(
+ WebServerTestImpl.class.isInstance(
+ new WebServerProviderTestImpl().createServer(WebServerTestImpl.class, Application.class, config)
+ )
+ );
+ }
+
+ @Test
+ public void testPropertySetsNothingUserTypeIsSuperClass() {
+ SeBootstrap.Configuration config =
+ SeBootstrap.Configuration.builder().build();
+
+ Assert.assertTrue(
+ WebServerTestImpl.class.isInstance(
+ new WebServerProviderTestImpl().createServer(WebServer.class, Application.class, config)
+ )
+ );
+ }
+
+ public static class WebServerProviderTestImpl implements WebServerProvider {
+
+ @Override
+ public T createServer(
+ Class type, Application application, SeBootstrap.Configuration configuration) throws ProcessingException {
+ if (WebServerProvider.isSupportedWebServer(WebServerTestImpl.class, type, configuration)) {
+ return (T) new WebServerTestImpl();
+ }
+ return null;
+ }
+
+ @Override
+ public T createServer(
+ Class type,
+ Class applicationClass,
+ SeBootstrap.Configuration configuration) throws ProcessingException {
+ if (WebServerProvider.isSupportedWebServer(WebServerTestImpl.class, type, configuration)) {
+ return (T) new WebServerTestImpl();
+ }
+ return null;
+ }
+ }
+
+ public static class WebServerTestImpl implements WebServer {
+
+ @Override
+ public Container container() {
+ return null;
+ }
+
+ @Override
+ public int port() {
+ return 0;
+ }
+
+ @Override
+ public CompletionStage start() {
+ return null;
+ }
+
+ @Override
+ public CompletionStage stop() {
+ return null;
+ }
+
+ @Override
+ public T unwrap(Class nativeClass) {
+ return null;
+ }
+ }
+
+ public static class WebServerTestImpl2 implements WebServer {
+
+ @Override
+ public Container container() {
+ return null;
+ }
+
+ @Override
+ public int port() {
+ return 0;
+ }
+
+ @Override
+ public CompletionStage start() {
+ return null;
+ }
+
+ @Override
+ public CompletionStage stop() {
+ return null;
+ }
+
+ @Override
+ public T unwrap(Class nativeClass) {
+ return null;
+ }
+ };
+}
diff --git a/docs/src/main/docbook/appendix-properties.xml b/docs/src/main/docbook/appendix-properties.xml
index dcd681b0d4..46274bdf7c 100644
--- a/docs/src/main/docbook/appendix-properties.xml
+++ b/docs/src/main/docbook/appendix-properties.xml
@@ -731,6 +731,78 @@
+
+ SeBootstrap and WebServer related configuration properties
+
+
+ List of SeBootstrap configuration properties that can be found in &jersey.server.ServerProperties; class.
+
+
+
+ List of SeBootstrap and WebServer configuration properties
+
+
+
+ Constant
+ Value
+ Description
+
+
+
+
+ &jersey.server.ServerProperties.WEBSERVER_ALLOW_PRIVILEGED_PORTS;
+ jersey.config.server.bootstrap.webserver.allow.privileged.ports
+
+
+ Defines whether to allow privileged ports (0-1023) to be used to start the
+ &lit.jersey.server.spi.WebServer; implementation to be chosen from the unused ports when the
+ &lit.jaxrs.SeBootstrap.Configuration; PORT is set to -1 or unset.
+
+
+ The default ports are 80 for HTTP and 443 for HTTPS when
+ WEBSERVER_ALLOW_PRIVILEGED_PORTS is &lit.true; or 8080 for HTTP and 8443 for HTTPS when
+ WEBSERVER_ALLOW_PRIVILEGED_PORTS is &lit.false;.
+
+
+ If &lit.jaxrs.SeBootstrap.Configuration; PORT is set to 0, the implementation scans for
+ random port (0-65535) when WEBSERVER_ALLOW_PRIVILEGED_PORTS is &lit.true;, or
+ (1024-65535) when WEBSERVER_ALLOW_PRIVILEGED_PORTS is &lit.false;.
+
+
+ The default this is &lit.false;. Use &lit.true; to allow a restricted port number.
+
+
+
+
+ &jersey.server.ServerProperties.WEBSERVER_AUTO_START;
+ jersey.config.server.bootstrap.webserver.autostart
+
+
+ Whether to automatically startup WebServer at bootstrap.
+
+
+ By default, servers are immediately listening to connections after bootstrap,
+ so no explicit invocation of WebServer#start() is needed.
+
+
+
+
+ &jersey.server.ServerProperties.WEBSERVER_CLASS;
+ jersey.config.server.bootstrap.webserver.class
+
+
+ Defines the implementation of WebServer to bootstrap.
+
+
+ By default auto-selects the first server provider found.
+
+
+
+
+
+
+
+
Servlet configuration properties
diff --git a/docs/src/main/docbook/deployment.xml b/docs/src/main/docbook/deployment.xml
index 55d8bb7fdd..9fac43cf6c 100644
--- a/docs/src/main/docbook/deployment.xml
+++ b/docs/src/main/docbook/deployment.xml
@@ -508,6 +508,88 @@ Channel server = NettyHttpContainerProvider.createServer(baseUri, resourceConfig
+
+
+ Jakarta REST Bootstrap API
+
+ Jakarta REST 3.1 comes with a new API for starting an application in Java SE environment. This
+ Bootstrap API is mainly represented by &lit.jaxrs.SeBootstrap; interface.
+ The Jakarta REST application is started as follows:
+ Application application = new MyApplication();
+SeBootstrap.Configuration.Builder configBuilder = SeBootstrap.Configuration.builder();
+CompletionStage<SeBootstrap.Instance> completionStage = SeBootstrap.start(application, configBuilder.build());
+
+
+ Later, when the SE application is no longer needed, it can be shutdown as follows:
+ CompletionStage<SeBootstrap.Instance> completionStage = ...
+SeBootstrap.Instance instance = completionStage().get();
+instance.stop();
+
+
+ The &lit.jaxrs.SeBootstrap.Configuration; allows for configuring the Jersey runtime. The Jakarta REST 3.1 allows
+ for configuring the HTTP port, the protocol (HTTP), the hostname, the root path, and SSL. The
+ &lit.jaxrs.SeBootstrap; is configured as follows:
+ SeBootstrap.Configuration.Builder configBuilder = SeBootstrap.Configuration.builder();
+configBuilder.property(SeBootstrap.Configuration.PROTOCOL, "HTTP")
+ .property(SeBootstrap.Configuration.HOST, "localhost")
+ .property(SeBootstrap.Configuration.PORT, 1234)
+ .property(SeBootstrap.Configuration.ROOT_PATH, "/root/path");
+
+
+ The &lit.jaxrs.SeBootstrap; deployment is backed up by an HTTP server described in
+ . If multiple Jersey container modules are on the classpath,
+ the first found is used.
+
+
+
+
+ Jersey WebServer SPI
+
+ Jersey &jersey.server.spi.WebServer; and &jersey.server.spi.WebServerProvider; are SPI interfaces similar to
+ &jersey.server.spi.ContainerProvider; but they are used for the SE deployment. They serve as a bridge between
+ Jersey containers and &lit.jaxrs.SeBootstrap; API.
+ The Jakarta REST application can be started as follows:
+ Application application = new MyApplication();
+SeBootstrap.Configuration.Builder configBuilder = SeBootstrap.Configuration.builder();
+WebServer webServer = WebServerFactory.createServer(WebServer.class, application, configBuilder.build());
+
+
+ Later, when the SE application is no longer needed, it can be shutdown as follows:
+ WebServer webServer = ...
+webServer.stop();
+
+
+ &jersey.server.WebServerFactory; is used to automatically choose among available implementations on a classpath.
+ If there are multiple implementations available, the first found is used. The user can choose the implementation
+ of a &lit.jersey.server.spi.WebServer; by a concrete WebServer subclass, for instance:
+
+WebServer webServer = WebServerFactory.createServer(GrizzlyHttpServer.class, application, configBuilder.build());
+ Another way to choose the &lit.jersey.server.spi.WebServer; implementation is by the
+ &lit.jersey.server.spi.WebServerProvider; implementation:
+
+WebServer webServer = GrizzlyHttpServerProvider.createServer(WebServer.class, application, configBuilder.build());
+
+
+ For additional customization of the WebServer settings, see .
+
+
+
+
+
+ When the port is set to -1, the default ports are used.
+ Unlike the default ports used by the , the &lit.jaxrs.SeBootstrap; API and
+ &lit.jersey.server.spi.WebServer; SPI use default ports 8080 and 8443, respectively.
+
+
+ When the port is set to 0, the implementation scans for a free port. The privileged ports are skipped, and the
+ scanning starts with port 1024.
+
+
+ Using the restricted ports can be ensured either by setting directly the port, or by setting
+ &jersey.server.ServerProperties.WEBSERVER_ALLOW_PRIVILEGED_PORTS; property to true in the
+ &lit.jaxrs.SeBootstrap.Configuration;
+
+
diff --git a/docs/src/main/docbook/jersey.ent b/docs/src/main/docbook/jersey.ent
index bc123fe1b1..e7db84fa3a 100644
--- a/docs/src/main/docbook/jersey.ent
+++ b/docs/src/main/docbook/jersey.ent
@@ -234,6 +234,7 @@
Response.Status">
Response.Status.Family">
Response.StatusType">
+SeBootstrap">
SecurityContext">
StreamingOutput">
UriBuilder">
@@ -605,11 +606,15 @@
ServerProperties.LOCATION_HEADER_RELATIVE_URI_RESOLUTION_RFC7231" >
ServerProperties.UNWRAP_COMPLETION_STAGE_IN_WRITER_ENABLE" >
ServerProperties.EMPTY_REQUEST_MEDIA_TYPE_MATCHES_ANY_CONSUMES" >
+ServerProperties.WEBSERVER_ALLOW_PRIVILEGED_PORTS" >
+ServerProperties.WEBSERVER_AUTO_START" >
+ServerProperties.WEBSERVER_CLASS" >
Uri">
UriConnegFilter">
WadlFeature">
WadlGenerator">
WadlGeneratorConfig">
+WebServerFactory">
MethodHandler">
ComponentModelValidator">
ApplicationEvent">
@@ -652,6 +657,8 @@
ContainerProvider">
ExternalRequestScope">
RequestScopedInitializer">
+WebServer">
+WebServerProvider">
ServletContainer">
ServletProperties">
ServletProperties.FILTER_CONTEXT_PATH">
@@ -791,6 +798,8 @@
@QueryParam">
ReaderInterceptor">
ReaderInterceptorContext">
+SeBootstrap">
+SeBootstrap.Configuration">
WebApplicationException">
WriterInterceptor">
WriterInterceptorContext">
@@ -1112,6 +1121,8 @@
TokenResource">
ComponentProvider">
ContainerProvider">
+WebServer">
+WebServerProvider">
ServletContainer">
ServletProperties">
ServletProperties.FILTER_CONTEXT_PATH">
diff --git a/tests/jmockit/src/test/java/org/glassfish/jersey/tests/jmockit/server/WebServerFactoryTest.java b/tests/jmockit/src/test/java/org/glassfish/jersey/tests/jmockit/server/WebServerFactoryTest.java
index 2831134475..974404c0a8 100644
--- a/tests/jmockit/src/test/java/org/glassfish/jersey/tests/jmockit/server/WebServerFactoryTest.java
+++ b/tests/jmockit/src/test/java/org/glassfish/jersey/tests/jmockit/server/WebServerFactoryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -23,6 +23,7 @@
import java.util.Iterator;
+import jakarta.ws.rs.SeBootstrap;
import jakarta.ws.rs.core.Application;
import org.glassfish.jersey.internal.ServiceFinder;
@@ -30,7 +31,6 @@
import org.glassfish.jersey.internal.guava.Iterators;
import org.glassfish.jersey.internal.inject.InjectionManager;
import org.glassfish.jersey.internal.inject.InjectionManagerFactory;
-import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
import org.glassfish.jersey.server.WebServerFactory;
import org.glassfish.jersey.server.spi.WebServer;
import org.glassfish.jersey.server.spi.WebServerProvider;
@@ -50,7 +50,7 @@ public final class WebServerFactoryTest {
@Test
public final void shouldBuildServer(@Mocked final Application mockApplication,
@Mocked final WebServer mockServer,
- @Mocked final JerseySeBootstrapConfiguration mockConfiguration,
+ @Mocked final SeBootstrap.Configuration mockConfiguration,
@Mocked final InjectionManager mockInjectionManager) {
// given
ServiceFinder.setIteratorProvider(new ServiceIteratorProvider() {
@@ -63,7 +63,7 @@ public final Iterator createIterator(final Class service, final String
public final U createServer(
final Class type,
final Application application,
- final JerseySeBootstrapConfiguration configuration) {
+ final SeBootstrap.Configuration configuration) {
return application == mockApplication && configuration == mockConfiguration
? type.cast(mockServer)
: null;
@@ -73,7 +73,7 @@ public final U createServer(
public T createServer(
final Class type,
final Class applicationClass,
- final JerseySeBootstrapConfiguration configuration) {
+ final SeBootstrap.Configuration configuration) {
return null;
}
}
From 54a2854a52fa4e0d59781676d70bcc64c8cc8d9a Mon Sep 17 00:00:00 2001
From: jansupol
Date: Mon, 6 Jun 2022 14:55:50 +0200
Subject: [PATCH 046/305] Possibly use jersey WebServer with
SeBootstrap.Configurator Document SeBootstrap API
Signed-off-by: jansupol
---
.../httpserver/GrizzlyHttpServerProvider.java | 17 +-
.../GrizzlyHttpServerProviderTest.java | 12 +-
.../jersey/jdkhttp/JdkHttpServerProvider.java | 15 +-
.../jdkhttp/JdkHttpServerProviderTest.java | 12 +-
.../jersey/jetty/JettyHttpServerProvider.java | 17 +-
.../jetty/JettyHttpServerProviderTest.java | 11 +-
.../httpserver/NettyHttpServerProvider.java | 15 +-
.../NettyHttpServerProviderTest.java | 11 +-
.../simple/SimpleHttpServerProvider.java | 15 +-
.../simple/SimpleHttpServerProviderTest.java | 11 +-
.../JerseySeBootstrapConfiguration.java | 2 +-
.../jersey/server/ServerProperties.java | 4 +-
.../jersey/server/WebServerFactory.java | 7 +-
.../server/internal/RuntimeDelegateImpl.java | 10 +-
.../jersey/server/spi/WebServerProvider.java | 29 +++-
.../server/spi/WebServerProviderTest.java | 159 ++++++++++++++++++
docs/src/main/docbook/appendix-properties.xml | 72 ++++++++
docs/src/main/docbook/deployment.xml | 82 +++++++++
docs/src/main/docbook/jersey.ent | 11 ++
.../jmockit/server/WebServerFactoryTest.java | 10 +-
20 files changed, 426 insertions(+), 96 deletions(-)
create mode 100644 core-server/src/test/java/org/glassfish/jersey/server/spi/WebServerProviderTest.java
diff --git a/containers/grizzly2-http/src/main/java/org/glassfish/jersey/grizzly2/httpserver/GrizzlyHttpServerProvider.java b/containers/grizzly2-http/src/main/java/org/glassfish/jersey/grizzly2/httpserver/GrizzlyHttpServerProvider.java
index a3f911c61f..f9cfac2163 100644
--- a/containers/grizzly2-http/src/main/java/org/glassfish/jersey/grizzly2/httpserver/GrizzlyHttpServerProvider.java
+++ b/containers/grizzly2-http/src/main/java/org/glassfish/jersey/grizzly2/httpserver/GrizzlyHttpServerProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -17,6 +17,7 @@
package org.glassfish.jersey.grizzly2.httpserver;
+import jakarta.ws.rs.SeBootstrap;
import jakarta.ws.rs.core.Application;
import org.glassfish.grizzly.http.server.HttpServer;
@@ -33,18 +34,18 @@
public final class GrizzlyHttpServerProvider implements WebServerProvider {
@Override
- public final T createServer(final Class type, final Application application,
- final JerseySeBootstrapConfiguration configuration) {
- return GrizzlyHttpServer.class == type || WebServer.class == type
- ? type.cast(new GrizzlyHttpServer(application, configuration))
+ public T createServer(final Class type, final Application application,
+ final SeBootstrap.Configuration configuration) {
+ return WebServerProvider.isSupportedWebServer(GrizzlyHttpServer.class, type, configuration)
+ ? type.cast(new GrizzlyHttpServer(application, JerseySeBootstrapConfiguration.from(configuration)))
: null;
}
@Override
public T createServer(Class type, Class applicationClass,
- JerseySeBootstrapConfiguration configuration) {
- return GrizzlyHttpServer.class == type || WebServer.class == type
- ? type.cast(new GrizzlyHttpServer(applicationClass, configuration))
+ SeBootstrap.Configuration configuration) {
+ return WebServerProvider.isSupportedWebServer(GrizzlyHttpServer.class, type, configuration)
+ ? type.cast(new GrizzlyHttpServer(applicationClass, JerseySeBootstrapConfiguration.from(configuration)))
: null;
}
}
diff --git a/containers/grizzly2-http/src/test/java/org/glassfish/jersey/grizzly2/httpserver/GrizzlyHttpServerProviderTest.java b/containers/grizzly2-http/src/test/java/org/glassfish/jersey/grizzly2/httpserver/GrizzlyHttpServerProviderTest.java
index a7310d048d..6f933cddcd 100644
--- a/containers/grizzly2-http/src/test/java/org/glassfish/jersey/grizzly2/httpserver/GrizzlyHttpServerProviderTest.java
+++ b/containers/grizzly2-http/src/test/java/org/glassfish/jersey/grizzly2/httpserver/GrizzlyHttpServerProviderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -17,7 +17,6 @@
package org.glassfish.jersey.grizzly2.httpserver;
-import static java.lang.Boolean.FALSE;
import static java.lang.Boolean.TRUE;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
@@ -45,7 +44,6 @@
import org.glassfish.grizzly.http.server.HttpServer;
import org.glassfish.jersey.internal.util.PropertiesHelper;
-import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
import org.glassfish.jersey.server.ServerProperties;
import org.glassfish.jersey.server.spi.Container;
import org.glassfish.jersey.server.spi.WebServer;
@@ -82,10 +80,9 @@ private void shouldProvideServer(final Object application, final Resource resour
final SeBootstrap.Configuration configuration = configuration(getPort());
// when
- final JerseySeBootstrapConfiguration jerseySeConfig = JerseySeBootstrapConfiguration.from(configuration);
final WebServer webServer = Application.class.isInstance(application)
- ? webServerProvider.createServer(WebServer.class, (Application) application, jerseySeConfig)
- : webServerProvider.createServer(WebServer.class, (Class) application, jerseySeConfig);
+ ? webServerProvider.createServer(WebServer.class, (Application) application, configuration)
+ : webServerProvider.createServer(WebServer.class, (Class) application, configuration);
final Object nativeHandle = webServer.unwrap(Object.class);
final CompletionStage start = webServer.start();
final Object startResult = start.toCompletableFuture().get();
@@ -157,8 +154,7 @@ public void shouldScanFreePort() {
final SeBootstrap.Configuration configuration = configuration(SeBootstrap.Configuration.FREE_PORT);
// when
- final JerseySeBootstrapConfiguration jerseySeConfig = JerseySeBootstrapConfiguration.from(configuration);
- final WebServer webServer = webServerProvider.createServer(WebServer.class, application, jerseySeConfig);
+ final WebServer webServer = webServerProvider.createServer(WebServer.class, application, configuration);
// then
assertThat(webServer.port(), is(greaterThan(0)));
diff --git a/containers/jdk-http/src/main/java/org/glassfish/jersey/jdkhttp/JdkHttpServerProvider.java b/containers/jdk-http/src/main/java/org/glassfish/jersey/jdkhttp/JdkHttpServerProvider.java
index 4510c53fc8..b9edb3022c 100644
--- a/containers/jdk-http/src/main/java/org/glassfish/jersey/jdkhttp/JdkHttpServerProvider.java
+++ b/containers/jdk-http/src/main/java/org/glassfish/jersey/jdkhttp/JdkHttpServerProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -17,6 +17,7 @@
package org.glassfish.jersey.jdkhttp;
+import jakarta.ws.rs.SeBootstrap;
import jakarta.ws.rs.core.Application;
import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
@@ -35,17 +36,17 @@ public final class JdkHttpServerProvider implements WebServerProvider {
@Override
public T createServer(final Class type, final Application application,
- final JerseySeBootstrapConfiguration configuration) {
- return JdkHttpServer.class == type || WebServer.class == type
- ? type.cast(new JdkHttpServer(application, configuration))
+ final SeBootstrap.Configuration configuration) {
+ return WebServerProvider.isSupportedWebServer(JdkHttpServer.class, type, configuration)
+ ? type.cast(new JdkHttpServer(application, JerseySeBootstrapConfiguration.from(configuration)))
: null;
}
@Override
public T createServer(final Class type, final Class applicationClass,
- final JerseySeBootstrapConfiguration configuration) {
- return JdkHttpServer.class == type || WebServer.class == type
- ? type.cast(new JdkHttpServer(applicationClass, configuration))
+ final SeBootstrap.Configuration configuration) {
+ return WebServerProvider.isSupportedWebServer(JdkHttpServer.class, type, configuration)
+ ? type.cast(new JdkHttpServer(applicationClass, JerseySeBootstrapConfiguration.from(configuration)))
: null;
}
}
diff --git a/containers/jdk-http/src/test/java/org/glassfish/jersey/jdkhttp/JdkHttpServerProviderTest.java b/containers/jdk-http/src/test/java/org/glassfish/jersey/jdkhttp/JdkHttpServerProviderTest.java
index ade52847c5..c37f7670b1 100644
--- a/containers/jdk-http/src/test/java/org/glassfish/jersey/jdkhttp/JdkHttpServerProviderTest.java
+++ b/containers/jdk-http/src/test/java/org/glassfish/jersey/jdkhttp/JdkHttpServerProviderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -18,7 +18,6 @@
package org.glassfish.jersey.jdkhttp;
import static java.lang.Boolean.FALSE;
-import static java.lang.Boolean.TRUE;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.Matchers.greaterThan;
@@ -44,7 +43,6 @@
import jakarta.ws.rs.core.UriBuilder;
import org.glassfish.jersey.internal.util.PropertiesHelper;
-import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
import org.glassfish.jersey.server.ServerProperties;
import org.glassfish.jersey.server.spi.Container;
import org.glassfish.jersey.server.spi.WebServer;
@@ -83,10 +81,9 @@ private void shouldProvideServer(final Object application, final Resource resour
final SeBootstrap.Configuration configuration = configuration(getPort());
// when
- final JerseySeBootstrapConfiguration jerseySeConfig = JerseySeBootstrapConfiguration.from(configuration);
final WebServer webServer = Application.class.isInstance(application)
- ? webServerProvider.createServer(WebServer.class, (Application) application, jerseySeConfig)
- : webServerProvider.createServer(WebServer.class, (Class) application, jerseySeConfig);
+ ? webServerProvider.createServer(WebServer.class, (Application) application, configuration)
+ : webServerProvider.createServer(WebServer.class, (Class) application, configuration);
final Object nativeHandle = webServer.unwrap(Object.class);
final CompletionStage start = webServer.start();
final Object startResult = start.toCompletableFuture().get();
@@ -158,8 +155,7 @@ public final void shouldScanFreePort() throws InterruptedException, ExecutionExc
final SeBootstrap.Configuration configuration = configuration(SeBootstrap.Configuration.FREE_PORT);
// when
- final JerseySeBootstrapConfiguration jerseySeConfig = JerseySeBootstrapConfiguration.from(configuration);
- final WebServer webServer = webServerProvider.createServer(WebServer.class, application, jerseySeConfig);
+ final WebServer webServer = webServerProvider.createServer(WebServer.class, application, configuration);
// then
assertThat(webServer.port(), is(greaterThan(0)));
diff --git a/containers/jetty-http/src/main/java/org/glassfish/jersey/jetty/JettyHttpServerProvider.java b/containers/jetty-http/src/main/java/org/glassfish/jersey/jetty/JettyHttpServerProvider.java
index fe776b9f40..5122435d85 100644
--- a/containers/jetty-http/src/main/java/org/glassfish/jersey/jetty/JettyHttpServerProvider.java
+++ b/containers/jetty-http/src/main/java/org/glassfish/jersey/jetty/JettyHttpServerProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -17,6 +17,7 @@
package org.glassfish.jersey.jetty;
+import jakarta.ws.rs.SeBootstrap;
import jakarta.ws.rs.core.Application;
import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
@@ -33,18 +34,18 @@
public final class JettyHttpServerProvider implements WebServerProvider {
@Override
- public final T createServer(final Class type, final Application application,
- final JerseySeBootstrapConfiguration configuration) {
- return JettyHttpServer.class == type || WebServer.class == type
- ? type.cast(new JettyHttpServer(application, configuration))
+ public T createServer(final Class type, final Application application,
+ final SeBootstrap.Configuration configuration) {
+ return WebServerProvider.isSupportedWebServer(JettyHttpServer.class, type, configuration)
+ ? type.cast(new JettyHttpServer(application, JerseySeBootstrapConfiguration.from(configuration)))
: null;
}
@Override
public T createServer(final Class type, final Class applicationClass,
- final JerseySeBootstrapConfiguration configuration) {
- return JettyHttpServer.class == type || WebServer.class == type
- ? type.cast(new JettyHttpServer(applicationClass, configuration))
+ final SeBootstrap.Configuration configuration) {
+ return WebServerProvider.isSupportedWebServer(JettyHttpServer.class, type, configuration)
+ ? type.cast(new JettyHttpServer(applicationClass, JerseySeBootstrapConfiguration.from(configuration)))
: null;
}
}
diff --git a/containers/jetty-http/src/test/java/org/glassfish/jersey/jetty/JettyHttpServerProviderTest.java b/containers/jetty-http/src/test/java/org/glassfish/jersey/jetty/JettyHttpServerProviderTest.java
index 1aa8b45495..81c1bd6c84 100644
--- a/containers/jetty-http/src/test/java/org/glassfish/jersey/jetty/JettyHttpServerProviderTest.java
+++ b/containers/jetty-http/src/test/java/org/glassfish/jersey/jetty/JettyHttpServerProviderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -45,7 +45,6 @@
import jakarta.ws.rs.core.UriBuilder;
import org.glassfish.jersey.internal.util.PropertiesHelper;
-import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
import org.glassfish.jersey.server.ServerProperties;
import org.glassfish.jersey.server.spi.Container;
import org.glassfish.jersey.server.spi.WebServer;
@@ -82,10 +81,9 @@ private void shouldProvideServer(final Object application, final Resource resour
final SeBootstrap.Configuration configuration = configuration(getPort(), FALSE);
// when
- final JerseySeBootstrapConfiguration jerseySeConfig = JerseySeBootstrapConfiguration.from(configuration);
final WebServer webServer = Application.class.isInstance(application)
- ? webServerProvider.createServer(WebServer.class, (Application) application, jerseySeConfig)
- : webServerProvider.createServer(WebServer.class, (Class) application, jerseySeConfig);
+ ? webServerProvider.createServer(WebServer.class, (Application) application, configuration)
+ : webServerProvider.createServer(WebServer.class, (Class) application, configuration);
final Object nativeHandle = webServer.unwrap(Object.class);
final CompletionStage start = webServer.start();
final Object startResult = start.toCompletableFuture().get();
@@ -157,8 +155,7 @@ public final void shouldScanFreePort() throws InterruptedException, ExecutionExc
final SeBootstrap.Configuration configuration = configuration(SeBootstrap.Configuration.FREE_PORT, TRUE);
// when
- final JerseySeBootstrapConfiguration jerseySeConfig = JerseySeBootstrapConfiguration.from(configuration);
- final WebServer webServer = webServerProvider.createServer(WebServer.class, application, jerseySeConfig);
+ final WebServer webServer = webServerProvider.createServer(WebServer.class, application, configuration);
// then
assertThat(webServer.port(), is(greaterThan(0)));
diff --git a/containers/netty-http/src/main/java/org/glassfish/jersey/netty/httpserver/NettyHttpServerProvider.java b/containers/netty-http/src/main/java/org/glassfish/jersey/netty/httpserver/NettyHttpServerProvider.java
index 34c700e104..0749369a1f 100644
--- a/containers/netty-http/src/main/java/org/glassfish/jersey/netty/httpserver/NettyHttpServerProvider.java
+++ b/containers/netty-http/src/main/java/org/glassfish/jersey/netty/httpserver/NettyHttpServerProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -17,6 +17,7 @@
package org.glassfish.jersey.netty.httpserver;
+import jakarta.ws.rs.SeBootstrap;
import jakarta.ws.rs.core.Application;
import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
@@ -35,17 +36,17 @@ public final class NettyHttpServerProvider implements WebServerProvider {
@Override
public T createServer(final Class type, final Application application,
- final JerseySeBootstrapConfiguration configuration) {
- return NettyHttpServer.class == type || WebServer.class == type
- ? type.cast(new NettyHttpServer(application, configuration))
+ final SeBootstrap.Configuration configuration) {
+ return WebServerProvider.isSupportedWebServer(NettyHttpServer.class, type, configuration)
+ ? type.cast(new NettyHttpServer(application, JerseySeBootstrapConfiguration.from(configuration)))
: null;
}
@Override
public T createServer(final Class type, final Class applicationClass,
- final JerseySeBootstrapConfiguration configuration) {
- return NettyHttpServer.class == type || WebServer.class == type
- ? type.cast(new NettyHttpServer(applicationClass, configuration))
+ final SeBootstrap.Configuration configuration) {
+ return WebServerProvider.isSupportedWebServer(NettyHttpServer.class, type, configuration)
+ ? type.cast(new NettyHttpServer(applicationClass, JerseySeBootstrapConfiguration.from(configuration)))
: null;
}
}
diff --git a/containers/netty-http/src/test/java/org/glassfish/jersey/netty/httpserver/NettyHttpServerProviderTest.java b/containers/netty-http/src/test/java/org/glassfish/jersey/netty/httpserver/NettyHttpServerProviderTest.java
index 3837377475..69b2e7e4cd 100644
--- a/containers/netty-http/src/test/java/org/glassfish/jersey/netty/httpserver/NettyHttpServerProviderTest.java
+++ b/containers/netty-http/src/test/java/org/glassfish/jersey/netty/httpserver/NettyHttpServerProviderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -44,7 +44,6 @@
import jakarta.ws.rs.core.UriBuilder;
import org.glassfish.jersey.internal.util.PropertiesHelper;
-import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
import org.glassfish.jersey.server.ServerProperties;
import org.glassfish.jersey.server.spi.Container;
import org.glassfish.jersey.server.spi.WebServer;
@@ -84,10 +83,9 @@ private void shouldProvideServer(final Object application, final Resource resour
final SeBootstrap.Configuration configuration = configuration(getPort(), FALSE);
// when
- final JerseySeBootstrapConfiguration jerseySeConfig = JerseySeBootstrapConfiguration.from(configuration);
final WebServer webServer = Application.class.isInstance(application)
- ? webServerProvider.createServer(WebServer.class, (Application) application, jerseySeConfig)
- : webServerProvider.createServer(WebServer.class, (Class) application, jerseySeConfig);
+ ? webServerProvider.createServer(WebServer.class, (Application) application, configuration)
+ : webServerProvider.createServer(WebServer.class, (Class) application, configuration);
final Object nativeHandle = webServer.unwrap(Object.class);
final CompletionStage start = webServer.start();
final Object startResult = start.toCompletableFuture().get();
@@ -160,8 +158,7 @@ public final void shouldScanFreePort() throws InterruptedException, ExecutionExc
final SeBootstrap.Configuration configuration = configuration(SeBootstrap.Configuration.FREE_PORT, TRUE);
// when
- final JerseySeBootstrapConfiguration jerseySeConfig = JerseySeBootstrapConfiguration.from(configuration);
- final WebServer webServer = webServerProvider.createServer(WebServer.class, application, jerseySeConfig);
+ final WebServer webServer = webServerProvider.createServer(WebServer.class, application, configuration);
// then
assertThat(webServer.port(), is(greaterThan(0)));
diff --git a/containers/simple-http/src/main/java/org/glassfish/jersey/simple/SimpleHttpServerProvider.java b/containers/simple-http/src/main/java/org/glassfish/jersey/simple/SimpleHttpServerProvider.java
index c4a26a7d98..33bd6a7dc5 100644
--- a/containers/simple-http/src/main/java/org/glassfish/jersey/simple/SimpleHttpServerProvider.java
+++ b/containers/simple-http/src/main/java/org/glassfish/jersey/simple/SimpleHttpServerProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -17,6 +17,7 @@
package org.glassfish.jersey.simple;
+import jakarta.ws.rs.SeBootstrap;
import jakarta.ws.rs.core.Application;
import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
@@ -33,17 +34,17 @@ public final class SimpleHttpServerProvider implements WebServerProvider {
@Override
public T createServer(final Class type, final Application application,
- final JerseySeBootstrapConfiguration configuration) {
- return SimpleHttpServer.class == type || WebServer.class == type
- ? type.cast(new SimpleHttpServer(application, configuration))
+ final SeBootstrap.Configuration configuration) {
+ return WebServerProvider.isSupportedWebServer(SimpleHttpServer.class, type, configuration)
+ ? type.cast(new SimpleHttpServer(application, JerseySeBootstrapConfiguration.from(configuration)))
: null;
}
@Override
public T createServer(final Class type, final Class applicationClass,
- final JerseySeBootstrapConfiguration configuration) {
- return SimpleHttpServer.class == type || WebServer.class == type
- ? type.cast(new SimpleHttpServer(applicationClass, configuration))
+ final SeBootstrap.Configuration configuration) {
+ return WebServerProvider.isSupportedWebServer(SimpleHttpServer.class, type, configuration)
+ ? type.cast(new SimpleHttpServer(applicationClass, JerseySeBootstrapConfiguration.from(configuration)))
: null;
}
}
diff --git a/containers/simple-http/src/test/java/org/glassfish/jersey/simple/SimpleHttpServerProviderTest.java b/containers/simple-http/src/test/java/org/glassfish/jersey/simple/SimpleHttpServerProviderTest.java
index 02314ea784..c32e77caac 100644
--- a/containers/simple-http/src/test/java/org/glassfish/jersey/simple/SimpleHttpServerProviderTest.java
+++ b/containers/simple-http/src/test/java/org/glassfish/jersey/simple/SimpleHttpServerProviderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -44,7 +44,6 @@
import jakarta.ws.rs.core.UriBuilder;
import org.glassfish.jersey.internal.util.PropertiesHelper;
-import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
import org.glassfish.jersey.server.ServerProperties;
import org.glassfish.jersey.server.spi.Container;
import org.glassfish.jersey.server.spi.WebServer;
@@ -82,10 +81,9 @@ private void shouldProvideServer(final Object application, final Resource resour
final SeBootstrap.Configuration configuration = configuration(getPort(), FALSE);
// when
- final JerseySeBootstrapConfiguration jerseySeConfig = JerseySeBootstrapConfiguration.from(configuration);
final WebServer webServer = Application.class.isInstance(application)
- ? webServerProvider.createServer(WebServer.class, (Application) application, jerseySeConfig)
- : webServerProvider.createServer(WebServer.class, (Class) application, jerseySeConfig);
+ ? webServerProvider.createServer(WebServer.class, (Application) application, configuration)
+ : webServerProvider.createServer(WebServer.class, (Class) application, configuration);
final Object nativeHandle = webServer.unwrap(Object.class);
final CompletionStage start = webServer.start();
final Object startResult = start.toCompletableFuture().get();
@@ -157,8 +155,7 @@ public final void shouldScanFreePort() throws InterruptedException, ExecutionExc
final SeBootstrap.Configuration configuration = configuration(SeBootstrap.Configuration.FREE_PORT, TRUE);
// when
- final JerseySeBootstrapConfiguration jerseySeConfig = JerseySeBootstrapConfiguration.from(configuration);
- final WebServer webServer = webServerProvider.createServer(WebServer.class, application, jerseySeConfig);
+ final WebServer webServer = webServerProvider.createServer(WebServer.class, application, configuration);
// then
assertThat(webServer.port(), is(greaterThan(0)));
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/JerseySeBootstrapConfiguration.java b/core-server/src/main/java/org/glassfish/jersey/server/JerseySeBootstrapConfiguration.java
index 3bfe5db775..0f1d6d7e67 100644
--- a/core-server/src/main/java/org/glassfish/jersey/server/JerseySeBootstrapConfiguration.java
+++ b/core-server/src/main/java/org/glassfish/jersey/server/JerseySeBootstrapConfiguration.java
@@ -96,7 +96,7 @@ private int resolvePort() {
}
private int _resolvePort(boolean allowPrivilegedPort) {
- final int basePort = allowPrivilegedPort ? 0 : 1023;
+ final int basePort = allowPrivilegedPort ? 0 : 1024;
// Get the initial range parameters
final int lower = basePort;
final int range = 0xFFFF;
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/ServerProperties.java b/core-server/src/main/java/org/glassfish/jersey/server/ServerProperties.java
index 099ce70229..5d8a3ad16d 100644
--- a/core-server/src/main/java/org/glassfish/jersey/server/ServerProperties.java
+++ b/core-server/src/main/java/org/glassfish/jersey/server/ServerProperties.java
@@ -775,8 +775,8 @@ public final class ServerProperties {
* {@code WEBSERVER_ALLOW_PRIVILEGED_PORTS} is {@code false}.
*
*
- * If {@link jakarta.ws.rs.SeBootstrap.Configuration#PORT} is set to {@code 0}, the implementation chooses random ports
- * (0-65535) when {@code WEBSERVER_ALLOW_PRIVILEGED_PORTS} is {@code true}, or (1024-65535) when
+ * If {@link jakarta.ws.rs.SeBootstrap.Configuration#PORT} is set to {@code 0}, the implementation scans for random unused
+ * port (0-65535) when {@code WEBSERVER_ALLOW_PRIVILEGED_PORTS} is {@code true}, or (1024-65535) when
* {@code WEBSERVER_ALLOW_PRIVILEGED_PORTS} is {@code false.}
*
*
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/WebServerFactory.java b/core-server/src/main/java/org/glassfish/jersey/server/WebServerFactory.java
index 6454fc1732..2b61d4ae54 100644
--- a/core-server/src/main/java/org/glassfish/jersey/server/WebServerFactory.java
+++ b/core-server/src/main/java/org/glassfish/jersey/server/WebServerFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -18,6 +18,7 @@
package org.glassfish.jersey.server;
import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.SeBootstrap;
import jakarta.ws.rs.core.Application;
import org.glassfish.jersey.internal.ServiceFinder;
@@ -63,7 +64,7 @@ private WebServerFactory() {
* if no server provider supports the type.
*/
public static T createServer(final Class type, final Application application,
- final JerseySeBootstrapConfiguration configuration) {
+ final SeBootstrap.Configuration configuration) {
for (final WebServerProvider webServerProvider : ServiceFinder.find(WebServerProvider.class)) {
final T server = webServerProvider.createServer(type, application, configuration);
if (server != null) {
@@ -99,7 +100,7 @@ public static T createServer(final Class type, final Ap
* if no server provider supports the type.
*/
public static T createServer(final Class type, final Class application,
- final JerseySeBootstrapConfiguration configuration) {
+ final SeBootstrap.Configuration configuration) {
for (final WebServerProvider webServerProvider : ServiceFinder.find(WebServerProvider.class)) {
final T server = webServerProvider.createServer(type, application, configuration);
if (server != null) {
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/internal/RuntimeDelegateImpl.java b/core-server/src/main/java/org/glassfish/jersey/server/internal/RuntimeDelegateImpl.java
index 1af9a406bb..bfaad0e108 100644
--- a/core-server/src/main/java/org/glassfish/jersey/server/internal/RuntimeDelegateImpl.java
+++ b/core-server/src/main/java/org/glassfish/jersey/server/internal/RuntimeDelegateImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022 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
@@ -72,10 +72,8 @@ public CompletableFuture bootstrap(final Application appli
? (Class) configuration.property(ServerProperties.WEBSERVER_CLASS)
: WebServer.class;
- final JerseySeBootstrapConfiguration jerseySeConfiguration
- = JerseySeBootstrapConfiguration.from(configuration);
final WebServer webServer
- = WebServerFactory.createServer(httpServerClass, application, jerseySeConfiguration);
+ = WebServerFactory.createServer(httpServerClass, application, configuration);
return instance(configuration, webServer);
});
}
@@ -89,10 +87,8 @@ public CompletableFuture bootstrap(final Class) configuration.property(ServerProperties.WEBSERVER_CLASS)
: WebServer.class;
- final JerseySeBootstrapConfiguration jerseySeConfiguration
- = JerseySeBootstrapConfiguration.from(configuration);
final WebServer webServer
- = WebServerFactory.createServer(httpServerClass, applicationClass, jerseySeConfiguration);
+ = WebServerFactory.createServer(httpServerClass, applicationClass, configuration);
return instance(configuration, webServer);
});
}
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/spi/WebServerProvider.java b/core-server/src/main/java/org/glassfish/jersey/server/spi/WebServerProvider.java
index 63453ee106..d1d5d2c40d 100644
--- a/core-server/src/main/java/org/glassfish/jersey/server/spi/WebServerProvider.java
+++ b/core-server/src/main/java/org/glassfish/jersey/server/spi/WebServerProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
import jakarta.ws.rs.core.Application;
import org.glassfish.jersey.server.ApplicationHandler;
-import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
+import org.glassfish.jersey.server.ServerProperties;
import org.glassfish.jersey.spi.Contract;
/**
@@ -86,7 +86,7 @@ public interface WebServerProvider {
*/
T createServer(Class type,
Application application,
- JerseySeBootstrapConfiguration configuration) throws ProcessingException;
+ SeBootstrap.Configuration configuration) throws ProcessingException;
/**
* Creates a server of a given type which runs the given application using the
@@ -108,5 +108,26 @@ T createServer(Class type,
*/
T createServer(Class type,
Class applicationClass,
- JerseySeBootstrapConfiguration configuration) throws ProcessingException;
+ SeBootstrap.Configuration configuration) throws ProcessingException;
+
+
+ /**
+ * Utility function that matches {@code WebServerProvider} supported type with the user type passed either
+ * as {@link ServerProperties#WEBSERVER_CLASS} property (higher priority) or by the {@code userType} argument
+ * (lower priority).
+ * @param supportedType The type supported by the {@code WebServerProvider} implementation
+ * @param userType The user type passed in by the user, usually {@link WebServer} class.
+ * @param configuration The configuration to check {@link ServerProperties#WEBSERVER_CLASS} property
+ * @param The {@link WebServer} subtype
+ * @return @{code true} if the user provided type matches the supported type.
+ */
+ static boolean isSupportedWebServer(
+ Class supportedType, Class userType, SeBootstrap.Configuration configuration) {
+ final Object webServerObj = configuration.property(ServerProperties.WEBSERVER_CLASS);
+ final Class webServerCls = webServerObj == null || WebServer.class.equals(webServerObj)
+ ? null : (Class) webServerObj;
+ // WebServer.class.equals(webServerObj) is the default, and then we want userType
+ return (webServerCls != null && webServerCls.isAssignableFrom(supportedType))
+ || (webServerCls == null && userType.isAssignableFrom(supportedType));
+ }
}
diff --git a/core-server/src/test/java/org/glassfish/jersey/server/spi/WebServerProviderTest.java b/core-server/src/test/java/org/glassfish/jersey/server/spi/WebServerProviderTest.java
new file mode 100644
index 0000000000..553f76dc0d
--- /dev/null
+++ b/core-server/src/test/java/org/glassfish/jersey/server/spi/WebServerProviderTest.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2022 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
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.jersey.server.spi;
+
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.SeBootstrap;
+import jakarta.ws.rs.core.Application;
+import org.glassfish.jersey.server.ServerProperties;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.concurrent.CompletionStage;
+
+public class WebServerProviderTest {
+ @Test
+ public void testPropertySetsDifferentClass() {
+ SeBootstrap.Configuration config =
+ SeBootstrap.Configuration.builder().property(ServerProperties.WEBSERVER_CLASS, WebServerTestImpl2.class).build();
+
+ Assert.assertNull(new WebServerProviderTestImpl().createServer(WebServerTestImpl.class, Application.class, config));
+ }
+
+ @Test
+ public void testPropertySetsCorrectClass() {
+ SeBootstrap.Configuration config =
+ SeBootstrap.Configuration.builder().property(ServerProperties.WEBSERVER_CLASS, WebServerTestImpl.class).build();
+
+ Assert.assertTrue(
+ WebServerTestImpl.class.isInstance(
+ new WebServerProviderTestImpl().createServer(WebServerTestImpl2.class, Application.class, config)
+ )
+ );
+ }
+
+ @Test
+ public void testPropertySetsNothingUserTypeIsWrong() {
+ SeBootstrap.Configuration config =
+ SeBootstrap.Configuration.builder().build();
+
+ Assert.assertNull(new WebServerProviderTestImpl().createServer(WebServerTestImpl2.class, Application.class, config));
+ }
+
+ @Test
+ public void testPropertySetsNothingUserTypeIsCorrectClass() {
+ SeBootstrap.Configuration config =
+ SeBootstrap.Configuration.builder().build();
+
+ Assert.assertTrue(
+ WebServerTestImpl.class.isInstance(
+ new WebServerProviderTestImpl().createServer(WebServerTestImpl.class, Application.class, config)
+ )
+ );
+ }
+
+ @Test
+ public void testPropertySetsNothingUserTypeIsSuperClass() {
+ SeBootstrap.Configuration config =
+ SeBootstrap.Configuration.builder().build();
+
+ Assert.assertTrue(
+ WebServerTestImpl.class.isInstance(
+ new WebServerProviderTestImpl().createServer(WebServer.class, Application.class, config)
+ )
+ );
+ }
+
+ public static class WebServerProviderTestImpl implements WebServerProvider {
+
+ @Override
+ public T createServer(
+ Class type, Application application, SeBootstrap.Configuration configuration) throws ProcessingException {
+ if (WebServerProvider.isSupportedWebServer(WebServerTestImpl.class, type, configuration)) {
+ return (T) new WebServerTestImpl();
+ }
+ return null;
+ }
+
+ @Override
+ public T createServer(
+ Class type,
+ Class applicationClass,
+ SeBootstrap.Configuration configuration) throws ProcessingException {
+ if (WebServerProvider.isSupportedWebServer(WebServerTestImpl.class, type, configuration)) {
+ return (T) new WebServerTestImpl();
+ }
+ return null;
+ }
+ }
+
+ public static class WebServerTestImpl implements WebServer {
+
+ @Override
+ public Container container() {
+ return null;
+ }
+
+ @Override
+ public int port() {
+ return 0;
+ }
+
+ @Override
+ public CompletionStage start() {
+ return null;
+ }
+
+ @Override
+ public CompletionStage stop() {
+ return null;
+ }
+
+ @Override
+ public T unwrap(Class nativeClass) {
+ return null;
+ }
+ }
+
+ public static class WebServerTestImpl2 implements WebServer {
+
+ @Override
+ public Container container() {
+ return null;
+ }
+
+ @Override
+ public int port() {
+ return 0;
+ }
+
+ @Override
+ public CompletionStage start() {
+ return null;
+ }
+
+ @Override
+ public CompletionStage stop() {
+ return null;
+ }
+
+ @Override
+ public T unwrap(Class nativeClass) {
+ return null;
+ }
+ };
+}
diff --git a/docs/src/main/docbook/appendix-properties.xml b/docs/src/main/docbook/appendix-properties.xml
index dcd681b0d4..46274bdf7c 100644
--- a/docs/src/main/docbook/appendix-properties.xml
+++ b/docs/src/main/docbook/appendix-properties.xml
@@ -731,6 +731,78 @@
+
+ SeBootstrap and WebServer related configuration properties
+
+
+ List of SeBootstrap configuration properties that can be found in &jersey.server.ServerProperties; class.
+
+
+
+ List of SeBootstrap and WebServer configuration properties
+
+
+
+ Constant
+ Value
+ Description
+
+
+
+
+ &jersey.server.ServerProperties.WEBSERVER_ALLOW_PRIVILEGED_PORTS;
+ jersey.config.server.bootstrap.webserver.allow.privileged.ports
+
+
+ Defines whether to allow privileged ports (0-1023) to be used to start the
+ &lit.jersey.server.spi.WebServer; implementation to be chosen from the unused ports when the
+ &lit.jaxrs.SeBootstrap.Configuration; PORT is set to -1 or unset.
+
+
+ The default ports are 80 for HTTP and 443 for HTTPS when
+ WEBSERVER_ALLOW_PRIVILEGED_PORTS is &lit.true; or 8080 for HTTP and 8443 for HTTPS when
+ WEBSERVER_ALLOW_PRIVILEGED_PORTS is &lit.false;.
+
+
+ If &lit.jaxrs.SeBootstrap.Configuration; PORT is set to 0, the implementation scans for
+ random port (0-65535) when WEBSERVER_ALLOW_PRIVILEGED_PORTS is &lit.true;, or
+ (1024-65535) when WEBSERVER_ALLOW_PRIVILEGED_PORTS is &lit.false;.
+
+
+ The default this is &lit.false;. Use &lit.true; to allow a restricted port number.
+
+
+
+
+ &jersey.server.ServerProperties.WEBSERVER_AUTO_START;
+ jersey.config.server.bootstrap.webserver.autostart
+
+
+ Whether to automatically startup WebServer at bootstrap.
+
+
+ By default, servers are immediately listening to connections after bootstrap,
+ so no explicit invocation of WebServer#start() is needed.
+
+
+
+
+ &jersey.server.ServerProperties.WEBSERVER_CLASS;
+ jersey.config.server.bootstrap.webserver.class
+
+
+ Defines the implementation of WebServer to bootstrap.
+
+
+ By default auto-selects the first server provider found.
+
+
+
+
+
+
+
+
Servlet configuration properties
diff --git a/docs/src/main/docbook/deployment.xml b/docs/src/main/docbook/deployment.xml
index 55d8bb7fdd..9fac43cf6c 100644
--- a/docs/src/main/docbook/deployment.xml
+++ b/docs/src/main/docbook/deployment.xml
@@ -508,6 +508,88 @@ Channel server = NettyHttpContainerProvider.createServer(baseUri, resourceConfig
+
+
+ Jakarta REST Bootstrap API
+
+ Jakarta REST 3.1 comes with a new API for starting an application in Java SE environment. This
+ Bootstrap API is mainly represented by &lit.jaxrs.SeBootstrap; interface.
+ The Jakarta REST application is started as follows:
+ Application application = new MyApplication();
+SeBootstrap.Configuration.Builder configBuilder = SeBootstrap.Configuration.builder();
+CompletionStage<SeBootstrap.Instance> completionStage = SeBootstrap.start(application, configBuilder.build());
+
+
+ Later, when the SE application is no longer needed, it can be shutdown as follows:
+ CompletionStage<SeBootstrap.Instance> completionStage = ...
+SeBootstrap.Instance instance = completionStage().get();
+instance.stop();
+
+
+ The &lit.jaxrs.SeBootstrap.Configuration; allows for configuring the Jersey runtime. The Jakarta REST 3.1 allows
+ for configuring the HTTP port, the protocol (HTTP), the hostname, the root path, and SSL. The
+ &lit.jaxrs.SeBootstrap; is configured as follows:
+ SeBootstrap.Configuration.Builder configBuilder = SeBootstrap.Configuration.builder();
+configBuilder.property(SeBootstrap.Configuration.PROTOCOL, "HTTP")
+ .property(SeBootstrap.Configuration.HOST, "localhost")
+ .property(SeBootstrap.Configuration.PORT, 1234)
+ .property(SeBootstrap.Configuration.ROOT_PATH, "/root/path");
+
+
+ The &lit.jaxrs.SeBootstrap; deployment is backed up by an HTTP server described in
+ . If multiple Jersey container modules are on the classpath,
+ the first found is used.
+
+
+
+
+ Jersey WebServer SPI
+
+ Jersey &jersey.server.spi.WebServer; and &jersey.server.spi.WebServerProvider; are SPI interfaces similar to
+ &jersey.server.spi.ContainerProvider; but they are used for the SE deployment. They serve as a bridge between
+ Jersey containers and &lit.jaxrs.SeBootstrap; API.
+ The Jakarta REST application can be started as follows:
+ Application application = new MyApplication();
+SeBootstrap.Configuration.Builder configBuilder = SeBootstrap.Configuration.builder();
+WebServer webServer = WebServerFactory.createServer(WebServer.class, application, configBuilder.build());
+
+
+ Later, when the SE application is no longer needed, it can be shutdown as follows:
+ WebServer webServer = ...
+webServer.stop();
+
+
+ &jersey.server.WebServerFactory; is used to automatically choose among available implementations on a classpath.
+ If there are multiple implementations available, the first found is used. The user can choose the implementation
+ of a &lit.jersey.server.spi.WebServer; by a concrete WebServer subclass, for instance:
+
+WebServer webServer = WebServerFactory.createServer(GrizzlyHttpServer.class, application, configBuilder.build());
+ Another way to choose the &lit.jersey.server.spi.WebServer; implementation is by the
+ &lit.jersey.server.spi.WebServerProvider; implementation:
+
+WebServer webServer = GrizzlyHttpServerProvider.createServer(WebServer.class, application, configBuilder.build());
+
+
+ For additional customization of the WebServer settings, see .
+
+
+
+
+
+ When the port is set to -1, the default ports are used.
+ Unlike the default ports used by the , the &lit.jaxrs.SeBootstrap; API and
+ &lit.jersey.server.spi.WebServer; SPI use default ports 8080 and 8443, respectively.
+
+
+ When the port is set to 0, the implementation scans for a free port. The privileged ports are skipped, and the
+ scanning starts with port 1024.
+
+
+ Using the restricted ports can be ensured either by setting directly the port, or by setting
+ &jersey.server.ServerProperties.WEBSERVER_ALLOW_PRIVILEGED_PORTS; property to true in the
+ &lit.jaxrs.SeBootstrap.Configuration;
+
+
diff --git a/docs/src/main/docbook/jersey.ent b/docs/src/main/docbook/jersey.ent
index bc123fe1b1..e7db84fa3a 100644
--- a/docs/src/main/docbook/jersey.ent
+++ b/docs/src/main/docbook/jersey.ent
@@ -234,6 +234,7 @@
Response.Status">
Response.Status.Family">
Response.StatusType">
+SeBootstrap">
SecurityContext">
StreamingOutput">
UriBuilder">
@@ -605,11 +606,15 @@
ServerProperties.LOCATION_HEADER_RELATIVE_URI_RESOLUTION_RFC7231" >
ServerProperties.UNWRAP_COMPLETION_STAGE_IN_WRITER_ENABLE" >
ServerProperties.EMPTY_REQUEST_MEDIA_TYPE_MATCHES_ANY_CONSUMES" >
+ServerProperties.WEBSERVER_ALLOW_PRIVILEGED_PORTS" >
+ServerProperties.WEBSERVER_AUTO_START" >
+ServerProperties.WEBSERVER_CLASS" >
Uri">
UriConnegFilter">
WadlFeature">
WadlGenerator">
WadlGeneratorConfig">
+WebServerFactory">
MethodHandler">
ComponentModelValidator">
ApplicationEvent">
@@ -652,6 +657,8 @@
ContainerProvider">
ExternalRequestScope">
RequestScopedInitializer">
+WebServer">
+WebServerProvider">
ServletContainer">
ServletProperties">
ServletProperties.FILTER_CONTEXT_PATH">
@@ -791,6 +798,8 @@
@QueryParam">
ReaderInterceptor">
ReaderInterceptorContext">
+SeBootstrap">
+SeBootstrap.Configuration">
WebApplicationException">
WriterInterceptor">
WriterInterceptorContext">
@@ -1112,6 +1121,8 @@
TokenResource">
ComponentProvider">
ContainerProvider">
+WebServer">
+WebServerProvider">
ServletContainer">
ServletProperties">
ServletProperties.FILTER_CONTEXT_PATH">
diff --git a/tests/jmockit/src/test/java/org/glassfish/jersey/tests/jmockit/server/WebServerFactoryTest.java b/tests/jmockit/src/test/java/org/glassfish/jersey/tests/jmockit/server/WebServerFactoryTest.java
index 2831134475..974404c0a8 100644
--- a/tests/jmockit/src/test/java/org/glassfish/jersey/tests/jmockit/server/WebServerFactoryTest.java
+++ b/tests/jmockit/src/test/java/org/glassfish/jersey/tests/jmockit/server/WebServerFactoryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Markus KARG. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -23,6 +23,7 @@
import java.util.Iterator;
+import jakarta.ws.rs.SeBootstrap;
import jakarta.ws.rs.core.Application;
import org.glassfish.jersey.internal.ServiceFinder;
@@ -30,7 +31,6 @@
import org.glassfish.jersey.internal.guava.Iterators;
import org.glassfish.jersey.internal.inject.InjectionManager;
import org.glassfish.jersey.internal.inject.InjectionManagerFactory;
-import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
import org.glassfish.jersey.server.WebServerFactory;
import org.glassfish.jersey.server.spi.WebServer;
import org.glassfish.jersey.server.spi.WebServerProvider;
@@ -50,7 +50,7 @@ public final class WebServerFactoryTest {
@Test
public final void shouldBuildServer(@Mocked final Application mockApplication,
@Mocked final WebServer mockServer,
- @Mocked final JerseySeBootstrapConfiguration mockConfiguration,
+ @Mocked final SeBootstrap.Configuration mockConfiguration,
@Mocked final InjectionManager mockInjectionManager) {
// given
ServiceFinder.setIteratorProvider(new ServiceIteratorProvider() {
@@ -63,7 +63,7 @@ public final Iterator createIterator(final Class service, final String
public final U createServer(
final Class type,
final Application application,
- final JerseySeBootstrapConfiguration configuration) {
+ final SeBootstrap.Configuration configuration) {
return application == mockApplication && configuration == mockConfiguration
? type.cast(mockServer)
: null;
@@ -73,7 +73,7 @@ public final U createServer(
public T createServer(
final Class type,
final Class applicationClass,
- final JerseySeBootstrapConfiguration configuration) {
+ final SeBootstrap.Configuration configuration) {
return null;
}
}
From abd1a436fda7ad762f59befc21ee378a4ba0054f Mon Sep 17 00:00:00 2001
From: jansupol
Date: Wed, 8 Jun 2022 16:00:56 +0200
Subject: [PATCH 047/305] Call CompletionCallback just once with
DefaultExceptionMapper Do not propagate error to the client
Signed-off-by: jansupol
---
.../jersey/server/DefaultExceptionMapper.java | 7 +-
.../jersey/server/ServerRuntime.java | 22 +++---
.../server/DefaultExceptionMapperTest.java | 75 +++++++++++++++++++
3 files changed, 90 insertions(+), 14 deletions(-)
create mode 100644 core-server/src/test/java/org/glassfish/jersey/server/DefaultExceptionMapperTest.java
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/DefaultExceptionMapper.java b/core-server/src/main/java/org/glassfish/jersey/server/DefaultExceptionMapper.java
index b120e699a7..bd7c4d18f0 100644
--- a/core-server/src/main/java/org/glassfish/jersey/server/DefaultExceptionMapper.java
+++ b/core-server/src/main/java/org/glassfish/jersey/server/DefaultExceptionMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 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
@@ -19,6 +19,7 @@
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.ext.ExceptionMapper;
+import org.glassfish.jersey.server.internal.LocalizationMessages;
class DefaultExceptionMapper implements ExceptionMapper {
@Override
@@ -35,6 +36,8 @@ private static Response processWebApplicationException(WebApplicationException e
}
private static Response processDefaultException(Throwable exception) {
- return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(exception.getMessage()).build();
+ return Response.status(Response.Status.INTERNAL_SERVER_ERROR)
+ .entity(LocalizationMessages.ERROR_EXCEPTION_MAPPING_THROWN_TO_CONTAINER())
+ .build();
}
}
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/ServerRuntime.java b/core-server/src/main/java/org/glassfish/jersey/server/ServerRuntime.java
index 2e3a2635d1..007c9a5c49 100644
--- a/core-server/src/main/java/org/glassfish/jersey/server/ServerRuntime.java
+++ b/core-server/src/main/java/org/glassfish/jersey/server/ServerRuntime.java
@@ -365,11 +365,11 @@ public Responder(final RequestProcessingContext processingContext, final ServerR
public void process(ContainerResponse response) {
processingContext.monitoringEventBuilder().setContainerResponse(response);
- response = processResponse(response);
+ response = processResponse(response, null);
release(response);
}
- private ContainerResponse processResponse(ContainerResponse response) {
+ private ContainerResponse processResponse(ContainerResponse response, Throwable unmappedThrowable) {
final Stage respondingRoot = processingContext.createRespondingRoot();
if (respondingRoot != null) {
@@ -379,7 +379,7 @@ private ContainerResponse processResponse(ContainerResponse response) {
// no-exception zone
// the methods below are guaranteed to not throw any exceptions
- completionCallbackRunner.onComplete(null);
+ completionCallbackRunner.onComplete(unmappedThrowable);
return response;
}
@@ -427,7 +427,7 @@ public void process(final Throwable throwable) {
final Response exceptionResponse = mapException(throwable);
try {
response = preProcessResponse(exceptionResponse, request);
- processResponse(response);
+ processResponse(response, null);
} catch (final Throwable respError) {
LOGGER.log(Level.SEVERE, LocalizationMessages.ERROR_PROCESSING_RESPONSE_FROM_ALREADY_MAPPED_EXCEPTION());
processingContext.monitoringEventBuilder()
@@ -448,9 +448,10 @@ public void process(final Throwable throwable) {
try {
request.getResponseWriter().failure(responseError);
} finally {
- completionCallbackRunner.onComplete(responseError);
-
defaultMapperResponse = processResponseWithDefaultExceptionMapper(responseError, request);
+
+ // completionCallbackRunner.onComplete(responseError); is called from
+ // processResponseWithDefaultExceptionMapper
}
}
@@ -488,7 +489,7 @@ private boolean processResponseError(final Throwable responseError) {
if (processedError != null) {
processedResponse =
- processResponse(new ContainerResponse(processingContext.request(), processedError));
+ processResponse(new ContainerResponse(processingContext.request(), processedError), null);
processed = true;
}
} catch (final Throwable throwable) {
@@ -545,10 +546,7 @@ private Response mapException(final Throwable originalThrowable) throws Throwabl
final long timestamp = tracingLogger.timestamp(ServerTraceEvent.EXCEPTION_MAPPING);
final ExceptionMapper mapper = runtime.exceptionMappers.findMapping(throwable);
- if (mapper != null
- && !DefaultExceptionMapper.class.getName()
- .equals(mapper.getClass().getName())
- ) {
+ if (mapper != null && !DefaultExceptionMapper.class.isInstance(mapper)) {
return processExceptionWithMapper(mapper, throwable, timestamp);
}
if (waeResponse != null) {
@@ -625,7 +623,7 @@ private ContainerResponse processResponseWithDefaultExceptionMapper(Throwable ex
ContainerRequest request) {
long timestamp = tracingLogger.timestamp(ServerTraceEvent.EXCEPTION_MAPPING);
final Response response = processExceptionWithMapper(DEFAULT_EXCEPTION_MAPPER, exception, timestamp);
- return processResponse(preProcessResponse(response, request));
+ return processResponse(preProcessResponse(response, request), exception);
}
private ContainerResponse writeResponse(final ContainerResponse response) {
diff --git a/core-server/src/test/java/org/glassfish/jersey/server/DefaultExceptionMapperTest.java b/core-server/src/test/java/org/glassfish/jersey/server/DefaultExceptionMapperTest.java
new file mode 100644
index 0000000000..74b11537f5
--- /dev/null
+++ b/core-server/src/test/java/org/glassfish/jersey/server/DefaultExceptionMapperTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2022 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
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.jersey.server;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.container.AsyncResponse;
+import jakarta.ws.rs.container.CompletionCallback;
+import jakarta.ws.rs.container.Suspended;
+import jakarta.ws.rs.core.Response;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class DefaultExceptionMapperTest {
+ public static final String MESSAGE = "DefaultExceptionMapperTest I/O Exception";
+ @Test
+ public void testIOException() {
+ IOException ioe = new IOException(MESSAGE);
+ DefaultExceptionMapper mapper = new DefaultExceptionMapper();
+ Response response = mapper.toResponse(ioe);
+ Assert.assertFalse(response.getEntity().toString().contains(MESSAGE));
+ }
+
+ @Test
+ public void testCompletionCallback() {
+ AtomicInteger counter = new AtomicInteger();
+ CompletionCallback hitOnceCallback = new CompletionCallback() {
+ @Override
+ public void onComplete(Throwable throwable) {
+ counter.incrementAndGet();
+ }
+ };
+ ResourceConfig resourceConfig = new ResourceConfig().register(new IOExThrowingResource(hitOnceCallback));
+ ApplicationHandler applicationHandler = new ApplicationHandler(resourceConfig);
+ try {
+ applicationHandler.apply(RequestContextBuilder.from("/", "GET").build()).get();
+ } catch (Exception e) {
+ // expected
+ }
+
+ Assert.assertEquals(1, counter.get());
+ }
+
+ @Path("/")
+ public static class IOExThrowingResource {
+ private final CompletionCallback callback;
+
+ public IOExThrowingResource(CompletionCallback callback) {
+ this.callback = callback;
+ }
+
+ @GET
+ public String doGet(@Suspended AsyncResponse asyncResponse) throws IOException {
+ asyncResponse.register(callback);
+ throw new IOException(MESSAGE);
+ }
+ }
+}
From 6abd64c8124b03100ca67b48c06d0fe31f8d64cb Mon Sep 17 00:00:00 2001
From: jansupol <15908245+jansupol@users.noreply.github.com>
Date: Thu, 9 Jun 2022 07:29:22 +0200
Subject: [PATCH 048/305] Update Netty proxy settings (#5071)
Signed-off-by: jansupol
---
.../jersey/jetty/connector/ProxyTest.java | 147 -------------
.../netty/connector/NettyConnector.java | 60 +++++-
.../connector/proxy/ProxySelectorTest.java | 159 ++++++++++++++
.../e2e/client/connector/proxy/ProxyTest.java | 199 ++++++++++++++++++
4 files changed, 412 insertions(+), 153 deletions(-)
delete mode 100644 connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/ProxyTest.java
create mode 100644 tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/proxy/ProxySelectorTest.java
create mode 100644 tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/proxy/ProxyTest.java
diff --git a/connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/ProxyTest.java b/connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/ProxyTest.java
deleted file mode 100644
index d5b4a02110..0000000000
--- a/connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/ProxyTest.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2019 Banco do Brasil S/A. 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.jetty.connector;
-
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.client.ClientProperties;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.test.JerseyTest;
-import org.junit.Test;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.Response;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.Base64;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * @author Marcelo Rubim
-\ */
-public class ProxyTest extends JerseyTest {
- private static final Charset CHARACTER_SET = Charset.forName("iso-8859-1");
- private static final String PROXY_URI = "http://127.0.0.1:9997";
- private static final String PROXY_USERNAME = "proxy-user";
- private static final String PROXY_PASSWORD = "proxy-password";
-
-
- @Path("")
- public static class ProxyResource {
-
- @GET
- public Response getProxy() {
- return Response.status(407).header("Proxy-Authenticate", "Basic").build();
- }
-
- }
-
- @Path("proxyTest")
- public static class ProxyTestResource {
-
- @GET
- public Response getOK() {
- return Response.ok().build();
- }
-
- }
-
- @Override
- protected Application configure() {
- ResourceConfig config = new ResourceConfig(ProxyResource.class, ProxyTestResource.class);
- return config;
- }
-
- @Override
- protected void configureClient(ClientConfig config) {
- config.connectorProvider(new JettyConnectorProvider());
- }
-
- @Test
- public void testGet407() {
- startFakeProxy();
- client().property(ClientProperties.PROXY_URI, ProxyTest.PROXY_URI);
- Response response = target("proxyTest").request().get();
- assertEquals(407, response.getStatus());
- }
-
- @Test
- public void testGetSuccess() {
- startFakeProxy();
- client().property(ClientProperties.PROXY_URI, ProxyTest.PROXY_URI);
- client().property(ClientProperties.PROXY_USERNAME, ProxyTest.PROXY_USERNAME);
- client().property(ClientProperties.PROXY_PASSWORD, ProxyTest.PROXY_PASSWORD);
- Response response = target("proxyTest").request().get();
- assertEquals(200, response.getStatus());
- }
-
- private void startFakeProxy(){
- Server server = new Server(9997);
- server.setHandler(new ProxyHandler());
- try {
- server.start();
- } catch (Exception e) {
-
- }
- }
-
- class ProxyHandler extends AbstractHandler {
- @Override
- public void handle(String target,
- Request baseRequest,
- HttpServletRequest request,
- HttpServletResponse response) throws IOException,
- ServletException {
-
- if (request.getHeader("Proxy-Authorization") != null) {
- String proxyAuthorization = request.getHeader("Proxy-Authorization");
- String decoded = new String(Base64.getDecoder().decode(proxyAuthorization.substring(6).getBytes()),
- CHARACTER_SET);
- final String[] split = decoded.split(":");
- final String username = split[0];
- final String password = split[1];
-
- if (!username.equals(PROXY_USERNAME)) {
- response.setStatus(400);
- System.out.println("Found unexpected username: " + username);
- }
-
- if (!password.equals(PROXY_PASSWORD)) {
- response.setStatus(400);
- System.out.println("Found unexpected password: " + username);
- }
- response.setStatus(200);
- //TODO Add redirect to requestURI
- } else {
- response.setStatus(407);
- response.addHeader("Proxy-Authenticate", "Basic");
- }
-
-
- baseRequest.setHandled(true);
- }
- }
-}
diff --git a/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/NettyConnector.java b/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/NettyConnector.java
index ba1f8c2354..6d67c9d867 100644
--- a/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/NettyConnector.java
+++ b/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/NettyConnector.java
@@ -19,6 +19,9 @@
import java.io.IOException;
import java.io.OutputStream;
import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.SocketAddress;
import java.net.URI;
import java.util.ArrayList;
import java.util.HashMap;
@@ -45,6 +48,7 @@
import io.netty.channel.Channel;
import io.netty.channel.ChannelDuplexHandler;
import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelOption;
import io.netty.channel.ChannelPipeline;
@@ -53,16 +57,20 @@
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.DefaultHttpHeaders;
import io.netty.handler.codec.http.DefaultHttpRequest;
import io.netty.handler.codec.http.HttpChunkedInput;
import io.netty.handler.codec.http.HttpClientCodec;
import io.netty.handler.codec.http.HttpContentDecompressor;
import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders;
import io.netty.handler.codec.http.HttpMethod;
import io.netty.handler.codec.http.HttpRequest;
import io.netty.handler.codec.http.HttpUtil;
import io.netty.handler.codec.http.HttpVersion;
import io.netty.handler.proxy.HttpProxyHandler;
+import io.netty.handler.proxy.ProxyConnectionEvent;
+import io.netty.handler.proxy.ProxyHandler;
import io.netty.handler.ssl.ApplicationProtocolConfig;
import io.netty.handler.ssl.ClientAuth;
import io.netty.handler.ssl.IdentityCipherSuiteFilter;
@@ -223,6 +231,8 @@ protected void execute(final ClientRequest jerseyRequest, final Set redirec
}
}
+ Integer connectTimeout = jerseyRequest.resolveProperty(ClientProperties.CONNECT_TIMEOUT, 0);
+
if (chan == null) {
Bootstrap b = new Bootstrap();
b.group(group)
@@ -246,8 +256,29 @@ protected void initChannel(SocketChannel ch) throws Exception {
InetSocketAddress proxyAddr = new InetSocketAddress(u.getHost(),
u.getPort() == -1 ? 8080 : u.getPort());
- p.addLast(userName == null ? new HttpProxyHandler(proxyAddr)
- : new HttpProxyHandler(proxyAddr, userName, password));
+ ProxyHandler proxy = createProxyHandler(jerseyRequest, proxyAddr, userName, password, connectTimeout);
+ p.addLast(proxy);
+ } else {
+ ProxySelector sel = ProxySelector.getDefault();
+ for (Proxy proxy: sel.select(requestUri)) {
+ if (Proxy.Type.HTTP.equals(proxy.type())) {
+ SocketAddress proxyAddress = proxy.address();
+ if (InetSocketAddress.class.isInstance(proxy.address())) {
+ InetSocketAddress proxyAddr = (InetSocketAddress) proxyAddress;
+ if (proxyAddr.isUnresolved()
+ && proxyAddr.getHostName() != null
+ && proxyAddr.getHostName().startsWith("http://")) {
+ proxyAddress = new InetSocketAddress(
+ proxyAddr.getHostString().substring(7), proxyAddr.getPort()
+ );
+ }
+ }
+ ProxyHandler proxyHandler
+ = createProxyHandler(jerseyRequest, proxyAddress, null, null, connectTimeout);
+ p.addLast(proxyHandler);
+ break;
+ }
+ }
}
// Enable HTTPS if necessary.
@@ -284,7 +315,6 @@ protected void initChannel(SocketChannel ch) throws Exception {
});
// connect timeout
- Integer connectTimeout = jerseyRequest.resolveProperty(ClientProperties.CONNECT_TIMEOUT, 0);
if (connectTimeout > 0) {
b.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, connectTimeout);
}
@@ -357,9 +387,7 @@ protected void initChannel(SocketChannel ch) throws Exception {
}
// headers
- for (final Map.Entry> e : jerseyRequest.getStringHeaders().entrySet()) {
- nettyRequest.headers().add(e.getKey(), e.getValue());
- }
+ setHeaders(jerseyRequest, nettyRequest.headers());
// host header - http 1.1
nettyRequest.headers().add(HttpHeaderNames.HOST, jerseyRequest.getUri().getHost());
@@ -484,4 +512,24 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
}
}
}
+
+ private static ProxyHandler createProxyHandler(ClientRequest jerseyRequest, SocketAddress proxyAddr,
+ String userName, String password, long connectTimeout) {
+ HttpHeaders httpHeaders = setHeaders(jerseyRequest, new DefaultHttpHeaders());
+
+ ProxyHandler proxy = userName == null ? new HttpProxyHandler(proxyAddr, httpHeaders)
+ : new HttpProxyHandler(proxyAddr, userName, password, httpHeaders);
+ if (connectTimeout > 0) {
+ proxy.setConnectTimeoutMillis(connectTimeout);
+ }
+
+ return proxy;
+ }
+
+ private static HttpHeaders setHeaders(ClientRequest jerseyRequest, HttpHeaders headers) {
+ for (final Map.Entry> e : jerseyRequest.getStringHeaders().entrySet()) {
+ headers.add(e.getKey(), e.getValue());
+ }
+ return headers;
+ }
}
diff --git a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/proxy/ProxySelectorTest.java b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/proxy/ProxySelectorTest.java
new file mode 100644
index 0000000000..4580facf24
--- /dev/null
+++ b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/proxy/ProxySelectorTest.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2020, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019 Banco do Brasil S/A. 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
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.jersey.tests.e2e.client.connector.proxy;
+
+import org.eclipse.jetty.server.HttpChannel;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
+import org.glassfish.jersey.apache5.connector.Apache5ConnectorProvider;
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.spi.ConnectorProvider;
+import org.glassfish.jersey.jetty.connector.JettyConnectorProvider;
+import org.glassfish.jersey.netty.connector.NettyConnectorProvider;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Moved from jetty-connector
+ * @author Marcelo Rubim
+ */
+@RunWith(Parameterized.class)
+public class ProxySelectorTest {
+ private static final String NO_PASS = "no-pass";
+
+ @Parameterized.Parameters(name = "{index}: {0}")
+ public static List testData() {
+ return Arrays.asList(new Object[][]{
+// {ApacheConnectorProvider.class},
+// {Apache5ConnectorProvider.class},
+// {JettyConnectorProvider.class},
+ {NettyConnectorProvider.class},
+ });
+ }
+
+ private final ConnectorProvider connectorProvider;
+
+ public ProxySelectorTest(Class connectorProviderClass)
+ throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
+ this.connectorProvider = connectorProviderClass.getConstructor().newInstance();
+ }
+
+ protected void configureClient(ClientConfig config) {
+ config.connectorProvider(connectorProvider);
+ }
+
+ @Test
+ public void testGetNoPass() {
+ try (Response response = target("proxyTest").request().header(NO_PASS, 200).get()) {
+ assertEquals(200, response.getStatus());
+ }
+ }
+
+ @Test
+ public void testGet407() {
+ try (Response response = target("proxyTest").request().get()) {
+ assertEquals(407, response.getStatus());
+ } catch (ProcessingException pe) {
+ Assert.assertTrue(pe.getMessage().contains("407")); // netty
+ }
+ }
+
+ private static Server server;
+ @BeforeClass
+ public static void startFakeProxy() {
+ server = new Server(9997);
+ server.setHandler(new ProxyHandler());
+ try {
+ server.start();
+ } catch (Exception e) {
+
+ }
+
+ System.setProperty("http.proxyHost", "http://localhost");
+ System.setProperty("http.proxyPort", "9997");
+ }
+
+ @AfterClass
+ public static void tearDownProxy() {
+ try {
+ server.stop();
+ } catch (Exception e) {
+
+ } finally {
+ System.clearProperty("http.proxyHost");
+ System.clearProperty("http.proxyPort");
+ }
+ }
+
+ private static Client client;
+ @Before
+ public void beforeEach() {
+ ClientConfig config = new ClientConfig();
+ this.configureClient(config);
+ client = ClientBuilder.newClient(config);
+ }
+
+ private Client client() {
+ return client;
+ }
+
+ private WebTarget target(String path) {
+ // ProxySelector goes DIRECT to localhost, no matter the proxy
+ return client().target("http://eclipse.org:9998").path(path);
+ }
+
+ static class ProxyHandler extends AbstractHandler {
+ Set httpConnect = new HashSet<>();
+ @Override
+ public void handle(String target,
+ Request baseRequest,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+ if (request.getHeader(NO_PASS) != null) {
+ response.setStatus(Integer.parseInt(request.getHeader(NO_PASS)));
+ } else {
+ response.setStatus(407);
+ response.addHeader("Proxy-Authenticate", "Basic");
+ }
+
+ baseRequest.setHandled(true);
+ }
+ }
+}
diff --git a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/proxy/ProxyTest.java b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/proxy/ProxyTest.java
new file mode 100644
index 0000000000..93e69c2124
--- /dev/null
+++ b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/proxy/ProxyTest.java
@@ -0,0 +1,199 @@
+/*
+ * Copyright (c) 2020, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019 Banco do Brasil S/A. 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
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.jersey.tests.e2e.client.connector.proxy;
+
+import org.eclipse.jetty.server.HttpChannel;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
+import org.glassfish.jersey.apache5.connector.Apache5ConnectorProvider;
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.ClientProperties;
+import org.glassfish.jersey.client.spi.ConnectorProvider;
+import org.glassfish.jersey.jetty.connector.JettyConnectorProvider;
+import org.glassfish.jersey.netty.connector.NettyConnectorProvider;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
+import java.lang.reflect.InvocationTargetException;
+import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Moved from jetty-connector
+ * @author Marcelo Rubim
+ */
+@RunWith(Parameterized.class)
+public class ProxyTest {
+ private static final Charset CHARACTER_SET = Charset.forName("iso-8859-1");
+ private static final String PROXY_URI = "http://127.0.0.1:9997";
+ private static final String PROXY_USERNAME = "proxy-user";
+ private static final String PROXY_PASSWORD = "proxy-password";
+ private static final String NO_PASS = "no-pass";
+
+ @Parameterized.Parameters(name = "{index}: {0}")
+ public static List testData() {
+ return Arrays.asList(new Object[][]{
+ {ApacheConnectorProvider.class},
+ {Apache5ConnectorProvider.class},
+ {JettyConnectorProvider.class},
+ {NettyConnectorProvider.class},
+ });
+ }
+
+ private final ConnectorProvider connectorProvider;
+
+ public ProxyTest(Class connectorProviderClass)
+ throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
+ this.connectorProvider = connectorProviderClass.getConstructor().newInstance();
+ }
+
+ protected void configureClient(ClientConfig config) {
+ config.connectorProvider(connectorProvider);
+ }
+
+ @Test
+ public void testGetNoPass() {
+ client().property(ClientProperties.PROXY_URI, ProxyTest.PROXY_URI);
+ try (Response response = target("proxyTest").request().header(NO_PASS, 200).get()) {
+ assertEquals(200, response.getStatus());
+ }
+ }
+
+ @Test
+ public void testGet407() {
+ client().property(ClientProperties.PROXY_URI, ProxyTest.PROXY_URI);
+ try (Response response = target("proxyTest").request().get()) {
+ assertEquals(407, response.getStatus());
+ } catch (ProcessingException pe) {
+ Assert.assertTrue(pe.getMessage().contains("407")); // netty
+ }
+ }
+
+ @Test
+ public void testGetSuccess() {
+ client().property(ClientProperties.PROXY_URI, ProxyTest.PROXY_URI);
+ client().property(ClientProperties.PROXY_USERNAME, ProxyTest.PROXY_USERNAME);
+ client().property(ClientProperties.PROXY_PASSWORD, ProxyTest.PROXY_PASSWORD);
+ Response response = target("proxyTest").request().get();
+ assertEquals(200, response.getStatus());
+ }
+
+ private static Server server;
+ @BeforeClass
+ public static void startFakeProxy() {
+ server = new Server(9997);
+ server.setHandler(new ProxyHandler());
+ try {
+ server.start();
+ } catch (Exception e) {
+
+ }
+ }
+
+ @AfterClass
+ public static void tearDownProxy() {
+ try {
+ server.stop();
+ } catch (Exception e) {
+
+ }
+ }
+
+ private static Client client;
+ @Before
+ public void beforeEach() {
+ ClientConfig config = new ClientConfig();
+ this.configureClient(config);
+ client = ClientBuilder.newClient(config);
+ }
+
+ private Client client() {
+ return client;
+ }
+
+ private WebTarget target(String path) {
+ return client().target("http://localhost:9998").path(path);
+ }
+
+ static class ProxyHandler extends AbstractHandler {
+ Set httpConnect = new HashSet<>();
+ @Override
+ public void handle(String target,
+ Request baseRequest,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+ if (request.getHeader(NO_PASS) != null) {
+ response.setStatus(Integer.parseInt(request.getHeader(NO_PASS)));
+ } else if (request.getHeader("Proxy-Authorization") != null) {
+ String proxyAuthorization = request.getHeader("Proxy-Authorization");
+ String decoded = new String(Base64.getDecoder().decode(proxyAuthorization.substring(6).getBytes()),
+ CHARACTER_SET);
+ final String[] split = decoded.split(":");
+ final String username = split[0];
+ final String password = split[1];
+
+ if (!username.equals(PROXY_USERNAME)) {
+ response.setStatus(400);
+ System.out.println("Found unexpected username: " + username);
+ }
+
+ if (!password.equals(PROXY_PASSWORD)) {
+ response.setStatus(400);
+ System.out.println("Found unexpected password: " + username);
+ }
+
+ if (response.getStatus() != 400) {
+ response.setStatus(200);
+ if ("CONNECT".equalsIgnoreCase(baseRequest.getMethod())) { // NETTY way of doing proxy
+ httpConnect.add(baseRequest.getHttpChannel());
+ }
+ }
+ //TODO Add redirect to requestURI
+ } else {
+ if (httpConnect.contains(baseRequest.getHttpChannel())) {
+ response.setStatus(200);
+ } else {
+ response.setStatus(407);
+ response.addHeader("Proxy-Authenticate", "Basic");
+ }
+ }
+
+ baseRequest.setHandled(true);
+ }
+ }
+}
From 78ea6dc1d6b64e5118a218797fe1b89d0cdd4efa Mon Sep 17 00:00:00 2001
From: Maxim Nesen <24524084+senivam@users.noreply.github.com>
Date: Thu, 9 Jun 2022 13:39:23 +0200
Subject: [PATCH 049/305] Make JacksonFeature configurable (#5074)
Signed-off-by: Maxim Nesen
---
.../glassfish/jersey/CommonProperties.java | 53 +++++++++++++-
docs/src/main/docbook/appendix-properties.xml | 36 ++++++++++
docs/src/main/docbook/jersey.ent | 6 ++
docs/src/main/docbook/media.xml | 11 ++-
media/json-jackson/pom.xml | 3 +-
.../DefaultJacksonJaxbJsonProvider.java | 40 +++++++++--
...JsonJacksonProviderForBothModulesTest.java | 43 +++++++++++
...JacksonProviderForDisabledModulesTest.java | 71 +++++++++++++++++++
...nJacksonProviderForEnabledModulesTest.java | 42 +++++++++++
.../internal/model/JAXBServiceTest.java | 62 ++++++++++++++++
.../rest-client14-compatibility/pom.xml | 7 +-
11 files changed, 358 insertions(+), 16 deletions(-)
create mode 100644 media/json-jackson/src/test/java/org/glassfish/jersey/jackson/internal/DefaultJsonJacksonProviderForBothModulesTest.java
create mode 100644 media/json-jackson/src/test/java/org/glassfish/jersey/jackson/internal/DefaultJsonJacksonProviderForDisabledModulesTest.java
create mode 100644 media/json-jackson/src/test/java/org/glassfish/jersey/jackson/internal/DefaultJsonJacksonProviderForEnabledModulesTest.java
create mode 100644 media/json-jackson/src/test/java/org/glassfish/jersey/jackson/internal/model/JAXBServiceTest.java
diff --git a/core-common/src/main/java/org/glassfish/jersey/CommonProperties.java b/core-common/src/main/java/org/glassfish/jersey/CommonProperties.java
index 50fceb1df7..762a08b050 100644
--- a/core-common/src/main/java/org/glassfish/jersey/CommonProperties.java
+++ b/core-common/src/main/java/org/glassfish/jersey/CommonProperties.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
@@ -255,6 +255,55 @@ public final class CommonProperties {
*/
public static final String JAXRS_SERVICE_LOADING_ENABLE = "jakarta.ws.rs.loadServices";
+ /**
+ * Comma separated list of jackson modules which are only enabled (only those modules will be used)
+ * for json-jackson processing
+ *
+ * @since 2.36
+ */
+ public static final String JSON_JACKSON_ENABLED_MODULES = "jersey.config.json.jackson.enabled.modules";
+
+ /**
+ * Client-specific version of {@link CommonProperties#JSON_JACKSON_ENABLED_MODULES}.
+ *
+ * If present, it overrides the generic one for the client environment.
+ * @since 2.36
+ */
+ public static final String JSON_JACKSON_ENABLED_MODULES_CLIENT = "jersey.config.client.json.jackson.enabled.modules";
+
+ /**
+ * Server-specific version of {@link CommonProperties#JSON_JACKSON_ENABLED_MODULES}.
+ *
+ * If present, it overrides the generic one for the server environment.
+ * @since 2.36
+ */
+ public static final String JSON_JACKSON_ENABLED_MODULES_SERVER = "jersey.config.server.json.jackson.enabled.modules";
+
+ /**
+ * Comma separated list of jackson modules which shall be excluded from json-jackson processing.
+ * the JaxbAnnotationModule is always excluded (cannot be configured).
+ *
+ * @since 2.36
+ */
+
+ public static final String JSON_JACKSON_DISABLED_MODULES = "jersey.config.json.jackson.disabled.modules";
+
+ /**
+ * Client-specific version of {@link CommonProperties#JSON_JACKSON_DISABLED_MODULES}.
+ *
+ * If present, it overrides the generic one for the client environment.
+ * @since 2.36
+ */
+ public static final String JSON_JACKSON_DISABLED_MODULES_CLIENT = "jersey.config.client.json.jackson.disabled.modules";
+
+ /**
+ * Server-specific version of {@link CommonProperties#JSON_JACKSON_DISABLED_MODULES}.
+ *
+ * If present, it overrides the generic one for the client environment.
+ * @since 2.36
+ */
+ public static final String JSON_JACKSON_DISABLED_MODULES_SERVER = "jersey.config.server.json.jackson.disabled.modules";
+
/**
* Prevent instantiation.
*/
@@ -274,7 +323,7 @@ private CommonProperties() {
*
* @since 2.8
*/
- public static Object getValue(final Map properties, final String propertyName, final Class type) {
+ public static T getValue(final Map properties, final String propertyName, final Class type) {
return PropertiesHelper.getValue(properties, propertyName, type, CommonProperties.LEGACY_FALLBACK_MAP);
}
diff --git a/docs/src/main/docbook/appendix-properties.xml b/docs/src/main/docbook/appendix-properties.xml
index 0f085eb6d4..3da415b49c 100644
--- a/docs/src/main/docbook/appendix-properties.xml
+++ b/docs/src/main/docbook/appendix-properties.xml
@@ -147,6 +147,42 @@
@since 2.30
+
+ &jersey.common.CommonProperties.JSON_JACKSON_ENABLED_MODULES; /
+ &jersey.common.CommonProperties.JSON_JACKSON_ENABLED_MODULES_CLIENT; /
+ &jersey.common.CommonProperties.JSON_JACKSON_ENABLED_MODULES_SERVER;
+
+
+ jersey.config.json.jackson.enabled.modules
+ jersey.config.client.json.jackson.enabled.modules
+ jersey.config.server.json.jackson.enabled.modules
+
+
+ Comma separated list of jackson modules which shall be used for json-jackson provider.
+ If set, only those modules will be used for JSON processing.
+
+ Default value is NULL
+ @since 2.36
+
+
+
+ &jersey.common.CommonProperties.JSON_JACKSON_DISABLED_MODULES; /
+ &jersey.common.CommonProperties.JSON_JACKSON_DISABLED_MODULES_CLIENT; /
+ &jersey.common.CommonProperties.JSON_JACKSON_DISABLED_MODULES_SERVER;
+
+
+ jersey.config.json.jackson.disabled.modules
+ jersey.config.client.json.jackson.disabled.modules
+ jersey.config.server.json.jackson.disabled.modules
+
+
+ Comma separated list of jackson modules which shall be excluded from json-jackson provider.
+ If set, those modules will be excluded from JSON processing.
+
+ Default value is NULL
+ @since 2.36
+
+
&jersey.logging.LoggingFeature.LOGGING_FEATURE_LOGGER_NAME;
diff --git a/docs/src/main/docbook/jersey.ent b/docs/src/main/docbook/jersey.ent
index 1c8bdb0564..e463997a61 100644
--- a/docs/src/main/docbook/jersey.ent
+++ b/docs/src/main/docbook/jersey.ent
@@ -394,6 +394,12 @@
CommonProperties.OUTBOUND_CONTENT_LENGTH_BUFFER_CLIENT" >
CommonProperties.OUTBOUND_CONTENT_LENGTH_BUFFER_SERVER" >
CommonProperties.PROVIDER_DEFAULT_DISABLE" >
+CommonProperties.JSON_JACKSON_ENABLED_MODULES" >
+CommonProperties.JSON_JACKSON_ENABLED_MODULES_CLIENT" >
+CommonProperties.JSON_JACKSON_ENABLED_MODULES_SERVER" >
+CommonProperties.JSON_JACKSON_DISABLED_MODULES" >
+CommonProperties.JSON_JACKSON_DISABLED_MODULES_CLIENT" >
+CommonProperties.JSON_JACKSON_DISABLED_MODULES_SERVER" >
DisposableSupplier">
InjectionManager">
AbstractBinder">
diff --git a/docs/src/main/docbook/media.xml b/docs/src/main/docbook/media.xml
index 547ac61f4a..2946993351 100644
--- a/docs/src/main/docbook/media.xml
+++ b/docs/src/main/docbook/media.xml
@@ -1,7 +1,7 @@
diff --git a/tests/integration/servlet-2.5-reload/src/test/java/org/glassfish/jersey/tests/integration/servlet_25_config_reload/ReloadTestIT.java b/tests/integration/servlet-2.5-reload/src/test/java/org/glassfish/jersey/tests/integration/servlet_25_config_reload/ReloadTestIT.java
index 6515b8aa3a..67095bb87d 100644
--- a/tests/integration/servlet-2.5-reload/src/test/java/org/glassfish/jersey/tests/integration/servlet_25_config_reload/ReloadTestIT.java
+++ b/tests/integration/servlet-2.5-reload/src/test/java/org/glassfish/jersey/tests/integration/servlet_25_config_reload/ReloadTestIT.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022 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
@@ -24,6 +24,7 @@
import org.glassfish.jersey.test.spi.TestContainerException;
import org.glassfish.jersey.test.spi.TestContainerFactory;
+import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -44,6 +45,7 @@ protected TestContainerFactory getTestContainerFactory() throws TestContainerExc
}
@Test
+ @Ignore //TODO - fix after 2.36
public void testReload() throws Exception {
Response response = target().path("helloworld").request().get();
assertEquals(200, response.getStatus());
From bc70ab97fa44b7a943b624ecba8a0a2e9d411fe3 Mon Sep 17 00:00:00 2001
From: Maxim Nesen <24524084+senivam@users.noreply.github.com>
Date: Mon, 13 Jun 2022 10:39:22 +0200
Subject: [PATCH 051/305] Dependencies versions update (#5078)
Signed-off-by: Maxim Nesen
---
pom.xml | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2b2267ab5b..6e9baffb3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2110,30 +2110,20 @@
9.3
2.3.6
- 1.1
- 2.0.2
2.11.0
3.3.2
- 2.0
3.1.0
8.28
3.3
- 3.2.5
1.3.3
1.7
3.0.4
2.3.27-incubating
1.9.59
- 1.16
- 2.4.4
31.1-jre
2.2
1.0.3
1.6
- 2.6.1
- org.glassfish.hk2.*;version="[2.5,4)"
- org.jvnet.hk2.*;version="[2.5,4)"
- 5.1.0
4.5.13
5.1.2
2.13.3
@@ -2145,9 +2135,6 @@
1.3.7
1.10.2
1.44
- 2.3.6
- 1.2.7
- 1.3.3
5.6.0
4.0.1
3.9.0
@@ -2158,15 +2145,11 @@
6.0.0
1.10.0
5.0.0
- 1.6.0
4.13.4
0.7.4
1.2.4
1.2.5
2.0.4
- 2.4
- 3.0.1
- 4.0.3
6.0.1
false
1.7.21
@@ -2182,7 +2165,16 @@
20.3.2
+ 1.2
+ 2.0.2
+ 3.2.6
5.1.0
+ 1.16
+ 2.4.4
+ 2.6.1
+ org.glassfish.hk2.*;version="[2.5,4)"
+ org.jvnet.hk2.*;version="[2.5,4)"
+ 5.1.0
3.0.8
1.2.2
3.0.3
@@ -2193,17 +2185,25 @@
2.2.3
2.0.2
2.3.3
- 2.3.3
+ 2.3.6
2.1
2.1.6
6.1.26
- 9.4.42.v20210604
+ 9.4.46.v20220331
6.1.14
1.0.2
1.1.6
1.1.6
+ 2.3.6
+ 1.2.7
+ 1.3.3
+ 2.0.1
1.9.13
- 2.7.9
- 1.0.9
+ 2.7.10
+ 1.6.1
+ 2.5
+ 3.0.1
+ 4.0.4
+ 1.0.11
From 54415d82e8e0b9ea10d19f8a3d79b990ea4a0e93 Mon Sep 17 00:00:00 2001
From: jersey-bot
Date: Mon, 13 Jun 2022 09:24:22 +0000
Subject: [PATCH 052/305] 2.36
---
archetypes/jersey-example-java8-webapp/pom.xml | 4 ++--
archetypes/jersey-heroku-webapp/pom.xml | 4 ++--
archetypes/jersey-quickstart-grizzly2/pom.xml | 4 ++--
archetypes/jersey-quickstart-webapp/pom.xml | 4 ++--
archetypes/pom.xml | 4 ++--
bom/pom.xml | 2 +-
bundles/apidocs/pom.xml | 2 +-
bundles/examples/pom.xml | 4 ++--
bundles/jaxrs-ri/pom.xml | 4 ++--
bundles/pom.xml | 4 ++--
connectors/apache-connector/pom.xml | 2 +-
connectors/apache5-connector/pom.xml | 2 +-
connectors/grizzly-connector/pom.xml | 4 ++--
connectors/helidon-connector/pom.xml | 4 ++--
connectors/jdk-connector/pom.xml | 4 ++--
connectors/jetty-connector/pom.xml | 2 +-
connectors/netty-connector/pom.xml | 2 +-
connectors/pom.xml | 2 +-
containers/glassfish/jersey-gf-ejb/pom.xml | 4 ++--
containers/glassfish/pom.xml | 4 ++--
containers/grizzly2-http/pom.xml | 4 ++--
containers/grizzly2-servlet/pom.xml | 4 ++--
containers/jdk-http/pom.xml | 2 +-
containers/jersey-servlet-core/pom.xml | 4 ++--
containers/jersey-servlet/pom.xml | 4 ++--
containers/jetty-http/pom.xml | 4 ++--
containers/jetty-servlet/pom.xml | 4 ++--
containers/netty-http/pom.xml | 4 ++--
containers/pom.xml | 4 ++--
containers/simple-http/pom.xml | 4 ++--
core-client/pom.xml | 2 +-
core-common/pom.xml | 2 +-
core-server/pom.xml | 2 +-
docs/pom.xml | 4 ++--
examples/assemblies/pom.xml | 4 ++--
examples/bookmark-em/pom.xml | 4 ++--
examples/bookmark/pom.xml | 4 ++--
examples/bookstore-webapp/pom.xml | 4 ++--
examples/cdi-webapp/pom.xml | 4 ++--
examples/clipboard-programmatic/pom.xml | 4 ++--
examples/clipboard/pom.xml | 4 ++--
examples/declarative-linking/pom.xml | 4 ++--
examples/entity-filtering-security/pom.xml | 4 ++--
examples/entity-filtering-selectable/pom.xml | 4 ++--
examples/entity-filtering/pom.xml | 4 ++--
examples/exception-mapping/pom.xml | 4 ++--
examples/extended-wadl-webapp/pom.xml | 4 ++--
examples/freemarker-webapp/pom.xml | 4 ++--
examples/groovy/pom.xml | 4 ++--
examples/helloworld-benchmark/pom.xml | 4 ++--
examples/helloworld-cdi2-se/pom.xml | 4 ++--
examples/helloworld-netty/pom.xml | 4 ++--
examples/helloworld-programmatic/pom.xml | 4 ++--
examples/helloworld-pure-jax-rs/pom.xml | 4 ++--
examples/helloworld-spring-annotations/pom.xml | 4 ++--
examples/helloworld-spring-webapp/pom.xml | 4 ++--
examples/helloworld-webapp/pom.xml | 4 ++--
examples/helloworld-weld/pom.xml | 4 ++--
examples/helloworld/pom.xml | 4 ++--
examples/http-patch/pom.xml | 4 ++--
examples/http-trace/pom.xml | 4 ++--
examples/https-clientserver-grizzly/pom.xml | 4 ++--
examples/https-server-glassfish/pom.xml | 4 ++--
examples/java8-webapp/pom.xml | 4 ++--
examples/jaxb/pom.xml | 4 ++--
examples/jaxrs-types-injection/pom.xml | 4 ++--
examples/jersey-ejb/pom.xml | 4 ++--
examples/json-binding-webapp/pom.xml | 4 ++--
examples/json-jackson/pom.xml | 4 ++--
examples/json-jackson1/pom.xml | 4 ++--
examples/json-jettison/pom.xml | 4 ++--
examples/json-moxy/pom.xml | 4 ++--
examples/json-processing-webapp/pom.xml | 4 ++--
examples/json-with-padding/pom.xml | 4 ++--
examples/managed-beans-webapp/pom.xml | 4 ++--
examples/managed-client-simple-webapp/pom.xml | 4 ++--
examples/managed-client-webapp/pom.xml | 4 ++--
examples/managed-client/pom.xml | 4 ++--
examples/multipart-webapp/pom.xml | 4 ++--
examples/oauth-client-twitter/pom.xml | 4 ++--
examples/open-tracing/pom.xml | 4 ++--
examples/osgi-helloworld-webapp/additional-bundle/pom.xml | 4 ++--
.../osgi-helloworld-webapp/alternate-version-bundle/pom.xml | 4 ++--
examples/osgi-helloworld-webapp/functional-test/pom.xml | 4 ++--
examples/osgi-helloworld-webapp/lib-bundle/pom.xml | 4 ++--
examples/osgi-helloworld-webapp/pom.xml | 4 ++--
examples/osgi-helloworld-webapp/war-bundle/pom.xml | 4 ++--
examples/osgi-http-service/bundle/pom.xml | 4 ++--
examples/osgi-http-service/functional-test/pom.xml | 4 ++--
examples/osgi-http-service/pom.xml | 4 ++--
examples/pom.xml | 4 ++--
examples/reload/pom.xml | 4 ++--
examples/rx-client-webapp/pom.xml | 4 ++--
examples/server-async-managed/pom.xml | 4 ++--
examples/server-async-standalone/client/pom.xml | 4 ++--
examples/server-async-standalone/pom.xml | 4 ++--
examples/server-async-standalone/webapp/pom.xml | 4 ++--
examples/server-async/pom.xml | 4 ++--
examples/server-sent-events-jaxrs/pom.xml | 4 ++--
examples/server-sent-events-jersey/pom.xml | 4 ++--
examples/servlet3-webapp/pom.xml | 4 ++--
examples/simple-console/pom.xml | 4 ++--
examples/sse-item-store-jaxrs-webapp/pom.xml | 4 ++--
examples/sse-item-store-jersey-webapp/pom.xml | 4 ++--
examples/sse-twitter-aggregator/pom.xml | 4 ++--
examples/system-properties-example/pom.xml | 4 ++--
examples/webapp-example-parent/pom.xml | 4 ++--
examples/xml-moxy/pom.xml | 4 ++--
ext/bean-validation/pom.xml | 4 ++--
ext/cdi/jersey-cdi-rs-inject/pom.xml | 4 ++--
ext/cdi/jersey-cdi1x-ban-custom-hk2-binding/pom.xml | 2 +-
ext/cdi/jersey-cdi1x-servlet/pom.xml | 4 ++--
ext/cdi/jersey-cdi1x-transaction/pom.xml | 4 ++--
ext/cdi/jersey-cdi1x-validation/pom.xml | 4 ++--
ext/cdi/jersey-cdi1x/pom.xml | 4 ++--
ext/cdi/jersey-weld2-se/pom.xml | 4 ++--
ext/cdi/pom.xml | 4 ++--
ext/entity-filtering/pom.xml | 4 ++--
ext/metainf-services/pom.xml | 4 ++--
ext/microprofile/mp-config/pom.xml | 4 ++--
ext/microprofile/mp-rest-client/pom.xml | 4 ++--
ext/microprofile/pom.xml | 4 ++--
ext/mvc-bean-validation/pom.xml | 4 ++--
ext/mvc-freemarker/pom.xml | 4 ++--
ext/mvc-jsp/pom.xml | 4 ++--
ext/mvc-mustache/pom.xml | 4 ++--
ext/mvc/pom.xml | 4 ++--
ext/pom.xml | 4 ++--
ext/proxy-client/pom.xml | 4 ++--
ext/rx/pom.xml | 2 +-
ext/rx/rx-client-guava/pom.xml | 2 +-
ext/rx/rx-client-rxjava/pom.xml | 4 ++--
ext/rx/rx-client-rxjava2/pom.xml | 4 ++--
ext/servlet-portability/pom.xml | 4 ++--
ext/spring4/pom.xml | 4 ++--
ext/spring5/pom.xml | 4 ++--
ext/wadl-doclet/pom.xml | 4 ++--
incubator/cdi-inject-weld/pom.xml | 4 ++--
incubator/declarative-linking/pom.xml | 4 ++--
incubator/gae-integration/pom.xml | 4 ++--
incubator/html-json/pom.xml | 4 ++--
incubator/kryo/pom.xml | 4 ++--
incubator/open-tracing/pom.xml | 4 ++--
incubator/pom.xml | 4 ++--
inject/cdi2-se/pom.xml | 4 ++--
inject/hk2/pom.xml | 2 +-
inject/pom.xml | 4 ++--
media/jaxb/pom.xml | 4 ++--
media/json-binding/pom.xml | 4 ++--
media/json-jackson/pom.xml | 2 +-
media/json-jackson1/pom.xml | 4 ++--
media/json-jettison/pom.xml | 4 ++--
media/json-processing/pom.xml | 4 ++--
media/moxy/pom.xml | 4 ++--
media/multipart/pom.xml | 4 ++--
media/pom.xml | 4 ++--
media/sse/pom.xml | 4 ++--
pom.xml | 2 +-
security/oauth1-client/pom.xml | 4 ++--
security/oauth1-server/pom.xml | 4 ++--
security/oauth1-signature/pom.xml | 4 ++--
security/oauth2-client/pom.xml | 4 ++--
security/pom.xml | 4 ++--
test-framework/core/pom.xml | 4 ++--
test-framework/maven/container-runner-maven-plugin/pom.xml | 2 +-
test-framework/maven/custom-enforcer-rules/pom.xml | 2 +-
test-framework/maven/pom.xml | 4 ++--
test-framework/memleak-test-common/pom.xml | 2 +-
test-framework/pom.xml | 4 ++--
test-framework/providers/bundle/pom.xml | 4 ++--
test-framework/providers/external/pom.xml | 4 ++--
test-framework/providers/grizzly2/pom.xml | 4 ++--
test-framework/providers/inmemory/pom.xml | 4 ++--
test-framework/providers/jdk-http/pom.xml | 4 ++--
test-framework/providers/jetty/pom.xml | 4 ++--
test-framework/providers/netty/pom.xml | 4 ++--
test-framework/providers/pom.xml | 4 ++--
test-framework/providers/simple/pom.xml | 4 ++--
test-framework/util/pom.xml | 4 ++--
tests/e2e-client/pom.xml | 2 +-
tests/e2e-core-common/pom.xml | 2 +-
tests/e2e-entity/pom.xml | 2 +-
tests/e2e-inject/cdi-inject-weld/pom.xml | 2 +-
tests/e2e-inject/cdi2-se/pom.xml | 2 +-
tests/e2e-inject/hk2/pom.xml | 4 ++--
tests/e2e-inject/pom.xml | 4 ++--
tests/e2e-server/pom.xml | 2 +-
tests/e2e-testng/pom.xml | 4 ++--
tests/e2e/pom.xml | 2 +-
tests/integration/asm/pom.xml | 2 +-
tests/integration/async-jersey-filter/pom.xml | 4 ++--
.../cdi-integration/cdi-beanvalidation-webapp/pom.xml | 4 ++--
.../cdi-integration/cdi-client-on-server/pom.xml | 4 ++--
tests/integration/cdi-integration/cdi-client/pom.xml | 4 ++--
.../integration/cdi-integration/cdi-ejb-test-webapp/pom.xml | 4 ++--
.../cdi-iface-with-non-jaxrs-impl-test-webapp/pom.xml | 4 ++--
tests/integration/cdi-integration/cdi-log-check/pom.xml | 4 ++--
.../integration/cdi-integration/cdi-manually-bound/pom.xml | 4 ++--
.../integration/cdi-integration/cdi-multimodule/ear/pom.xml | 4 ++--
.../integration/cdi-integration/cdi-multimodule/lib/pom.xml | 4 ++--
tests/integration/cdi-integration/cdi-multimodule/pom.xml | 4 ++--
.../cdi-integration/cdi-multimodule/war1/pom.xml | 2 +-
.../cdi-integration/cdi-multimodule/war2/pom.xml | 2 +-
.../cdi-integration/cdi-multipart-webapp/pom.xml | 4 ++--
.../cdi-integration/cdi-resource-with-at-context/pom.xml | 4 ++--
tests/integration/cdi-integration/cdi-singleton/pom.xml | 4 ++--
tests/integration/cdi-integration/cdi-test-webapp/pom.xml | 4 ++--
.../cdi-with-jersey-injection-custom-cfg-webapp/pom.xml | 4 ++--
.../pom.xml | 4 ++--
.../cdi-with-jersey-injection-webapp/pom.xml | 4 ++--
.../cdi-integration/context-inject-on-server/pom.xml | 4 ++--
tests/integration/cdi-integration/pom.xml | 4 ++--
tests/integration/client-connector-provider/pom.xml | 4 ++--
tests/integration/ejb-multimodule-reload/ear/pom.xml | 4 ++--
tests/integration/ejb-multimodule-reload/lib/pom.xml | 4 ++--
tests/integration/ejb-multimodule-reload/pom.xml | 4 ++--
tests/integration/ejb-multimodule-reload/war1/pom.xml | 2 +-
tests/integration/ejb-multimodule-reload/war2/pom.xml | 2 +-
tests/integration/ejb-multimodule/ear/pom.xml | 4 ++--
tests/integration/ejb-multimodule/lib/pom.xml | 4 ++--
tests/integration/ejb-multimodule/pom.xml | 4 ++--
tests/integration/ejb-multimodule/war/pom.xml | 2 +-
tests/integration/ejb-test-webapp/pom.xml | 2 +-
tests/integration/externalproperties/pom.xml | 4 ++--
tests/integration/j-376/pom.xml | 4 ++--
tests/integration/j-441/ear/pom.xml | 4 ++--
tests/integration/j-441/pom.xml | 4 ++--
tests/integration/j-441/war1/pom.xml | 4 ++--
tests/integration/j-441/war2/pom.xml | 4 ++--
tests/integration/j-59/ear/pom.xml | 4 ++--
tests/integration/j-59/lib/pom.xml | 4 ++--
tests/integration/j-59/pom.xml | 4 ++--
tests/integration/j-59/war/pom.xml | 2 +-
tests/integration/jaxrs-component-inject/pom.xml | 4 ++--
tests/integration/jersey-1107/pom.xml | 4 ++--
tests/integration/jersey-1223/pom.xml | 4 ++--
tests/integration/jersey-1604/pom.xml | 4 ++--
tests/integration/jersey-1667/pom.xml | 4 ++--
tests/integration/jersey-1829/pom.xml | 4 ++--
tests/integration/jersey-1883/pom.xml | 4 ++--
tests/integration/jersey-1928/pom.xml | 4 ++--
tests/integration/jersey-1960/pom.xml | 4 ++--
tests/integration/jersey-1964/pom.xml | 4 ++--
tests/integration/jersey-2031/pom.xml | 4 ++--
tests/integration/jersey-2136/pom.xml | 4 ++--
tests/integration/jersey-2137/pom.xml | 4 ++--
tests/integration/jersey-2154/pom.xml | 4 ++--
tests/integration/jersey-2160/pom.xml | 4 ++--
tests/integration/jersey-2164/pom.xml | 4 ++--
tests/integration/jersey-2167/pom.xml | 4 ++--
tests/integration/jersey-2176/pom.xml | 4 ++--
tests/integration/jersey-2184/pom.xml | 4 ++--
tests/integration/jersey-2255/pom.xml | 4 ++--
tests/integration/jersey-2322/pom.xml | 4 ++--
tests/integration/jersey-2335/pom.xml | 4 ++--
tests/integration/jersey-2421/pom.xml | 4 ++--
tests/integration/jersey-2551/pom.xml | 4 ++--
tests/integration/jersey-2612/pom.xml | 2 +-
tests/integration/jersey-2637/pom.xml | 4 ++--
tests/integration/jersey-2654/pom.xml | 4 ++--
tests/integration/jersey-2673/pom.xml | 4 ++--
tests/integration/jersey-2689/pom.xml | 4 ++--
tests/integration/jersey-2704/pom.xml | 4 ++--
tests/integration/jersey-2776/pom.xml | 4 ++--
tests/integration/jersey-2794/pom.xml | 4 ++--
tests/integration/jersey-2846/pom.xml | 4 ++--
tests/integration/jersey-2878/pom.xml | 4 ++--
tests/integration/jersey-2892/pom.xml | 4 ++--
tests/integration/jersey-3662/pom.xml | 4 ++--
tests/integration/jersey-3670/pom.xml | 4 ++--
tests/integration/jersey-3796/pom.xml | 4 ++--
tests/integration/jersey-3992/pom.xml | 4 ++--
tests/integration/jersey-4003/pom.xml | 4 ++--
tests/integration/jersey-4099/pom.xml | 4 ++--
tests/integration/jersey-4321/pom.xml | 2 +-
tests/integration/jersey-4507/pom.xml | 4 ++--
tests/integration/jersey-4542/pom.xml | 4 ++--
tests/integration/jersey-4697/pom.xml | 4 ++--
tests/integration/jersey-4722/pom.xml | 4 ++--
tests/integration/jersey-4949/pom.xml | 2 +-
tests/integration/jersey-780/pom.xml | 4 ++--
tests/integration/jetty-response-close/pom.xml | 4 ++--
tests/integration/microprofile/config/helidon/pom.xml | 4 ++--
tests/integration/microprofile/config/pom.xml | 4 ++--
tests/integration/microprofile/config/webapp/pom.xml | 4 ++--
tests/integration/microprofile/pom.xml | 4 ++--
tests/integration/microprofile/rest-client/pom.xml | 4 ++--
.../microprofile/rest-client14-compatibility/pom.xml | 2 +-
tests/integration/pom.xml | 2 +-
tests/integration/portability-jersey-1/pom.xml | 4 ++--
tests/integration/portability-jersey-2/pom.xml | 4 ++--
tests/integration/property-check/pom.xml | 2 +-
tests/integration/reactive-streams/pom.xml | 4 ++--
tests/integration/reactive-streams/sse/pom.xml | 4 ++--
tests/integration/security-digest/pom.xml | 4 ++--
tests/integration/servlet-2.5-autodiscovery-1/pom.xml | 4 ++--
tests/integration/servlet-2.5-autodiscovery-2/pom.xml | 4 ++--
tests/integration/servlet-2.5-filter/pom.xml | 4 ++--
tests/integration/servlet-2.5-inflector-1/pom.xml | 4 ++--
tests/integration/servlet-2.5-init-1/pom.xml | 4 ++--
tests/integration/servlet-2.5-init-2/pom.xml | 4 ++--
tests/integration/servlet-2.5-init-3/pom.xml | 4 ++--
tests/integration/servlet-2.5-init-4/pom.xml | 4 ++--
tests/integration/servlet-2.5-init-5/pom.xml | 4 ++--
tests/integration/servlet-2.5-init-6/pom.xml | 4 ++--
tests/integration/servlet-2.5-init-7/pom.xml | 4 ++--
tests/integration/servlet-2.5-init-8/pom.xml | 4 ++--
tests/integration/servlet-2.5-mvc-1/pom.xml | 4 ++--
tests/integration/servlet-2.5-mvc-2/pom.xml | 4 ++--
tests/integration/servlet-2.5-mvc-3/pom.xml | 4 ++--
tests/integration/servlet-2.5-reload/pom.xml | 2 +-
tests/integration/servlet-3-async/pom.xml | 4 ++--
tests/integration/servlet-3-chunked-io/pom.xml | 4 ++--
tests/integration/servlet-3-filter/pom.xml | 4 ++--
tests/integration/servlet-3-gf-async/pom.xml | 4 ++--
tests/integration/servlet-3-inflector-1/pom.xml | 4 ++--
tests/integration/servlet-3-init-1/pom.xml | 4 ++--
tests/integration/servlet-3-init-2/pom.xml | 4 ++--
tests/integration/servlet-3-init-3/pom.xml | 4 ++--
tests/integration/servlet-3-init-4/pom.xml | 4 ++--
tests/integration/servlet-3-init-5/pom.xml | 4 ++--
tests/integration/servlet-3-init-6/pom.xml | 4 ++--
tests/integration/servlet-3-init-7/pom.xml | 4 ++--
tests/integration/servlet-3-init-8/pom.xml | 4 ++--
tests/integration/servlet-3-init-9/pom.xml | 4 ++--
tests/integration/servlet-3-init-provider/pom.xml | 4 ++--
tests/integration/servlet-3-params/pom.xml | 4 ++--
tests/integration/servlet-3-sse-1/pom.xml | 4 ++--
tests/integration/servlet-4.0-mvc-1/pom.xml | 4 ++--
tests/integration/servlet-request-wrapper-binding-2/pom.xml | 2 +-
tests/integration/servlet-request-wrapper-binding/pom.xml | 2 +-
tests/integration/servlet-tests/pom.xml | 4 ++--
tests/integration/sonar-test/pom.xml | 4 ++--
tests/integration/spring4/pom.xml | 4 ++--
tests/integration/spring5/pom.xml | 4 ++--
tests/integration/tracing-support/pom.xml | 4 ++--
tests/jmockit/pom.xml | 2 +-
tests/mem-leaks/pom.xml | 4 ++--
tests/mem-leaks/redeployment/pom.xml | 4 ++--
.../redeployment/redeployment-hello-world-app-ref/pom.xml | 6 +++---
.../redeployment/redeployment-leaking-test-app/pom.xml | 2 +-
.../redeployment/redeployment-no-jersey-app/pom.xml | 4 ++--
.../redeployment/redeployment-threadlocals-app/pom.xml | 4 ++--
tests/mem-leaks/test-cases/bean-param-leak/pom.xml | 4 ++--
tests/mem-leaks/test-cases/leaking-test-app/pom.xml | 2 +-
tests/mem-leaks/test-cases/pom.xml | 4 ++--
.../mem-leaks/test-cases/shutdown-hook-leak-client/pom.xml | 4 ++--
tests/mem-leaks/test-cases/shutdown-hook-leak/pom.xml | 4 ++--
tests/osgi/functional/pom.xml | 4 ++--
tests/osgi/pom.xml | 4 ++--
tests/performance/benchmarks/pom.xml | 4 ++--
tests/performance/pom.xml | 4 ++--
tests/performance/runners/jersey-grizzly-runner/pom.xml | 4 ++--
tests/performance/runners/pom.xml | 4 ++--
tests/performance/test-cases/assemblies/pom.xml | 4 ++--
tests/performance/test-cases/filter-dynamic/pom.xml | 4 ++--
tests/performance/test-cases/filter-global/pom.xml | 4 ++--
tests/performance/test-cases/filter-name/pom.xml | 4 ++--
tests/performance/test-cases/interceptor-dynamic/pom.xml | 4 ++--
tests/performance/test-cases/interceptor-global/pom.xml | 4 ++--
tests/performance/test-cases/interceptor-name/pom.xml | 4 ++--
tests/performance/test-cases/mbw-custom-provider/pom.xml | 4 ++--
tests/performance/test-cases/mbw-json-jackson/pom.xml | 4 ++--
tests/performance/test-cases/mbw-json-moxy/pom.xml | 4 ++--
tests/performance/test-cases/mbw-kryo/pom.xml | 4 ++--
tests/performance/test-cases/mbw-text-plain/pom.xml | 4 ++--
tests/performance/test-cases/mbw-xml-jaxb/pom.xml | 4 ++--
tests/performance/test-cases/mbw-xml-moxy/pom.xml | 4 ++--
tests/performance/test-cases/param-srl/pom.xml | 4 ++--
tests/performance/test-cases/pom.xml | 4 ++--
tests/performance/test-cases/proxy-injection/pom.xml | 4 ++--
tests/performance/tools/pom.xml | 4 ++--
tests/pom.xml | 4 ++--
tests/stress/pom.xml | 2 +-
374 files changed, 701 insertions(+), 701 deletions(-)
diff --git a/archetypes/jersey-example-java8-webapp/pom.xml b/archetypes/jersey-example-java8-webapp/pom.xml
index baa854d386..303ca19c1f 100644
--- a/archetypes/jersey-example-java8-webapp/pom.xml
+++ b/archetypes/jersey-example-java8-webapp/pom.xml
@@ -1,7 +1,7 @@
${jakarta.annotation.osgi.version},
- jakarta.json.*;version="[0,3)",
- org.glassfish.json.*;version="[0,3)",
+ jakarta.json.*;version="[2,3)",
*
@@ -81,13 +80,12 @@
jakarta.json-api