From ac7ba8b8afc2f838e6c037b22846bb37972e1f1f Mon Sep 17 00:00:00 2001 From: jansupol Date: Wed, 22 Sep 2021 16:27:27 +0200 Subject: [PATCH] Remove JDK 8 related maven configuration Signed-off-by: jansupol --- connectors/jdk-connector/pom.xml | 13 +- connectors/jetty-connector/pom.xml | 189 +- .../jetty/connector/JettyConnector.java | 0 .../connector/JettyConnectorProvider.java | 2 +- .../connector/JettyHttpClientContract.java | 0 .../connector/JettyHttpClientSupplier.java | 0 .../connector/JettyConnectorProvider.java | 44 - .../connector/JettyHttpClientContract.java | 33 - .../connector/JettyHttpClientSupplier.java | 61 - containers/jdk-http/pom.xml | 45 +- containers/jetty-http/pom.xml | 158 -- .../jersey/jetty/JettyHttpContainer.java | 0 .../jetty/JettyHttpContainerFactory.java | 2 +- .../jersey/jetty/JettyHttpContainer.java | 58 - .../jetty/JettyHttpContainerFactory.java | 93 - containers/jetty-servlet/pom.xml | 195 +- .../servlet/JettyWebContainerFactory.java | 2 +- .../servlet/JettyWebContainerFactory.java | 90 - core-common/pom.xml | 445 ----- .../jersey/internal/jsr166/Flow.java | 0 .../internal/jsr166/JerseyFlowSubscriber.java | 0 .../internal/jsr166/SubmissionPublisher.java | 0 .../jsr166/SubmissionPublisherFactory.java | 0 .../jsr166/SubmittableFlowPublisher.java | 0 .../jersey/internal/jsr166/package-info.java | 0 .../internal/jsr166/JerseyFlowSubscriber.java | 20 - .../internal/jsr166/SubmissionPublisher.java | 1626 ----------------- .../jsr166/SubmissionPublisherFactory.java | 53 - .../internal/jsr166/UnsafeAccessor.java | 53 - etc/config/copyright-exclude | 2 - examples/bookstore-webapp/pom.xml | 18 +- examples/https-clientserver-grizzly/pom.xml | 28 +- ext/microprofile/mp-config/pom.xml | 43 +- ext/pom.xml | 2 +- incubator/declarative-linking/pom.xml | 28 +- media/multipart/pom.xml | 42 +- pom.xml | 2 +- test-framework/providers/jetty/pom.xml | 144 -- .../test/jetty/JettyTestContainerFactory.java | 2 +- .../test/jetty/JettyTestContainerFactory.java | 38 - tests/e2e-client/pom.xml | 15 +- tests/e2e/pom.xml | 20 - tests/integration/j-59/war/pom.xml | 21 +- tests/integration/jersey-2322/pom.xml | 8 - tests/integration/servlet-4.0-mvc-1/pom.xml | 28 +- .../test-cases/mbw-xml-jaxb/pom.xml | 43 +- 46 files changed, 90 insertions(+), 3576 deletions(-) rename connectors/jetty-connector/src/main/{java11 => java}/org/glassfish/jersey/jetty/connector/JettyConnector.java (100%) rename connectors/jetty-connector/src/main/{java11 => java}/org/glassfish/jersey/jetty/connector/JettyConnectorProvider.java (98%) rename connectors/jetty-connector/src/main/{java11 => java}/org/glassfish/jersey/jetty/connector/JettyHttpClientContract.java (100%) rename connectors/jetty-connector/src/main/{java11 => java}/org/glassfish/jersey/jetty/connector/JettyHttpClientSupplier.java (100%) delete mode 100644 connectors/jetty-connector/src/main/java8/org/glassfish/jersey/jetty/connector/JettyConnectorProvider.java delete mode 100644 connectors/jetty-connector/src/main/java8/org/glassfish/jersey/jetty/connector/JettyHttpClientContract.java delete mode 100644 connectors/jetty-connector/src/main/java8/org/glassfish/jersey/jetty/connector/JettyHttpClientSupplier.java rename containers/jetty-http/src/main/{java11 => java}/org/glassfish/jersey/jetty/JettyHttpContainer.java (100%) rename containers/jetty-http/src/main/{java11 => java}/org/glassfish/jersey/jetty/JettyHttpContainerFactory.java (99%) delete mode 100644 containers/jetty-http/src/main/java8/org/glassfish/jersey/jetty/JettyHttpContainer.java delete mode 100644 containers/jetty-http/src/main/java8/org/glassfish/jersey/jetty/JettyHttpContainerFactory.java rename containers/jetty-servlet/src/main/{java11 => java}/org/glassfish/jersey/jetty/servlet/JettyWebContainerFactory.java (99%) delete mode 100644 containers/jetty-servlet/src/main/java8/org/glassfish/jersey/jetty/servlet/JettyWebContainerFactory.java rename core-common/src/main/{jsr166 => java}/org/glassfish/jersey/internal/jsr166/Flow.java (100%) rename core-common/src/main/{java11 => java}/org/glassfish/jersey/internal/jsr166/JerseyFlowSubscriber.java (100%) rename core-common/src/main/{java11 => java}/org/glassfish/jersey/internal/jsr166/SubmissionPublisher.java (100%) rename core-common/src/main/{java11 => java}/org/glassfish/jersey/internal/jsr166/SubmissionPublisherFactory.java (100%) rename core-common/src/main/{jsr166 => java}/org/glassfish/jersey/internal/jsr166/SubmittableFlowPublisher.java (100%) rename core-common/src/main/{jsr166 => java}/org/glassfish/jersey/internal/jsr166/package-info.java (100%) delete mode 100644 core-common/src/main/java8/org/glassfish/jersey/internal/jsr166/JerseyFlowSubscriber.java delete mode 100644 core-common/src/main/java8/org/glassfish/jersey/internal/jsr166/SubmissionPublisher.java delete mode 100644 core-common/src/main/java8/org/glassfish/jersey/internal/jsr166/SubmissionPublisherFactory.java delete mode 100644 core-common/src/main/java8/org/glassfish/jersey/internal/jsr166/UnsafeAccessor.java rename test-framework/providers/jetty/src/main/{java11 => java}/org/glassfish/jersey/test/jetty/JettyTestContainerFactory.java (98%) delete mode 100644 test-framework/providers/jetty/src/main/java8/org/glassfish/jersey/test/jetty/JettyTestContainerFactory.java diff --git a/connectors/jdk-connector/pom.xml b/connectors/jdk-connector/pom.xml index 15b8cdc8fb..ffa5100a30 100644 --- a/connectors/jdk-connector/pom.xml +++ b/connectors/jdk-connector/pom.xml @@ -34,6 +34,8 @@ UTF-8 + + -Djdk.tls.server.protocols=TLSv1.2 @@ -77,16 +79,6 @@ - - jdk11+ - - [11,) - - - - -Djdk.tls.server.protocols=TLSv1.2 - - disable_tls1and11 @@ -110,5 +102,4 @@ - diff --git a/connectors/jetty-connector/pom.xml b/connectors/jetty-connector/pom.xml index 90761ac50a..6b1fe22f30 100644 --- a/connectors/jetty-connector/pom.xml +++ b/connectors/jetty-connector/pom.xml @@ -34,10 +34,6 @@ UTF-8 - ${project.basedir}/target - ${project.basedir}/src/main/java8 - ${project.basedir}/target11 - ${project.basedir}/src/main/java11 @@ -62,12 +58,12 @@ ${project.version} test - - - - - - + + org.glassfish.jersey.media + jersey-media-json-jackson + ${project.version} + test + org.glassfish.jersey.test-framework.providers jersey-test-framework-provider-jetty @@ -84,6 +80,11 @@ jakarta.xml.bind-api test + + com.sun.xml.bind + jaxb-osgi + test + @@ -102,174 +103,6 @@ org.apache.maven.plugins maven-compiler-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - - org/glassfish/jersey/jetty/connector/EntityTest.java - - - - - - - - - JettyExclude - - 1.8 - - - 9.4.28.v20200408 - - - - org.eclipse.jetty - jetty-client - ${jetty.version} - - - org.eclipse.jetty - jetty-util - ${jetty.version} - - - - ${java8.build.outputDirectory} - - - org.codehaus.mojo - build-helper-maven-plugin - - - generate-sources - - add-source - - - - ${java8.sourceDirectory} - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org/glassfish/jersey/jetty/connector/*.java - - - - - - - - Jetty11 - - [11,) - - - ${java11.build.outputDirectory} - - - org.codehaus.mojo - build-helper-maven-plugin - - - generate-sources - - add-source - - - - ${java11.sourceDirectory} - - - - - - - - - - copyJDK11FilesToMultiReleaseJar - - - - target11/classes/org/glassfish/jersey/jetty/connector/JettyConnectorProvider.class - - 1.8 - - - - - org.apache.felix - maven-bundle-plugin - true - true - - - true - - - - - org.apache.maven.plugins - maven-resources-plugin - true - - - copy-jdk11-classes - prepare-package - - copy-resources - - - ${java8.build.outputDirectory}/classes/META-INF/versions/11 - - - ${java11.build.outputDirectory}/classes - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - copy-jdk11-sources - package - - - - sources-jar: ${sources-jar} - - - - - - - run - - - - - - - - - diff --git a/connectors/jetty-connector/src/main/java11/org/glassfish/jersey/jetty/connector/JettyConnector.java b/connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnector.java similarity index 100% rename from connectors/jetty-connector/src/main/java11/org/glassfish/jersey/jetty/connector/JettyConnector.java rename to connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnector.java diff --git a/connectors/jetty-connector/src/main/java11/org/glassfish/jersey/jetty/connector/JettyConnectorProvider.java b/connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnectorProvider.java similarity index 98% rename from connectors/jetty-connector/src/main/java11/org/glassfish/jersey/jetty/connector/JettyConnectorProvider.java rename to connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnectorProvider.java index 44146c89ab..933ad39b5c 100644 --- a/connectors/jetty-connector/src/main/java11/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, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 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 diff --git a/connectors/jetty-connector/src/main/java11/org/glassfish/jersey/jetty/connector/JettyHttpClientContract.java b/connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyHttpClientContract.java similarity index 100% rename from connectors/jetty-connector/src/main/java11/org/glassfish/jersey/jetty/connector/JettyHttpClientContract.java rename to connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyHttpClientContract.java diff --git a/connectors/jetty-connector/src/main/java11/org/glassfish/jersey/jetty/connector/JettyHttpClientSupplier.java b/connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyHttpClientSupplier.java similarity index 100% rename from connectors/jetty-connector/src/main/java11/org/glassfish/jersey/jetty/connector/JettyHttpClientSupplier.java rename to connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyHttpClientSupplier.java diff --git a/connectors/jetty-connector/src/main/java8/org/glassfish/jersey/jetty/connector/JettyConnectorProvider.java b/connectors/jetty-connector/src/main/java8/org/glassfish/jersey/jetty/connector/JettyConnectorProvider.java deleted file mode 100644 index 8723025ad3..0000000000 --- a/connectors/jetty-connector/src/main/java8/org/glassfish/jersey/jetty/connector/JettyConnectorProvider.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 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.jetty.connector; - -import jakarta.ws.rs.ProcessingException; -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.core.Configuration; - -import org.glassfish.jersey.client.spi.Connector; -import org.glassfish.jersey.client.spi.ConnectorProvider; - -import org.glassfish.jersey.internal.util.JdkVersion; - -/** - * JDK 1.8 Jetty Connector stub which only throws exception when running on JDK 1.8 - * New Jetty (11+) does not support JDKs prior to 11 - * - * @since 3.0.0 - */ -public class JettyConnectorProvider implements ConnectorProvider { - - @Override - public Connector getConnector(Client client, Configuration runtimeConfig) { - if (JdkVersion.getJdkVersion().getMajor() < 11) { - throw new ProcessingException(LocalizationMessages.NOT_SUPPORTED()); - } - return null; // does not work at JDK 1.8 - } - -} diff --git a/connectors/jetty-connector/src/main/java8/org/glassfish/jersey/jetty/connector/JettyHttpClientContract.java b/connectors/jetty-connector/src/main/java8/org/glassfish/jersey/jetty/connector/JettyHttpClientContract.java deleted file mode 100644 index b061ef5c70..0000000000 --- a/connectors/jetty-connector/src/main/java8/org/glassfish/jersey/jetty/connector/JettyHttpClientContract.java +++ /dev/null @@ -1,33 +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.jetty.connector; - -import org.eclipse.jetty.client.HttpClient; -import org.glassfish.jersey.spi.Contract; - -/** - * A contract that allows for an optional registration of user predefined Jetty {@code HttpClient} - * that is consequently used by {@link JettyConnector} - */ -@Contract -public interface JettyHttpClientContract { - /** - * Supply a user predefined HttpClient - * @return a user predefined HttpClient - */ - HttpClient getHttpClient(); -} diff --git a/connectors/jetty-connector/src/main/java8/org/glassfish/jersey/jetty/connector/JettyHttpClientSupplier.java b/connectors/jetty-connector/src/main/java8/org/glassfish/jersey/jetty/connector/JettyHttpClientSupplier.java deleted file mode 100644 index 59c8fd3f9f..0000000000 --- a/connectors/jetty-connector/src/main/java8/org/glassfish/jersey/jetty/connector/JettyHttpClientSupplier.java +++ /dev/null @@ -1,61 +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.jetty.connector; - -import jakarta.ws.rs.ProcessingException; -import org.eclipse.jetty.client.HttpClient; -import org.glassfish.jersey.internal.util.JdkVersion; - -/** - * Jetty HttpClient supplier to be registered into Jersey configuration to be used by {@link JettyConnector}. - * Not every possible configuration option is covered by the Jetty Connector and this supplier offers a way to provide - * an HttpClient that has configured the options not covered by the Jetty Connector. - *

- * Typical usage: - *

- * 
- * {@code
- * HttpClient httpClient = ...
- *
- * ClientConfig config = new ClientConfig();
- * config.connectorProvider(new JettyConnectorProvider());
- * config.register(new JettyHttpClientSupplier(httpClient));
- * Client client = ClientBuilder.newClient(config);
- * }
- *
- *

- * The {@code HttpClient} is configured as if it was created by {@link JettyConnector} the usual way. - *

- */ -public class JettyHttpClientSupplier implements JettyHttpClientContract { - private final HttpClient httpClient; - - /** - * {@code HttpClient} supplier to be optionally registered to a {@link org.glassfish.jersey.client.ClientConfig} - * @param httpClient a HttpClient to be supplied when {@link JettyConnector#getHttpClient()} is called. - */ - public JettyHttpClientSupplier(HttpClient httpClient) { - this.httpClient = httpClient; - } - - @Override - public HttpClient getHttpClient() { - if (JdkVersion.getJdkVersion().getMajor() < 11) { - throw new ProcessingException(LocalizationMessages.NOT_SUPPORTED()); - } - return null; // does not work at JDK 1.8 - } -} diff --git a/containers/jdk-http/pom.xml b/containers/jdk-http/pom.xml index f4e2203c11..59bb242ec9 100644 --- a/containers/jdk-http/pom.xml +++ b/containers/jdk-http/pom.xml @@ -79,45 +79,8 @@ - - - jdk11+ - - [11,) - - - - -Djdk.tls.client.protocols=TLSv1.2 - - - - windows - - 1.8 - - windows - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org/glassfish/jersey/jdkhttp/BasicJdkHttpServerTest.java - org/glassfish/jersey/jdkhttp/JdkHttpPackageTest.java - org/glassfish/jersey/jdkhttp/JdkHttpsServerTest.java - org/glassfish/jersey/jdkhttp/LifecycleListenerTest.java - - - - - - - - + + + -Djdk.tls.client.protocols=TLSv1.2 + diff --git a/containers/jetty-http/pom.xml b/containers/jetty-http/pom.xml index dfb7465dd0..d5bb14b07a 100644 --- a/containers/jetty-http/pom.xml +++ b/containers/jetty-http/pom.xml @@ -96,162 +96,4 @@ - - ${project.basedir}/target - ${project.basedir}/src/main/java8 - ${project.basedir}/target11 - ${project.basedir}/src/main/java11 - - - - - JettyExclude - - 1.8 - - - 9.4.28.v20200408 - - - - org.eclipse.jetty - jetty-client - ${jetty.version} - - - org.eclipse.jetty - jetty-util - ${jetty.version} - - - - ${java8.build.outputDirectory} - - - org.codehaus.mojo - build-helper-maven-plugin - - - generate-sources - - add-source - - - - ${java8.sourceDirectory} - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org/glassfish/jersey/jetty/*.java - - - - - - - - Jetty11 - - [11,) - - - ${java11.build.outputDirectory} - - - org.codehaus.mojo - build-helper-maven-plugin - - - generate-sources - - add-source - - - - ${java11.sourceDirectory} - - - - - - - - - - copyJDK11FilesToMultiReleaseJar - - - - target11/classes/org/glassfish/jersey/jetty/JettyHttpContainer.class - - 1.8 - - - - - org.apache.felix - maven-bundle-plugin - true - true - - - true - - - - - org.apache.maven.plugins - maven-resources-plugin - true - - - copy-jdk11-classes - prepare-package - - copy-resources - - - ${java8.build.outputDirectory}/classes/META-INF/versions/11 - - - ${java11.build.outputDirectory}/classes - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - copy-jdk11-sources - package - - - - sources-jar: ${sources-jar} - - - - - - - run - - - - - - - - diff --git a/containers/jetty-http/src/main/java11/org/glassfish/jersey/jetty/JettyHttpContainer.java b/containers/jetty-http/src/main/java/org/glassfish/jersey/jetty/JettyHttpContainer.java similarity index 100% rename from containers/jetty-http/src/main/java11/org/glassfish/jersey/jetty/JettyHttpContainer.java rename to containers/jetty-http/src/main/java/org/glassfish/jersey/jetty/JettyHttpContainer.java diff --git a/containers/jetty-http/src/main/java11/org/glassfish/jersey/jetty/JettyHttpContainerFactory.java b/containers/jetty-http/src/main/java/org/glassfish/jersey/jetty/JettyHttpContainerFactory.java similarity index 99% rename from containers/jetty-http/src/main/java11/org/glassfish/jersey/jetty/JettyHttpContainerFactory.java rename to containers/jetty-http/src/main/java/org/glassfish/jersey/jetty/JettyHttpContainerFactory.java index 39f23e8ca9..3ccb7b8bfc 100644 --- a/containers/jetty-http/src/main/java11/org/glassfish/jersey/jetty/JettyHttpContainerFactory.java +++ b/containers/jetty-http/src/main/java/org/glassfish/jersey/jetty/JettyHttpContainerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 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 diff --git a/containers/jetty-http/src/main/java8/org/glassfish/jersey/jetty/JettyHttpContainer.java b/containers/jetty-http/src/main/java8/org/glassfish/jersey/jetty/JettyHttpContainer.java deleted file mode 100644 index b852e54c22..0000000000 --- a/containers/jetty-http/src/main/java8/org/glassfish/jersey/jetty/JettyHttpContainer.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 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.jetty; - -import jakarta.ws.rs.ProcessingException; -import jakarta.ws.rs.core.Application; -import org.glassfish.jersey.jetty.internal.LocalizationMessages; -import org.glassfish.jersey.server.ApplicationHandler; -import org.glassfish.jersey.server.ResourceConfig; -import org.glassfish.jersey.server.spi.Container; - -/** - * Jersey {@code Container} stub based on Jetty {@link org.eclipse.jetty.server.Handler}. - * - * For JDK 1.8 only since Jetty 11 does not support JDKs below 11 - * - */ -public final class JettyHttpContainer implements Container { - - public JettyHttpContainer(Application application) { - throw new ProcessingException(LocalizationMessages.NOT_SUPPORTED()); - } - - @Override - public ResourceConfig getConfiguration() { - throw new ProcessingException(LocalizationMessages.NOT_SUPPORTED()); - } - - @Override - public ApplicationHandler getApplicationHandler() { - throw new ProcessingException(LocalizationMessages.NOT_SUPPORTED()); - } - - @Override - public void reload() { - throw new ProcessingException(LocalizationMessages.NOT_SUPPORTED()); - } - - @Override - public void reload(ResourceConfig configuration) { - throw new ProcessingException(LocalizationMessages.NOT_SUPPORTED()); - } - -} diff --git a/containers/jetty-http/src/main/java8/org/glassfish/jersey/jetty/JettyHttpContainerFactory.java b/containers/jetty-http/src/main/java8/org/glassfish/jersey/jetty/JettyHttpContainerFactory.java deleted file mode 100644 index 1218c2e729..0000000000 --- a/containers/jetty-http/src/main/java8/org/glassfish/jersey/jetty/JettyHttpContainerFactory.java +++ /dev/null @@ -1,93 +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.jetty; - -import jakarta.ws.rs.ProcessingException; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.util.ssl.SslContextFactory; -import org.glassfish.jersey.internal.util.JdkVersion; -import org.glassfish.jersey.jetty.internal.LocalizationMessages; -import org.glassfish.jersey.server.ResourceConfig; - -import java.net.URI; - -/** - * Jersey {@code Container} stub. - * - * For JDK 1.8 only since Jetty 11 does not support JDKs below 11 - * - */ -public final class JettyHttpContainerFactory { - - private JettyHttpContainerFactory() { - } - - public static Server createServer(final URI uri) throws ProcessingException { - validateJdk(); - return null; // does not work at JDK 1.8 - } - - public static Server createServer(final URI uri, final boolean start) throws ProcessingException { - validateJdk(); - return null; // does not work at JDK 1.8 - } - - public static Server createServer(final URI uri, final ResourceConfig config) - throws ProcessingException { - - validateJdk(); - return null; // does not work at JDK 1.8 - } - - public static Server createServer(final URI uri, final ResourceConfig configuration, final boolean start) - throws ProcessingException { - validateJdk(); - return null; // does not work at JDK 1.8 - } - - public static Server createServer(final URI uri, final ResourceConfig config, final boolean start, - final Object parentContext) { - validateJdk(); - return null; // does not work at JDK 1.8 - } - - public static Server createServer(final URI uri, final ResourceConfig config, final Object parentContext) { - validateJdk(); - return null; // does not work at JDK 1.8 - } - - public static Server createServer(final URI uri, final SslContextFactory.Server sslContextFactory, - final ResourceConfig config) - throws ProcessingException { - validateJdk(); - return null; // does not work at JDK 1.8 } - } - - public static Server createServer(final URI uri, - final SslContextFactory.Server sslContextFactory, - final JettyHttpContainer handler, - final boolean start) { - validateJdk(); - return null; // does not work at JDK 1.8 - } - - private static void validateJdk() { - if (JdkVersion.getJdkVersion().getMajor() < 11) { - throw new ProcessingException(LocalizationMessages.NOT_SUPPORTED()); - } - } -} diff --git a/containers/jetty-servlet/pom.xml b/containers/jetty-servlet/pom.xml index 7f483ec8e8..97bf69c731 100644 --- a/containers/jetty-servlet/pom.xml +++ b/containers/jetty-servlet/pom.xml @@ -48,6 +48,15 @@ jakarta.servlet-api ${servlet5.version} + + org.eclipse.jetty + jetty-webapp + + + org.glassfish.jersey.containers + jersey-container-jetty-http + ${project.version} + @@ -75,190 +84,4 @@ - - ${project.basedir}/target - ${project.basedir}/src/main/java8 - ${project.basedir}/target11 - ${project.basedir}/src/main/java11 - 9.4.28.v20200408 - - - - - JettyExclude - - 1.8 - - - - org.eclipse.jetty - jetty-server - ${jetty.javax.version} - provided - - - org.eclipse.jetty - jetty-webapp - ${jetty.javax.version} - provided - - - org.eclipse.jetty - jetty-server - - - - - org.glassfish.jersey.containers - jersey-container-jetty-http - ${project.version} - - - org.eclipse.jetty - jetty-server - - - - - - ${java8.build.outputDirectory} - - - org.codehaus.mojo - build-helper-maven-plugin - - - generate-sources - - add-source - - - - ${java8.sourceDirectory} - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org/glassfish/jersey/jetty/*.java - - - - - - - - Jetty11 - - [11,) - - - - org.eclipse.jetty - jetty-webapp - - - org.glassfish.jersey.containers - jersey-container-jetty-http - ${project.version} - - - - ${java11.build.outputDirectory} - - - org.codehaus.mojo - build-helper-maven-plugin - - - generate-sources - - add-source - - - - ${java11.sourceDirectory} - - - - - - - - - - copyJDK11FilesToMultiReleaseJar - - - - target11/classes/org/glassfish/jersey/jetty/servlet/JettyWebContainerFactory.class - - 1.8 - - - - - org.apache.felix - maven-bundle-plugin - true - true - - - true - - - - - org.apache.maven.plugins - maven-resources-plugin - true - - - copy-jdk11-classes - prepare-package - - copy-resources - - - ${java8.build.outputDirectory}/classes/META-INF/versions/11 - - - ${java11.build.outputDirectory}/classes - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - copy-jdk11-sources - package - - - - sources-jar: ${sources-jar} - - - - - - - run - - - - - - - - diff --git a/containers/jetty-servlet/src/main/java11/org/glassfish/jersey/jetty/servlet/JettyWebContainerFactory.java b/containers/jetty-servlet/src/main/java/org/glassfish/jersey/jetty/servlet/JettyWebContainerFactory.java similarity index 99% rename from containers/jetty-servlet/src/main/java11/org/glassfish/jersey/jetty/servlet/JettyWebContainerFactory.java rename to containers/jetty-servlet/src/main/java/org/glassfish/jersey/jetty/servlet/JettyWebContainerFactory.java index 7f46e7b2f8..a663a5026d 100644 --- a/containers/jetty-servlet/src/main/java11/org/glassfish/jersey/jetty/servlet/JettyWebContainerFactory.java +++ b/containers/jetty-servlet/src/main/java/org/glassfish/jersey/jetty/servlet/JettyWebContainerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 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 diff --git a/containers/jetty-servlet/src/main/java8/org/glassfish/jersey/jetty/servlet/JettyWebContainerFactory.java b/containers/jetty-servlet/src/main/java8/org/glassfish/jersey/jetty/servlet/JettyWebContainerFactory.java deleted file mode 100644 index 3d87ae8c70..0000000000 --- a/containers/jetty-servlet/src/main/java8/org/glassfish/jersey/jetty/servlet/JettyWebContainerFactory.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (c) 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.jetty.servlet; - -import java.net.URI; -import java.util.Map; - -import jakarta.servlet.Servlet; - -import jakarta.ws.rs.ProcessingException; -import org.eclipse.jetty.server.Server; -import org.glassfish.jersey.jetty.internal.LocalizationMessages; - -/** - * Jersey {@code Server} stub based on Jetty {@link org.eclipse.jetty.server.Server}. - *

- * For JDK 1.8 only since Jetty 11 does not support JDKs below 11 - */ -public final class JettyWebContainerFactory { - - private JettyWebContainerFactory() { - } - - - public static Server create(String u) - throws Exception { - throw new ProcessingException(LocalizationMessages.NOT_SUPPORTED()); - } - - public static Server create(String u, Map initParams) - throws Exception { - throw new ProcessingException(LocalizationMessages.NOT_SUPPORTED()); - } - - public static Server create(URI u) - throws Exception { - throw new ProcessingException(LocalizationMessages.NOT_SUPPORTED()); - } - - public static Server create(URI u, Map initParams) - throws Exception { - throw new ProcessingException(LocalizationMessages.NOT_SUPPORTED()); - } - - public static Server create(String u, Class c) - throws Exception { - throw new ProcessingException(LocalizationMessages.NOT_SUPPORTED()); - } - - public static Server create(String u, Class c, - Map initParams) - throws Exception { - throw new ProcessingException(LocalizationMessages.NOT_SUPPORTED()); - } - - public static Server create(URI u, Class c) - throws Exception { - throw new ProcessingException(LocalizationMessages.NOT_SUPPORTED()); - } - - public static Server create(URI u, Class c, Map initParams) - throws Exception { - throw new ProcessingException(LocalizationMessages.NOT_SUPPORTED()); - } - - private static Server create(URI u, Class c, Servlet servlet, - Map initParams, Map contextInitParams) - throws Exception { - throw new ProcessingException(LocalizationMessages.NOT_SUPPORTED()); - } - - public static Server create(URI u, Servlet servlet, Map initParams, Map contextInitParams) - throws Exception { - throw new ProcessingException(LocalizationMessages.NOT_SUPPORTED()); - } -} \ No newline at end of file diff --git a/core-common/pom.xml b/core-common/pom.xml index 44a380137d..1e8ec8bdbd 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml @@ -229,446 +229,6 @@ - - jdk8 - - 1.8 - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - generate-sources - - add-source - - - - src/main/jsr166 - src/main/java8 - - - - - - - maven-antrun-plugin - - - com.sun - tools - 1.8.0 - system - ${java.home}/../lib/tools.jar - - - - - validate - - run - - - - Building for JDK8 - - - - - - compile-1-jsr166 - process-resources - - - - - - - run - - - - - - compile-2-java8 - process-resources - - - - - - - - run - - - - - - - - - - jdk11+ - - [11,) - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - validate - - run - - - - Building for JDK 11+ - - - - - compile-1-jsr166 - process-resources - - - - - - - run - - - - - compile-2-java11 - process-resources - - - - - - - - run - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - compile-0-addsources - process-sources - - add-source - - - - src/main/jsr166 - src/main/java11 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - default-compile - - - 11 - - - - - - - - - copyJDK11FilesToMultiReleaseJar - - - - target/classes-java11/org/glassfish/jersey/internal/jsr166/SubmissionPublisher.class - - 1.8 - - - - - org.apache.felix - maven-bundle-plugin - true - true - - - true - - - - - maven-clean-plugin - - - - remove-jdk11-generated-sources - initialize - - clean - - - true - - - ${project.build.directory}/generated-sources - - - - - - remove-jdk11-classes - initialize - - clean - - - true - - - ${project.build.directory}/classes - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - true - - - copy-jdk11-sources - prepare-package - - copy-resources - - - ${project.build.directory}/generated-sources/rsrc-gen/META-INF/versions/11/org/glassfish/jersey/internal/jsr166 - - - ${java11.sourceDirectory}/org/glassfish/jersey/internal/jsr166 - - - - - - copy-jdk11-classes-to-meta-inf - prepare-package - - copy-resources - - - ${project.build.outputDirectory}/META-INF/versions/11 - - - ${java11.build.outputDirectory} - - - - - - - - - - - copyJDK8FilesToMultiReleaseJar - - - - target/classes-java8/org/glassfish/jersey/internal/jsr166/UnsafeAccessor.class - - [11,) - - - - - org.apache.felix - maven-bundle-plugin - true - true - - - true - - - - - maven-clean-plugin - - - - remove-jdk11-jsr166-sources - initialize - - clean - - - true - - - ${project.build.directory}/generated-sources/rsrc-gen/org/glassfish/jersey/internal/jsr166 - - - - - - remove-jdk11-jsr166-META-INF-sources - initialize - - clean - - - true - - - ${project.build.directory}/generated-sources/rsrc-gen/META-INF - - - - - - remove-jdk11-jsr166-classes - prepare-package - - clean - - - true - - - ${project.build.outputDirectory}/org/glassfish/jersey/internal/jsr166 - - *.class - - - Flow*.class - SubmittableFlowPublisher.class - package-info.class - - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - true - - - copy-jdk8-classes-ouputDirectory - prepare-package - - copy-resources - - - ${project.build.outputDirectory} - - - ${java8.build.outputDirectory} - - - - - - copy-jdk8-sources - prepare-package - - copy-resources - - - ${project.build.directory}/generated-sources/rsrc-gen/org/glassfish/jersey/internal/jsr166 - - - ${java8.sourceDirectory}/org/glassfish/jersey/internal/jsr166 - - - - - - copy-jdk11-sources - prepare-package - - copy-resources - - - ${project.build.directory}/generated-sources/rsrc-gen/META-INF/versions/11/org/glassfish/jersey/internal/jsr166 - - - ${java11.sourceDirectory}/org/glassfish/jersey/internal/jsr166 - - - - - - copy-jdk11-classes-to-meta-inf - prepare-package - - copy-resources - - - ${project.build.outputDirectory}/META-INF/versions/11 - - - ${java11.build.outputDirectory} - - - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - package - - jar-no-fork - - - - org/glassfish/jersey/internal/jsr166/Jdk9SubmissionPublisher.java - - - - - - - - - securityOff @@ -709,11 +269,6 @@ -Djava.security.manager -Djava.security.policy=${project.build.directory}/test-classes/surefire.policy - ${project.basedir}/src/main/jsr166 - ${project.build.directory}/classes-java8 - ${project.basedir}/src/main/java8 - ${project.build.directory}/classes-java11 - ${project.basedir}/src/main/java11 diff --git a/core-common/src/main/jsr166/org/glassfish/jersey/internal/jsr166/Flow.java b/core-common/src/main/java/org/glassfish/jersey/internal/jsr166/Flow.java similarity index 100% rename from core-common/src/main/jsr166/org/glassfish/jersey/internal/jsr166/Flow.java rename to core-common/src/main/java/org/glassfish/jersey/internal/jsr166/Flow.java diff --git a/core-common/src/main/java11/org/glassfish/jersey/internal/jsr166/JerseyFlowSubscriber.java b/core-common/src/main/java/org/glassfish/jersey/internal/jsr166/JerseyFlowSubscriber.java similarity index 100% rename from core-common/src/main/java11/org/glassfish/jersey/internal/jsr166/JerseyFlowSubscriber.java rename to core-common/src/main/java/org/glassfish/jersey/internal/jsr166/JerseyFlowSubscriber.java diff --git a/core-common/src/main/java11/org/glassfish/jersey/internal/jsr166/SubmissionPublisher.java b/core-common/src/main/java/org/glassfish/jersey/internal/jsr166/SubmissionPublisher.java similarity index 100% rename from core-common/src/main/java11/org/glassfish/jersey/internal/jsr166/SubmissionPublisher.java rename to core-common/src/main/java/org/glassfish/jersey/internal/jsr166/SubmissionPublisher.java diff --git a/core-common/src/main/java11/org/glassfish/jersey/internal/jsr166/SubmissionPublisherFactory.java b/core-common/src/main/java/org/glassfish/jersey/internal/jsr166/SubmissionPublisherFactory.java similarity index 100% rename from core-common/src/main/java11/org/glassfish/jersey/internal/jsr166/SubmissionPublisherFactory.java rename to core-common/src/main/java/org/glassfish/jersey/internal/jsr166/SubmissionPublisherFactory.java diff --git a/core-common/src/main/jsr166/org/glassfish/jersey/internal/jsr166/SubmittableFlowPublisher.java b/core-common/src/main/java/org/glassfish/jersey/internal/jsr166/SubmittableFlowPublisher.java similarity index 100% rename from core-common/src/main/jsr166/org/glassfish/jersey/internal/jsr166/SubmittableFlowPublisher.java rename to core-common/src/main/java/org/glassfish/jersey/internal/jsr166/SubmittableFlowPublisher.java diff --git a/core-common/src/main/jsr166/org/glassfish/jersey/internal/jsr166/package-info.java b/core-common/src/main/java/org/glassfish/jersey/internal/jsr166/package-info.java similarity index 100% rename from core-common/src/main/jsr166/org/glassfish/jersey/internal/jsr166/package-info.java rename to core-common/src/main/java/org/glassfish/jersey/internal/jsr166/package-info.java diff --git a/core-common/src/main/java8/org/glassfish/jersey/internal/jsr166/JerseyFlowSubscriber.java b/core-common/src/main/java8/org/glassfish/jersey/internal/jsr166/JerseyFlowSubscriber.java deleted file mode 100644 index dd25372cfc..0000000000 --- a/core-common/src/main/java8/org/glassfish/jersey/internal/jsr166/JerseyFlowSubscriber.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 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.internal.jsr166; - -public interface JerseyFlowSubscriber extends Flow.Subscriber { -} diff --git a/core-common/src/main/java8/org/glassfish/jersey/internal/jsr166/SubmissionPublisher.java b/core-common/src/main/java8/org/glassfish/jersey/internal/jsr166/SubmissionPublisher.java deleted file mode 100644 index 6eb4cb5740..0000000000 --- a/core-common/src/main/java8/org/glassfish/jersey/internal/jsr166/SubmissionPublisher.java +++ /dev/null @@ -1,1626 +0,0 @@ -/* - * Written by Doug Lea with assistance from members of JCP JSR-166 - * Expert Group and released to the public domain, as explained at - * http://creativecommons.org/publicdomain/zero/1.0/ - */ - -package org.glassfish.jersey.internal.jsr166; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; -import java.util.concurrent.ForkJoinPool; -import java.util.concurrent.ForkJoinTask; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.locks.LockSupport; -import java.util.function.BiConsumer; -import java.util.function.BiPredicate; -import java.util.function.Consumer; - -/** - * A {@link Flow.Publisher} that asynchronously issues submitted - * (non-null) items to current subscribers until it is closed. Each - * current subscriber receives newly submitted items in the same order - * unless drops or exceptions are encountered. Using a - * SubmissionPublisher allows item generators to act as compliant reactive-streams - * Publishers relying on drop handling and/or blocking for flow - * control. - *

- *

A SubmissionPublisher uses the {@link Executor} supplied in its - * constructor for delivery to subscribers. The best choice of - * Executor depends on expected usage. If the generator(s) of - * submitted items run in separate threads, and the number of - * subscribers can be estimated, consider using a {@link - * Executors#newFixedThreadPool}. Otherwise consider using the - * default, normally the {@link ForkJoinPool#commonPool}. - *

- *

Buffering allows producers and consumers to transiently operate - * at different rates. Each subscriber uses an independent buffer. - * Buffers are created upon first use and expanded as needed up to the - * given maximum. (The enforced capacity may be rounded up to the - * nearest power of two and/or bounded by the largest value supported - * by this implementation.) Invocations of {@link - * Flow.Subscription#request(long) request} do not directly result in - * buffer expansion, but risk saturation if unfilled requests exceed - * the maximum capacity. The default value of {@link - * Flow#defaultBufferSize()} may provide a useful starting point for - * choosing a capacity based on expected rates, resources, and usages. - *

- *

Publication methods support different policies about what to do - * when buffers are saturated. Method {@link #submit(Object) submit} - * blocks until resources are available. This is simplest, but least - * responsive. The {@code offer} methods may drop items (either - * immediately or with bounded timeout), but provide an opportunity to - * interpose a handler and then retry. - *

- *

If any Subscriber method throws an exception, its subscription - * is cancelled. If a handler is supplied as a constructor argument, - * it is invoked before cancellation upon an exception in method - * {@link Flow.Subscriber#onNext onNext}, but exceptions in methods - * {@link Flow.Subscriber#onSubscribe onSubscribe}, - * {@link Flow.Subscriber#onError(Throwable) onError} and - * {@link Flow.Subscriber#onComplete() onComplete} are not recorded or - * handled before cancellation. If the supplied Executor throws - * {@link RejectedExecutionException} (or any other RuntimeException - * or Error) when attempting to execute a task, or a drop handler - * throws an exception when processing a dropped item, then the - * exception is rethrown. In these cases, not all subscribers will - * have been issued the published item. It is usually good practice to - * {@link #closeExceptionally closeExceptionally} in these cases. - *

- *

Method {@link #consume(Consumer)} simplifies support for a - * common case in which the only action of a subscriber is to request - * and process all items using a supplied function. - *

- *

This class may also serve as a convenient base for subclasses - * that generate items, and use the methods in this class to publish - * them. For example here is a class that periodically publishes the - * items generated from a supplier. (In practice you might add methods - * to independently start and stop generation, to share Executors - * among publishers, and so on, or use a SubmissionPublisher as a - * component rather than a superclass.) - *

- * 

 {@code
- * class PeriodicPublisher extends SubmissionPublisher {
- *   final ScheduledFuture periodicTask;
- *   final ScheduledExecutorService scheduler;
- *   PeriodicPublisher(Executor executor, int maxBufferCapacity,
- *                     Supplier supplier,
- *                     long period, TimeUnit unit) {
- *     super(executor, maxBufferCapacity);
- *     scheduler = new ScheduledThreadPoolExecutor(1);
- *     periodicTask = scheduler.scheduleAtFixedRate(
- *       () -> submit(supplier.get()), 0, period, unit);
- *   }
- *   public void close() {
- *     periodicTask.cancel(false);
- *     scheduler.shutdown();
- *     super.close();
- *   }
- * }}
- *

- *

Here is an example of a {@link Flow.Processor} implementation. - * It uses single-step requests to its publisher for simplicity of - * illustration. A more adaptive version could monitor flow using the - * lag estimate returned from {@code submit}, along with other utility - * methods. - *

- * 

 {@code
- * class TransformProcessor extends SubmissionPublisher
- *   implements Flow.Processor {
- *   final Function function;
- *   Flow.Subscription subscription;
- *   TransformProcessor(Executor executor, int maxBufferCapacity,
- *                      Function function) {
- *     super(executor, maxBufferCapacity);
- *     this.function = function;
- *   }
- *   public void onSubscribe(Flow.Subscription subscription) {
- *     (this.subscription = subscription).request(1);
- *   }
- *   public void onNext(S item) {
- *     subscription.request(1);
- *     submit(function.apply(item));
- *   }
- *   public void onError(Throwable ex) { closeExceptionally(ex); }
- *   public void onComplete() { close(); }
- * }}
- * - * @param the published item type - * @author Doug Lea - * @since 9 - */ -public class SubmissionPublisher implements Flow.Publisher, SubmittableFlowPublisher, - AutoCloseable { - /* - * Most mechanics are handled by BufferedSubscription. This class - * mainly tracks subscribers and ensures sequentiality, by using - * built-in synchronization locks across public methods. (Using - * built-in locks works well in the most typical case in which - * only one thread submits items). - */ - - /** - * The largest possible power of two array size. - */ - static final int BUFFER_CAPACITY_LIMIT = 1 << 30; - - /** - * Round capacity to power of 2, at most limit. - */ - static final int roundCapacity(int cap) { - int n = cap - 1; - n |= n >>> 1; - n |= n >>> 2; - n |= n >>> 4; - n |= n >>> 8; - n |= n >>> 16; - return (n <= 0) ? 1 : // at least 1 - (n >= BUFFER_CAPACITY_LIMIT) ? BUFFER_CAPACITY_LIMIT : n + 1; - } - - // default Executor setup; nearly the same as CompletableFuture - - /** - * Default executor -- ForkJoinPool.commonPool() unless it cannot - * support parallelism. - */ - private static final Executor ASYNC_POOL = - (ForkJoinPool.getCommonPoolParallelism() > 1) ? ForkJoinPool.commonPool() : new ThreadPerTaskExecutor(); - - /** - * Fallback if ForkJoinPool.commonPool() cannot support parallelism - */ - private static final class ThreadPerTaskExecutor implements Executor { - public void execute(Runnable r) { - new Thread(r).start(); - } - } - - /** - * Clients (BufferedSubscriptions) are maintained in a linked list - * (via their "next" fields). This works well for publish loops. - * It requires O(n) traversal to check for duplicate subscribers, - * but we expect that subscribing is much less common than - * publishing. Unsubscribing occurs only during traversal loops, - * when BufferedSubscription methods return negative values - * signifying that they have been disabled. To reduce - * head-of-line blocking, submit and offer methods first call - * BufferedSubscription.offer on each subscriber, and place - * saturated ones in retries list (using nextRetry field), and - * retry, possibly blocking or dropping. - */ - BufferedSubscription clients; - - /** - * Run status, updated only within locks - */ - volatile boolean closed; - /** - * If non-null, the exception in closeExceptionally - */ - volatile Throwable closedException; - - // Parameters for constructing BufferedSubscriptions - final Executor executor; - final BiConsumer, ? super Throwable> onNextHandler; - final int maxBufferCapacity; - - /** - * Creates a new SubmissionPublisher using the given Executor for - * async delivery to subscribers, with the given maximum buffer size - * for each subscriber, and, if non-null, the given handler invoked - * when any Subscriber throws an exception in method {@link - * Flow.Subscriber#onNext(Object) onNext}. - * - * @param executor the executor to use for async delivery, - * supporting creation of at least one independent thread - * @param maxBufferCapacity the maximum capacity for each - * subscriber's buffer (the enforced capacity may be rounded up to - * the nearest power of two and/or bounded by the largest value - * supported by this implementation; method {@link #getMaxBufferCapacity} - * returns the actual value) - * @param handler if non-null, procedure to invoke upon exception - * thrown in method {@code onNext} - * @throws NullPointerException if executor is null - * @throws IllegalArgumentException if maxBufferCapacity not - * positive - */ - public SubmissionPublisher(Executor executor, int maxBufferCapacity, - BiConsumer, ? super Throwable> handler) { - if (executor == null) { - throw new NullPointerException(); - } - if (maxBufferCapacity <= 0) { - throw new IllegalArgumentException("capacity must be positive"); - } - this.executor = executor; - this.onNextHandler = handler; - this.maxBufferCapacity = roundCapacity(maxBufferCapacity); - } - - /** - * Creates a new SubmissionPublisher using the given Executor for - * async delivery to subscribers, with the given maximum buffer size - * for each subscriber, and no handler for Subscriber exceptions in - * method {@link Flow.Subscriber#onNext(Object) onNext}. - * - * @param executor the executor to use for async delivery, - * supporting creation of at least one independent thread - * @param maxBufferCapacity the maximum capacity for each - * subscriber's buffer (the enforced capacity may be rounded up to - * the nearest power of two and/or bounded by the largest value - * supported by this implementation; method {@link #getMaxBufferCapacity} - * returns the actual value) - * @throws NullPointerException if executor is null - * @throws IllegalArgumentException if maxBufferCapacity not - * positive - */ - public SubmissionPublisher(Executor executor, int maxBufferCapacity) { - this(executor, maxBufferCapacity, null); - } - - /** - * Creates a new SubmissionPublisher using the {@link - * ForkJoinPool#commonPool()} for async delivery to subscribers - * (unless it does not support a parallelism level of at least two, - * in which case, a new Thread is created to run each task), with - * maximum buffer capacity of {@link Flow#defaultBufferSize}, and no - * handler for Subscriber exceptions in method {@link - * Flow.Subscriber#onNext(Object) onNext}. - */ - public SubmissionPublisher() { - this(ASYNC_POOL, Flow.defaultBufferSize(), null); - } - - /** - * Adds the given Subscriber unless already subscribed. If already - * subscribed, the Subscriber's {@link - * Flow.Subscriber#onError(Throwable) onError} method is invoked on - * the existing subscription with an {@link IllegalStateException}. - * Otherwise, upon success, the Subscriber's {@link - * Flow.Subscriber#onSubscribe onSubscribe} method is invoked - * asynchronously with a new {@link Flow.Subscription}. If {@link - * Flow.Subscriber#onSubscribe onSubscribe} throws an exception, the - * subscription is cancelled. Otherwise, if this SubmissionPublisher - * was closed exceptionally, then the subscriber's {@link - * Flow.Subscriber#onError onError} method is invoked with the - * corresponding exception, or if closed without exception, the - * subscriber's {@link Flow.Subscriber#onComplete() onComplete} - * method is invoked. Subscribers may enable receiving items by - * invoking the {@link Flow.Subscription#request(long) request} - * method of the new Subscription, and may unsubscribe by invoking - * its {@link Flow.Subscription#cancel() cancel} method. - * - * @param subscriber the subscriber - * @throws NullPointerException if subscriber is null - */ - public void subscribe(Flow.Subscriber subscriber) { - if (subscriber == null) { - throw new NullPointerException(); - } - BufferedSubscription subscription = - new BufferedSubscription(subscriber, executor, - onNextHandler, maxBufferCapacity); - synchronized (this) { - for (BufferedSubscription b = clients, pred = null;;) { - if (b == null) { - Throwable ex; - subscription.onSubscribe(); - if ((ex = closedException) != null) { - subscription.onError(ex); - } else if (closed) { - subscription.onComplete(); - } else if (pred == null) { - clients = subscription; - } else { - pred.next = subscription; - } - break; - } - BufferedSubscription next = b.next; - if (b.isDisabled()) { // remove - b.next = null; // detach - if (pred == null) { - clients = next; - } else { - pred.next = next; - } - } else if (subscriber.equals(b.subscriber)) { - b.onError(new IllegalStateException("Duplicate subscribe")); - break; - } else { - pred = b; - } - b = next; - } - } - } - - /** - * Publishes the given item to each current subscriber by - * asynchronously invoking its {@link Flow.Subscriber#onNext(Object) - * onNext} method, blocking uninterruptibly while resources for any - * subscriber are unavailable. This method returns an estimate of - * the maximum lag (number of items submitted but not yet consumed) - * among all current subscribers. This value is at least one - * (accounting for this submitted item) if there are any - * subscribers, else zero. - *

- *

If the Executor for this publisher throws a - * RejectedExecutionException (or any other RuntimeException or - * Error) when attempting to asynchronously notify subscribers, - * then this exception is rethrown, in which case not all - * subscribers will have been issued this item. - * - * @param item the (non-null) item to publish - * @return the estimated maximum lag among subscribers - * @throws IllegalStateException if closed - * @throws NullPointerException if item is null - * @throws RejectedExecutionException if thrown by Executor - */ - public int submit(T item) { - if (item == null) { - throw new NullPointerException(); - } - int lag = 0; - boolean complete; - synchronized (this) { - complete = closed; - BufferedSubscription b = clients; - if (!complete) { - BufferedSubscription pred = null, r = null, rtail = null; - while (b != null) { - BufferedSubscription next = b.next; - int stat = b.offer(item); - if (stat < 0) { // disabled - b.next = null; - if (pred == null) { - clients = next; - } else { - pred.next = next; - } - } else { - if (stat > lag) { - lag = stat; - } else if (stat == 0) { // place on retry list - b.nextRetry = null; - if (rtail == null) { - r = b; - } else { - rtail.nextRetry = b; - } - rtail = b; - } - pred = b; - } - b = next; - } - while (r != null) { - BufferedSubscription nextRetry = r.nextRetry; - r.nextRetry = null; - int stat = r.submit(item); - if (stat > lag) { - lag = stat; - } else if (stat < 0 && clients == r) { - clients = r.next; // postpone internal unsubscribes - } - r = nextRetry; - } - } - } - if (complete) { - throw new IllegalStateException("Closed"); - } else { - return lag; - } - } - - /** - * Publishes the given item, if possible, to each current subscriber - * by asynchronously invoking its {@link - * Flow.Subscriber#onNext(Object) onNext} method. The item may be - * dropped by one or more subscribers if resource limits are - * exceeded, in which case the given handler (if non-null) is - * invoked, and if it returns true, retried once. Other calls to - * methods in this class by other threads are blocked while the - * handler is invoked. Unless recovery is assured, options are - * usually limited to logging the error and/or issuing an {@link - * Flow.Subscriber#onError(Throwable) onError} signal to the - * subscriber. - *

- *

This method returns a status indicator: If negative, it - * represents the (negative) number of drops (failed attempts to - * issue the item to a subscriber). Otherwise it is an estimate of - * the maximum lag (number of items submitted but not yet - * consumed) among all current subscribers. This value is at least - * one (accounting for this submitted item) if there are any - * subscribers, else zero. - *

- *

If the Executor for this publisher throws a - * RejectedExecutionException (or any other RuntimeException or - * Error) when attempting to asynchronously notify subscribers, or - * the drop handler throws an exception when processing a dropped - * item, then this exception is rethrown. - * - * @param item the (non-null) item to publish - * @param onDrop if non-null, the handler invoked upon a drop to a - * subscriber, with arguments of the subscriber and item; if it - * returns true, an offer is re-attempted (once) - * @return if negative, the (negative) number of drops; otherwise - * an estimate of maximum lag - * @throws IllegalStateException if closed - * @throws NullPointerException if item is null - * @throws RejectedExecutionException if thrown by Executor - */ - public int offer(T item, - BiPredicate, ? super T> onDrop) { - return doOffer(0L, item, onDrop); - } - - /** - * Publishes the given item, if possible, to each current subscriber - * by asynchronously invoking its {@link - * Flow.Subscriber#onNext(Object) onNext} method, blocking while - * resources for any subscription are unavailable, up to the - * specified timeout or until the caller thread is interrupted, at - * which point the given handler (if non-null) is invoked, and if it - * returns true, retried once. (The drop handler may distinguish - * timeouts from interrupts by checking whether the current thread - * is interrupted.) Other calls to methods in this class by other - * threads are blocked while the handler is invoked. Unless - * recovery is assured, options are usually limited to logging the - * error and/or issuing an {@link Flow.Subscriber#onError(Throwable) - * onError} signal to the subscriber. - *

- *

This method returns a status indicator: If negative, it - * represents the (negative) number of drops (failed attempts to - * issue the item to a subscriber). Otherwise it is an estimate of - * the maximum lag (number of items submitted but not yet - * consumed) among all current subscribers. This value is at least - * one (accounting for this submitted item) if there are any - * subscribers, else zero. - *

- *

If the Executor for this publisher throws a - * RejectedExecutionException (or any other RuntimeException or - * Error) when attempting to asynchronously notify subscribers, or - * the drop handler throws an exception when processing a dropped - * item, then this exception is rethrown. - * - * @param item the (non-null) item to publish - * @param timeout how long to wait for resources for any subscriber - * before giving up, in units of {@code unit} - * @param unit a {@code TimeUnit} determining how to interpret the - * {@code timeout} parameter - * @param onDrop if non-null, the handler invoked upon a drop to a - * subscriber, with arguments of the subscriber and item; if it - * returns true, an offer is re-attempted (once) - * @return if negative, the (negative) number of drops; otherwise - * an estimate of maximum lag - * @throws IllegalStateException if closed - * @throws NullPointerException if item is null - * @throws RejectedExecutionException if thrown by Executor - */ - public int offer(T item, long timeout, TimeUnit unit, - BiPredicate, ? super T> onDrop) { - return doOffer(unit.toNanos(timeout), item, onDrop); - } - - /** - * Common implementation for both forms of offer - */ - final int doOffer(long nanos, T item, - BiPredicate, ? super T> onDrop) { - if (item == null) { - throw new NullPointerException(); - } - int lag = 0, drops = 0; - boolean complete; - synchronized (this) { - complete = closed; - BufferedSubscription b = clients; - if (!complete) { - BufferedSubscription pred = null, r = null, rtail = null; - while (b != null) { - BufferedSubscription next = b.next; - int stat = b.offer(item); - if (stat < 0) { - b.next = null; - if (pred == null) { - clients = next; - } else { - pred.next = next; - } - } else { - if (stat > lag) { - lag = stat; - } else if (stat == 0) { - b.nextRetry = null; - if (rtail == null) { - r = b; - } else { - rtail.nextRetry = b; - } - rtail = b; - } else if (stat > lag) { - lag = stat; - } - pred = b; - } - b = next; - } - while (r != null) { - BufferedSubscription nextRetry = r.nextRetry; - r.nextRetry = null; - int stat = (nanos > 0L) - ? r.timedOffer(item, nanos) - : r.offer(item); - if (stat == 0 && onDrop != null && onDrop.test(r.subscriber, item)) { - stat = r.offer(item); - } - if (stat == 0) { - ++drops; - } else if (stat > lag) { - lag = stat; - } else if (stat < 0 && clients == r) { - clients = r.next; - } - r = nextRetry; - } - } - } - if (complete) { - throw new IllegalStateException("Closed"); - } else { - return (drops > 0) ? -drops : lag; - } - } - - /** - * Unless already closed, issues {@link - * Flow.Subscriber#onComplete() onComplete} signals to current - * subscribers, and disallows subsequent attempts to publish. - * Upon return, this method does NOT guarantee that all - * subscribers have yet completed. - */ - public void close() { - if (!closed) { - BufferedSubscription b; - synchronized (this) { - b = clients; - clients = null; - closed = true; - } - while (b != null) { - BufferedSubscription next = b.next; - b.next = null; - b.onComplete(); - b = next; - } - } - } - - /** - * Unless already closed, issues {@link - * Flow.Subscriber#onError(Throwable) onError} signals to current - * subscribers with the given error, and disallows subsequent - * attempts to publish. Future subscribers also receive the given - * error. Upon return, this method does NOT guarantee - * that all subscribers have yet completed. - * - * @param error the {@code onError} argument sent to subscribers - * @throws NullPointerException if error is null - */ - public void closeExceptionally(Throwable error) { - if (error == null) { - throw new NullPointerException(); - } - if (!closed) { - BufferedSubscription b; - synchronized (this) { - b = clients; - clients = null; - closed = true; - closedException = error; - } - while (b != null) { - BufferedSubscription next = b.next; - b.next = null; - b.onError(error); - b = next; - } - } - } - - /** - * Returns true if this publisher is not accepting submissions. - * - * @return true if closed - */ - public boolean isClosed() { - return closed; - } - - /** - * Returns the exception associated with {@link - * #closeExceptionally(Throwable) closeExceptionally}, or null if - * not closed or if closed normally. - * - * @return the exception, or null if none - */ - public Throwable getClosedException() { - return closedException; - } - - /** - * Returns true if this publisher has any subscribers. - * - * @return true if this publisher has any subscribers - */ - public boolean hasSubscribers() { - boolean nonEmpty = false; - if (!closed) { - synchronized (this) { - for (BufferedSubscription b = clients; b != null; ) { - BufferedSubscription next = b.next; - if (b.isDisabled()) { - b.next = null; - b = clients = next; - } else { - nonEmpty = true; - break; - } - } - } - } - return nonEmpty; - } - - /** - * Returns the number of current subscribers. - * - * @return the number of current subscribers - */ - public int getNumberOfSubscribers() { - int count = 0; - if (!closed) { - synchronized (this) { - BufferedSubscription pred = null, next; - for (BufferedSubscription b = clients; b != null; b = next) { - next = b.next; - if (b.isDisabled()) { - b.next = null; - if (pred == null) { - clients = next; - } else { - pred.next = next; - } - } else { - pred = b; - ++count; - } - } - } - } - return count; - } - - /** - * Returns the Executor used for asynchronous delivery. - * - * @return the Executor used for asynchronous delivery - */ - public Executor getExecutor() { - return executor; - } - - /** - * Returns the maximum per-subscriber buffer capacity. - * - * @return the maximum per-subscriber buffer capacity - */ - public int getMaxBufferCapacity() { - return maxBufferCapacity; - } - - /** - * Returns a list of current subscribers for monitoring and - * tracking purposes, not for invoking {@link Flow.Subscriber} - * methods on the subscribers. - * - * @return list of current subscribers - */ - public List> getSubscribers() { - ArrayList> subs = new ArrayList<>(); - synchronized (this) { - BufferedSubscription pred = null, next; - for (BufferedSubscription b = clients; b != null; b = next) { - next = b.next; - if (b.isDisabled()) { - b.next = null; - if (pred == null) { - clients = next; - } else { - pred.next = next; - } - } else { - subs.add(b.subscriber); - } - } - } - return subs; - } - - /** - * Returns true if the given Subscriber is currently subscribed. - * - * @param subscriber the subscriber - * @return true if currently subscribed - * @throws NullPointerException if subscriber is null - */ - public boolean isSubscribed(Flow.Subscriber subscriber) { - if (subscriber == null) { - throw new NullPointerException(); - } - if (!closed) { - synchronized (this) { - BufferedSubscription pred = null, next; - for (BufferedSubscription b = clients; b != null; b = next) { - next = b.next; - if (b.isDisabled()) { - b.next = null; - if (pred == null) { - clients = next; - } else { - pred.next = next; - } - } else if (subscriber.equals(b.subscriber)) { - return true; - } else { - pred = b; - } - } - } - } - return false; - } - - /** - * Returns an estimate of the minimum number of items requested - * (via {@link Flow.Subscription#request(long) request}) but not - * yet produced, among all current subscribers. - * - * @return the estimate, or zero if no subscribers - */ - public long estimateMinimumDemand() { - long min = Long.MAX_VALUE; - boolean nonEmpty = false; - synchronized (this) { - BufferedSubscription pred = null, next; - for (BufferedSubscription b = clients; b != null; b = next) { - int n; - long d; - next = b.next; - if ((n = b.estimateLag()) < 0) { - b.next = null; - if (pred == null) { - clients = next; - } else { - pred.next = next; - } - } else { - if ((d = b.demand - n) < min) { - min = d; - } - nonEmpty = true; - pred = b; - } - } - } - return nonEmpty ? min : 0; - } - - /** - * Returns an estimate of the maximum number of items produced but - * not yet consumed among all current subscribers. - * - * @return the estimate - */ - public int estimateMaximumLag() { - int max = 0; - synchronized (this) { - BufferedSubscription pred = null, next; - for (BufferedSubscription b = clients; b != null; b = next) { - int n; - next = b.next; - if ((n = b.estimateLag()) < 0) { - b.next = null; - if (pred == null) { - clients = next; - } else { - pred.next = next; - } - } else { - if (n > max) { - max = n; - } - pred = b; - } - } - } - return max; - } - - /** - * Processes all published items using the given Consumer function. - * Returns a CompletableFuture that is completed normally when this - * publisher signals {@link Flow.Subscriber#onComplete() - * onComplete}, or completed exceptionally upon any error, or an - * exception is thrown by the Consumer, or the returned - * CompletableFuture is cancelled, in which case no further items - * are processed. - * - * @param consumer the function applied to each onNext item - * @return a CompletableFuture that is completed normally - * when the publisher signals onComplete, and exceptionally - * upon any error or cancellation - * @throws NullPointerException if consumer is null - */ - public CompletableFuture consume(Consumer consumer) { - if (consumer == null) { - throw new NullPointerException(); - } - CompletableFuture status = new CompletableFuture<>(); - subscribe(new ConsumerSubscriber(status, consumer)); - return status; - } - - /** - * Subscriber for method consume - */ - private static final class ConsumerSubscriber - implements Flow.Subscriber { - final CompletableFuture status; - final Consumer consumer; - Flow.Subscription subscription; - - ConsumerSubscriber(CompletableFuture status, - Consumer consumer) { - this.status = status; - this.consumer = consumer; - } - - public final void onSubscribe(Flow.Subscription subscription) { - this.subscription = subscription; - status.whenComplete((v, e) -> subscription.cancel()); - if (!status.isDone()) { - subscription.request(Long.MAX_VALUE); - } - } - - public final void onError(Throwable ex) { - status.completeExceptionally(ex); - } - - public final void onComplete() { - status.complete(null); - } - - public final void onNext(T item) { - try { - consumer.accept(item); - } catch (Throwable ex) { - subscription.cancel(); - status.completeExceptionally(ex); - } - } - } - - /** - * A task for consuming buffer items and signals, created and - * executed whenever they become available. A task consumes as - * many items/signals as possible before terminating, at which - * point another task is created when needed. The dual Runnable - * and ForkJoinTask declaration saves overhead when executed by - * ForkJoinPools, without impacting other kinds of Executors. - */ - @SuppressWarnings("serial") - static final class ConsumerTask extends ForkJoinTask - implements Runnable, CompletableFuture.AsynchronousCompletionTask { - final BufferedSubscription consumer; - - ConsumerTask(BufferedSubscription consumer) { - this.consumer = consumer; - } - - public final Void getRawResult() { - return null; - } - - public final void setRawResult(Void v) { - } - - public final boolean exec() { - consumer.consume(); - return false; - } - - public final void run() { - consumer.consume(); - } - } - - /** - * A bounded (ring) buffer with integrated control to start a - * consumer task whenever items are available. The buffer - * algorithm is similar to one used inside ForkJoinPool (see its - * internal documentation for details) specialized for the case of - * at most one concurrent producer and consumer, and power of two - * buffer sizes. This allows methods to operate without locks even - * while supporting resizing, blocking, task-triggering, and - * garbage-free buffers (nulling out elements when consumed), - * although supporting these does impose a bit of overhead - * compared to plain fixed-size ring buffers. - *

- * The publisher guarantees a single producer via its lock. We - * ensure in this class that there is at most one consumer. The - * request and cancel methods must be fully thread-safe but are - * coded to exploit the most common case in which they are only - * called by consumers (usually within onNext). - *

- * Execution control is managed using the ACTIVE ctl bit. We - * ensure that a task is active when consumable items (and - * usually, SUBSCRIBE, ERROR or COMPLETE signals) are present and - * there is demand (unfilled requests). This is complicated on - * the creation side by the possibility of exceptions when trying - * to execute tasks. These eventually force DISABLED state, but - * sometimes not directly. On the task side, termination (clearing - * ACTIVE) that would otherwise race with producers or request() - * calls uses the CONSUME keep-alive bit to force a recheck. - *

- * The ctl field also manages run state. When DISABLED, no further - * updates are possible. Disabling may be preceded by setting - * ERROR or COMPLETE (or both -- ERROR has precedence), in which - * case the associated Subscriber methods are invoked, possibly - * synchronously if there is no active consumer task (including - * cases where execute() failed). The cancel() method is supported - * by treating as ERROR but suppressing onError signal. - *

- * Support for blocking also exploits the fact that there is only - * one possible waiter. ManagedBlocker-compatible control fields - * are placed in this class itself rather than in wait-nodes. - * Blocking control relies on the "waiter" field. Producers set - * the field before trying to block, but must then recheck (via - * offer) before parking. Signalling then just unparks and clears - * waiter field. If the producer and/or consumer are using a - * ForkJoinPool, the producer attempts to help run consumer tasks - * via ForkJoinPool.helpAsyncBlocker before blocking. - *

- * This class uses @Contended and heuristic field declaration - * ordering to reduce false-sharing-based memory contention among - * instances of BufferedSubscription, but it does not currently - * attempt to avoid memory contention among buffers. This field - * and element packing can hurt performance especially when each - * publisher has only one client operating at a high rate. - * Addressing this may require allocating substantially more space - * than users expect. - */ - @SuppressWarnings("serial") - @sun.misc.Contended - private static final class BufferedSubscription - implements Flow.Subscription, ForkJoinPool.ManagedBlocker { - // Order-sensitive field declarations - long timeout; // > 0 if timed wait - volatile long demand; // # unfilled requests - int maxCapacity; // reduced on OOME - int putStat; // offer result for ManagedBlocker - volatile int ctl; // atomic run state flags - volatile int head; // next position to take - int tail; // next position to put - Object[] array; // buffer: null if disabled - Flow.Subscriber subscriber; // null if disabled - Executor executor; // null if disabled - BiConsumer, ? super Throwable> onNextHandler; - volatile Throwable pendingError; // holds until onError issued - volatile Thread waiter; // blocked producer thread - T putItem; // for offer within ManagedBlocker - BufferedSubscription next; // used only by publisher - BufferedSubscription nextRetry; // used only by publisher - - // ctl values - static final int ACTIVE = 0x01; // consumer task active - static final int CONSUME = 0x02; // keep-alive for consumer task - static final int DISABLED = 0x04; // final state - static final int ERROR = 0x08; // signal onError then disable - static final int SUBSCRIBE = 0x10; // signal onSubscribe - static final int COMPLETE = 0x20; // signal onComplete when done - - static final long INTERRUPTED = -1L; // timeout vs interrupt sentinel - - /** - * Initial buffer capacity used when maxBufferCapacity is - * greater. Must be a power of two. - */ - static final int DEFAULT_INITIAL_CAP = 32; - - BufferedSubscription(Flow.Subscriber subscriber, - Executor executor, - BiConsumer, - ? super Throwable> onNextHandler, - int maxBufferCapacity) { - this.subscriber = subscriber; - this.executor = executor; - this.onNextHandler = onNextHandler; - this.maxCapacity = maxBufferCapacity; - this.array = new Object[maxBufferCapacity < DEFAULT_INITIAL_CAP - ? (maxBufferCapacity < 2 // at least 2 slots - ? 2 : maxBufferCapacity) - : DEFAULT_INITIAL_CAP]; - } - - @Override - public String toString() { - if (subscriber != null) { - return subscriber.toString(); - } else { - return super.toString(); - } - } - - final boolean isDisabled() { - return ctl == DISABLED; - } - - /** - * Returns estimated number of buffered items, or -1 if - * disabled. - */ - final int estimateLag() { - int n; - return (ctl == DISABLED) ? -1 : ((n = tail - head) > 0) ? n : 0; - } - - /** - * Tries to add item and start consumer task if necessary. - * - * @return -1 if disabled, 0 if dropped, else estimated lag - */ - final int offer(T item) { - int h = head, t = tail, cap, size, stat; - Object[] a = array; - if (a != null && (cap = a.length) > 0 && cap >= (size = t + 1 - h)) { - a[(cap - 1) & t] = item; // relaxed writes OK - tail = t + 1; - stat = size; - } else { - stat = growAndAdd(a, item); - } - return (stat > 0 && (ctl & (ACTIVE | CONSUME)) != (ACTIVE | CONSUME)) ? startOnOffer(stat) : stat; - } - - /** - * Tries to create or expand buffer, then adds item if possible. - */ - private int growAndAdd(Object[] a, T item) { - boolean alloc; - int cap, stat; - if ((ctl & (ERROR | DISABLED)) != 0) { - cap = 0; - stat = -1; - alloc = false; - } else if (a == null || (cap = a.length) <= 0) { - cap = 0; - stat = 1; - alloc = true; - } else { - U.fullFence(); // recheck - int h = head, t = tail, size = t + 1 - h; - if (cap >= size) { - a[(cap - 1) & t] = item; - tail = t + 1; - stat = size; - alloc = false; - } else if (cap >= maxCapacity) { - stat = 0; // cannot grow - alloc = false; - } else { - stat = cap + 1; - alloc = true; - } - } - if (alloc) { - int newCap = (cap > 0) ? cap << 1 : 1; - if (newCap <= cap) { - stat = 0; - } else { - Object[] newArray = null; - try { - newArray = new Object[newCap]; - } catch (Throwable ex) { // try to cope with OOME - } - if (newArray == null) { - if (cap > 0) { - maxCapacity = cap; // avoid continuous failure - } - stat = 0; - } else { - array = newArray; - int t = tail; - int newMask = newCap - 1; - if (a != null && cap > 0) { - int mask = cap - 1; - for (int j = head; j != t; ++j) { - long k = ((long) (j & mask) << ASHIFT) + ABASE; - Object x = U.getObjectVolatile(a, k); - if (x != null && // races with consumer - U.compareAndSwapObject(a, k, x, null)) { - newArray[j & newMask] = x; - } - } - } - newArray[t & newMask] = item; - tail = t + 1; - } - } - } - return stat; - } - - /** - * Spins/helps/blocks while offer returns 0. Called only if - * initial offer return 0. - */ - final int submit(T item) { - int stat; - if ((stat = offer(item)) == 0) { - putItem = item; - timeout = 0L; - putStat = 0; - // safe to comment out when executor != ForkJoinPool (TODO) - // ForkJoinPool.helpAsyncBlocker(executor, this); - if ((stat = putStat) == 0) { - try { - ForkJoinPool.managedBlock(this); - } catch (InterruptedException ie) { - timeout = INTERRUPTED; - } - stat = putStat; - } - if (timeout < 0L) { - Thread.currentThread().interrupt(); - } - } - return stat; - } - - /** - * Timeout version; similar to submit. - */ - final int timedOffer(T item, long nanos) { - int stat; - if ((stat = offer(item)) == 0 && (timeout = nanos) > 0L) { - putItem = item; - putStat = 0; - // safe to comment out when executor != ForkJoinPool (TODO) - // ForkJoinPool.helpAsyncBlocker(executor, this); - if ((stat = putStat) == 0) { - try { - ForkJoinPool.managedBlock(this); - } catch (InterruptedException ie) { - timeout = INTERRUPTED; - } - stat = putStat; - } - if (timeout < 0L) { - Thread.currentThread().interrupt(); - } - } - return stat; - } - - /** - * Tries to start consumer task after offer. - * - * @return -1 if now disabled, else argument - */ - private int startOnOffer(int stat) { - for (;;) { - Executor e; - int c; - if ((c = ctl) == DISABLED || (e = executor) == null) { - stat = -1; - break; - } else if ((c & ACTIVE) != 0) { // ensure keep-alive - if ((c & CONSUME) != 0 || U.compareAndSwapInt(this, CTL, c, c | CONSUME)) { - break; - } - } else if (demand == 0L || tail == head) { - break; - } else if (U.compareAndSwapInt(this, CTL, c, - c | (ACTIVE | CONSUME))) { - try { - e.execute(new ConsumerTask(this)); - break; - } catch (RuntimeException | Error ex) { // back out - do { - } while (((c = ctl) & DISABLED) == 0 - && (c & ACTIVE) != 0 - && !U.compareAndSwapInt(this, CTL, c, c & ~ACTIVE)); - throw ex; - } - } - } - return stat; - } - - private void signalWaiter(Thread w) { - waiter = null; - LockSupport.unpark(w); // release producer - } - - /** - * Nulls out most fields, mainly to avoid garbage retention - * until publisher unsubscribes, but also to help cleanly stop - * upon error by nulling required components. - */ - private void detach() { - Thread w = waiter; - executor = null; - subscriber = null; - pendingError = null; - signalWaiter(w); - } - - /** - * Issues error signal, asynchronously if a task is running, - * else synchronously. - */ - final void onError(Throwable ex) { - for (int c;;) { - if (((c = ctl) & (ERROR | DISABLED)) != 0) { - break; - } else if ((c & ACTIVE) != 0) { - pendingError = ex; - if (U.compareAndSwapInt(this, CTL, c, c | ERROR)) { - break; // cause consumer task to exit - } - } else if (U.compareAndSwapInt(this, CTL, c, DISABLED)) { - Flow.Subscriber s = subscriber; - if (s != null && ex != null) { - try { - s.onError(ex); - } catch (Throwable ignore) { - } - } - detach(); - break; - } - } - } - - /** - * Tries to start consumer task upon a signal or request; - * disables on failure. - */ - private void startOrDisable() { - Executor e; - if ((e = executor) != null) { // skip if already disabled - try { - e.execute(new ConsumerTask(this)); - } catch (Throwable ex) { // back out and force signal - for (int c;;) { - if ((c = ctl) == DISABLED || (c & ACTIVE) == 0) { - break; - } - if (U.compareAndSwapInt(this, CTL, c, c & ~ACTIVE)) { - onError(ex); - break; - } - } - } - } - } - - final void onComplete() { - for (int c;;) { - if ((c = ctl) == DISABLED) { - break; - } - if (U.compareAndSwapInt(this, CTL, c, - c | (ACTIVE | CONSUME | COMPLETE))) { - if ((c & ACTIVE) == 0) { - startOrDisable(); - } - break; - } - } - } - - final void onSubscribe() { - for (int c;;) { - if ((c = ctl) == DISABLED) { - break; - } - if (U.compareAndSwapInt(this, CTL, c, - c | (ACTIVE | CONSUME | SUBSCRIBE))) { - if ((c & ACTIVE) == 0) { - startOrDisable(); - } - break; - } - } - } - - /** - * Causes consumer task to exit if active (without reporting - * onError unless there is already a pending error), and - * disables. - */ - public void cancel() { - for (int c;;) { - if ((c = ctl) == DISABLED) { - break; - } else if ((c & ACTIVE) != 0) { - if (U.compareAndSwapInt(this, CTL, c, - c | (CONSUME | ERROR))) { - break; - } - } else if (U.compareAndSwapInt(this, CTL, c, DISABLED)) { - detach(); - break; - } - } - } - - /** - * Adds to demand and possibly starts task. - */ - public void request(long n) { - if (n > 0L) { - for (;;) { - long prev = demand, d; - if ((d = prev + n) < prev) { // saturate - d = Long.MAX_VALUE; - } - if (U.compareAndSwapLong(this, DEMAND, prev, d)) { - for (int c, h;; ) { - if ((c = ctl) == DISABLED) { - break; - } else if ((c & ACTIVE) != 0) { - if ((c & CONSUME) != 0 || U.compareAndSwapInt(this, CTL, c, c | CONSUME)) { - break; - } - } else if ((h = head) != tail) { - if (U.compareAndSwapInt(this, CTL, c, - c | (ACTIVE | CONSUME))) { - startOrDisable(); - break; - } - } else if (head == h && tail == h) { - break; // else stale - } - if (demand == 0L) { - break; - } - } - break; - } - } - } else if (n < 0L) { - onError(new IllegalArgumentException( - "negative subscription request")); - } - } - - public final boolean isReleasable() { // for ManagedBlocker - T item = putItem; - if (item != null) { - if ((putStat = offer(item)) == 0) { - return false; - } - putItem = null; - } - return true; - } - - public final boolean block() { // for ManagedBlocker - T item = putItem; - if (item != null) { - putItem = null; - long nanos = timeout; - long deadline = (nanos > 0L) ? System.nanoTime() + nanos : 0L; - while ((putStat = offer(item)) == 0) { - if (Thread.interrupted()) { - timeout = INTERRUPTED; - if (nanos > 0L) { - break; - } - } else if (nanos > 0L && (nanos = deadline - System.nanoTime()) <= 0L) { - break; - } else if (waiter == null) { - waiter = Thread.currentThread(); - } else { - if (nanos > 0L) { - LockSupport.parkNanos(this, nanos); - } else { - LockSupport.park(this); - } - waiter = null; - } - } - } - waiter = null; - return true; - } - - /** - * Consumer loop, called from ConsumerTask, or indirectly - * when helping during submit. - */ - final void consume() { - Flow.Subscriber s; - int h = head; - if ((s = subscriber) != null) { // else disabled - for (;;) { - long d = demand; - int c; - Object[] a; - int n; - long i; - Object x; - Thread w; - if (((c = ctl) & (ERROR | SUBSCRIBE | DISABLED)) != 0) { - if (!checkControl(s, c)) { - break; - } - } else if ((a = array) == null || h == tail - || (n = a.length) == 0 - || (x = U.getObjectVolatile(a, (i = ((long) ((n - 1) & h) << ASHIFT) + ABASE))) == null) { - if (!checkEmpty(s, c)) { - break; - } - } else if (d == 0L) { - if (!checkDemand(c)) { - break; - } - } else if (((c & CONSUME) != 0 - || U.compareAndSwapInt(this, CTL, c, c | CONSUME)) - && U.compareAndSwapObject(a, i, x, null)) { - U.putOrderedInt(this, HEAD, ++h); - U.getAndAddLong(this, DEMAND, -1L); - if ((w = waiter) != null) { - signalWaiter(w); - } - try { - @SuppressWarnings("unchecked") T y = (T) x; - s.onNext(y); - } catch (Throwable ex) { - handleOnNext(s, ex); - } - } - } - } - } - - /** - * Responds to control events in consume(). - */ - private boolean checkControl(Flow.Subscriber s, int c) { - boolean stat = true; - if ((c & SUBSCRIBE) != 0) { - if (U.compareAndSwapInt(this, CTL, c, c & ~SUBSCRIBE)) { - try { - if (s != null) { - s.onSubscribe(this); - } - } catch (Throwable ex) { - onError(ex); - } - } - } else if ((c & ERROR) != 0) { - Throwable ex = pendingError; - ctl = DISABLED; // no need for CAS - if (ex != null) { // null if errorless cancel - try { - if (s != null) { - s.onError(ex); - } - } catch (Throwable ignore) { - } - } - } else { - detach(); - stat = false; - } - return stat; - } - - /** - * Responds to apparent emptiness in consume(). - */ - private boolean checkEmpty(Flow.Subscriber s, int c) { - boolean stat = true; - if (head == tail) { - if ((c & CONSUME) != 0) { - U.compareAndSwapInt(this, CTL, c, c & ~CONSUME); - } else if ((c & COMPLETE) != 0) { - if (U.compareAndSwapInt(this, CTL, c, DISABLED)) { - try { - if (s != null) { - s.onComplete(); - } - } catch (Throwable ignore) { - } - } - } else if (U.compareAndSwapInt(this, CTL, c, c & ~ACTIVE)) { - stat = false; - } - } - return stat; - } - - /** - * Responds to apparent zero demand in consume(). - */ - private boolean checkDemand(int c) { - boolean stat = true; - if (demand == 0L) { - if ((c & CONSUME) != 0) { - U.compareAndSwapInt(this, CTL, c, c & ~CONSUME); - } else if (U.compareAndSwapInt(this, CTL, c, c & ~ACTIVE)) { - stat = false; - } - } - return stat; - } - - /** - * Processes exception in Subscriber.onNext. - */ - private void handleOnNext(Flow.Subscriber s, Throwable ex) { - BiConsumer, ? super Throwable> h; - if ((h = onNextHandler) != null) { - try { - h.accept(s, ex); - } catch (Throwable ignore) { - } - } - onError(ex); - } - - // Unsafe mechanics - private static final sun.misc.Unsafe U = UnsafeAccessor.getUnsafe(); - private static final long CTL; - private static final long TAIL; - private static final long HEAD; - private static final long DEMAND; - private static final int ABASE; - private static final int ASHIFT; - - static { - try { - CTL = U.objectFieldOffset(BufferedSubscription.class.getDeclaredField("ctl")); - TAIL = U.objectFieldOffset(BufferedSubscription.class.getDeclaredField("tail")); - HEAD = U.objectFieldOffset(BufferedSubscription.class.getDeclaredField("head")); - DEMAND = U.objectFieldOffset(BufferedSubscription.class.getDeclaredField("demand")); - - ABASE = U.arrayBaseOffset(Object[].class); - int scale = U.arrayIndexScale(Object[].class); - if ((scale & (scale - 1)) != 0) { - throw new Error("data type scale not a power of two"); - } - ASHIFT = 31 - Integer.numberOfLeadingZeros(scale); - } catch (ReflectiveOperationException e) { - throw new Error(e); - } - - // Reduce the risk of rare disastrous classloading in first call to - // LockSupport.park: https://bugs.openjdk.java.net/browse/JDK-8074773 - Class ensureLoaded = LockSupport.class; - } - } -} diff --git a/core-common/src/main/java8/org/glassfish/jersey/internal/jsr166/SubmissionPublisherFactory.java b/core-common/src/main/java8/org/glassfish/jersey/internal/jsr166/SubmissionPublisherFactory.java deleted file mode 100644 index 3729469126..0000000000 --- a/core-common/src/main/java8/org/glassfish/jersey/internal/jsr166/SubmissionPublisherFactory.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 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.internal.jsr166; - -import java.util.concurrent.Executor; -import java.util.concurrent.ForkJoinPool; -import java.util.function.BiConsumer; - -/** - * Factory creating JDK8 compatible SubmissionPublisher (Jdk8SubmissionPublisher) or JDK 9+ SubmissionPublisher - */ -public class SubmissionPublisherFactory { - - /** - * Creates a new SubmissionPublisher using the {@link - * ForkJoinPool#commonPool()} for async delivery to subscribers - * (unless it does not support a parallelism level of at least two, - * in which case, a new Thread is created to run each task), with - * maximum buffer capacity of {@link Flow#defaultBufferSize}, and no - * handler for Subscriber exceptions in method {@link - * Flow.Subscriber#onNext(Object) onNext}. - */ - public static SubmittableFlowPublisher createSubmissionPublisher() { - return new SubmissionPublisher(); - } - - public static SubmittableFlowPublisher createSubmissionPublisher(Executor executor, - int maxBufferCapacity) { - return new SubmissionPublisher(executor, maxBufferCapacity); - } - - public static SubmittableFlowPublisher createSubmissionPublisher(Executor executor, - int maxBufferCapacity, - BiConsumer, - ? super Throwable> handler) { - return new SubmissionPublisher(executor, maxBufferCapacity, handler); - } - -} diff --git a/core-common/src/main/java8/org/glassfish/jersey/internal/jsr166/UnsafeAccessor.java b/core-common/src/main/java8/org/glassfish/jersey/internal/jsr166/UnsafeAccessor.java deleted file mode 100644 index 19f988711a..0000000000 --- a/core-common/src/main/java8/org/glassfish/jersey/internal/jsr166/UnsafeAccessor.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2017, 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.internal.jsr166; - -import sun.misc.Unsafe; - -import java.lang.reflect.Field; -import java.security.PrivilegedExceptionAction; - -/** - * Helper for classes in the jsr166 package to access the {@code sun.misc.Unsafe} instance. - * - * @author Adam Lindenthal - */ -class UnsafeAccessor { - static sun.misc.Unsafe getUnsafe() { - try { - return sun.misc.Unsafe.getUnsafe(); - } catch (SecurityException tryReflectionInstead) { - } - try { - return java.security.AccessController.doPrivileged((PrivilegedExceptionAction) () -> { - Class k = Unsafe.class; - for (Field f : k.getDeclaredFields()) { - f.setAccessible(true); - Object x = f.get(null); - if (k.isInstance(x)) { - return k.cast(x); - } - } - throw new NoSuchFieldError("the Unsafe"); - }); - } catch (java.security.PrivilegedActionException e) { - throw new RuntimeException("Could not initialize intrinsics", e.getCause()); - } - - - } -} diff --git a/etc/config/copyright-exclude b/etc/config/copyright-exclude index 987175b599..d5cff67e92 100644 --- a/etc/config/copyright-exclude +++ b/etc/config/copyright-exclude @@ -71,8 +71,6 @@ build.readme /tests/e2e-entity/src/test/resources/org/glassfish/jersey/tests/e2e/entity/xxe.txt /core-server/src/main/java/com/sun/research/ws/wadl /core-common/src/main/java/org/glassfish/jersey/internal/jsr166 -/core-common/src/main/jsr166/org/glassfish/jersey/internal/jsr166 -/core-common/src/main/java8/org/glassfish/jersey/internal/jsr166 /tests/performance/etc/data/MEASUREMENT_DATA /core-common/src/main/java/org/glassfish/jersey/internal/guava/ /core-server/src/main/java/org/glassfish/jersey/server/internal/monitoring/core/AbstractSlidingWindowTimeReservoir.java diff --git a/examples/bookstore-webapp/pom.xml b/examples/bookstore-webapp/pom.xml index 20f9774d81..4d5ff1d760 100644 --- a/examples/bookstore-webapp/pom.xml +++ b/examples/bookstore-webapp/pom.xml @@ -69,6 +69,11 @@ jakarta.xml.bind jakarta.xml.bind-api + + com.sun.xml.bind + jaxb-osgi + runtime + @@ -87,19 +92,6 @@ - - jdk11+ - - [11,) - - - - com.sun.xml.bind - jaxb-osgi - runtime - - - run-external-tests diff --git a/examples/https-clientserver-grizzly/pom.xml b/examples/https-clientserver-grizzly/pom.xml index 9a68afc48d..fac2e4bbd2 100644 --- a/examples/https-clientserver-grizzly/pom.xml +++ b/examples/https-clientserver-grizzly/pom.xml @@ -58,6 +58,12 @@ junit test + + com.sun.xml.bind + jaxb-osgi + runtime + + @@ -73,23 +79,6 @@ - - jdk11+ - - [11,) - - - - -Djdk.tls.server.protocols=TLSv1.2 - - - - com.sun.xml.bind - jaxb-osgi - runtime - - - pre-release @@ -103,4 +92,9 @@ + + + -Djdk.tls.server.protocols=TLSv1.2 + + diff --git a/ext/microprofile/mp-config/pom.xml b/ext/microprofile/mp-config/pom.xml index eebc242422..7ae3aacd1e 100644 --- a/ext/microprofile/mp-config/pom.xml +++ b/ext/microprofile/mp-config/pom.xml @@ -75,42 +75,13 @@ test - + + org.glassfish.jersey.test-framework.providers + jersey-test-framework-provider-jetty + ${project.version} + test + - - - JettyExclude - - 1.8 - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org/glassfish/jersey/microprofile/config/ExternalPropertiesConfigurationFactoryTest.java - - - - - - - - Jetty11 - - [11,) - - - - org.glassfish.jersey.test-framework.providers - jersey-test-framework-provider-jetty - ${project.version} - test - - - - + diff --git a/ext/pom.xml b/ext/pom.xml index 83b3061ba2..c4f3784fda 100644 --- a/ext/pom.xml +++ b/ext/pom.xml @@ -55,7 +55,7 @@ spring4 spring5 --> - + wadl-doclet microprofile diff --git a/incubator/declarative-linking/pom.xml b/incubator/declarative-linking/pom.xml index 0fa4aa05c4..f4ac12f54b 100644 --- a/incubator/declarative-linking/pom.xml +++ b/incubator/declarative-linking/pom.xml @@ -79,12 +79,12 @@ ${project.version} test - - - - - - + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey.version} + test + com.fasterxml.jackson.core jackson-databind @@ -179,22 +179,6 @@ - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - - org/glassfish/jersey/linking/integration/LinkingTest.java - org/glassfish/jersey/linking/integration/LinkingManualTest.java - - - - - diff --git a/media/multipart/pom.xml b/media/multipart/pom.xml index b4f2a65d9e..612fe64fee 100644 --- a/media/multipart/pom.xml +++ b/media/multipart/pom.xml @@ -92,6 +92,12 @@ ${project.version} test + + org.glassfish.jersey.connectors + jersey-jetty-connector + ${project.version} + test + junit @@ -99,40 +105,4 @@ - - - JettyExclude - - 1.8 - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org/glassfish/jersey/media/multipart/internal/MultiPartHeaderModificationTest.java - - - - - - - - Jetty11 - - [11,) - - - - org.glassfish.jersey.connectors - jersey-jetty-connector - ${project.version} - test - - - - - diff --git a/pom.xml b/pom.xml index d67cdca131..b04669139f 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.eclipse.ee4j project - 1.0.6 + 1.0.7 org.glassfish.jersey diff --git a/test-framework/providers/jetty/pom.xml b/test-framework/providers/jetty/pom.xml index 5436e9b25e..fa2539f940 100644 --- a/test-framework/providers/jetty/pom.xml +++ b/test-framework/providers/jetty/pom.xml @@ -44,148 +44,4 @@ - - ${project.basedir}/target - ${project.basedir}/src/main/java8 - ${project.basedir}/target11 - ${project.basedir}/src/main/java11 - - - - - JettyExclude - - 1.8 - - - ${java8.build.outputDirectory} - - - org.codehaus.mojo - build-helper-maven-plugin - - - generate-sources - - add-source - - - - ${java8.sourceDirectory} - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org/glassfish/jersey/test/jetty/*.java - - - - - - - - Jetty11 - - [11,) - - - ${java11.build.outputDirectory} - - - org.codehaus.mojo - build-helper-maven-plugin - - - generate-sources - - add-source - - - - ${java11.sourceDirectory} - - - - - - - - - - copyJDK11FilesToMultiReleaseJar - - - - target11/classes/org/glassfish/jersey/test/jetty/JettyTestContainerFactory.class - - 1.8 - - - - - org.apache.felix - maven-bundle-plugin - true - true - - - true - - - - - org.apache.maven.plugins - maven-resources-plugin - true - - - copy-jdk11-classes - prepare-package - - copy-resources - - - ${java8.build.outputDirectory}/classes/META-INF/versions/11 - - - ${java11.build.outputDirectory}/classes - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - copy-jdk11-sources - package - - - - sources-jar: ${sources-jar} - - - - - - - run - - - - - - - - - diff --git a/test-framework/providers/jetty/src/main/java11/org/glassfish/jersey/test/jetty/JettyTestContainerFactory.java b/test-framework/providers/jetty/src/main/java/org/glassfish/jersey/test/jetty/JettyTestContainerFactory.java similarity index 98% rename from test-framework/providers/jetty/src/main/java11/org/glassfish/jersey/test/jetty/JettyTestContainerFactory.java rename to test-framework/providers/jetty/src/main/java/org/glassfish/jersey/test/jetty/JettyTestContainerFactory.java index e5dba36647..2ce4577dd3 100644 --- a/test-framework/providers/jetty/src/main/java11/org/glassfish/jersey/test/jetty/JettyTestContainerFactory.java +++ b/test-framework/providers/jetty/src/main/java/org/glassfish/jersey/test/jetty/JettyTestContainerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 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 diff --git a/test-framework/providers/jetty/src/main/java8/org/glassfish/jersey/test/jetty/JettyTestContainerFactory.java b/test-framework/providers/jetty/src/main/java8/org/glassfish/jersey/test/jetty/JettyTestContainerFactory.java deleted file mode 100644 index cd2e33238c..0000000000 --- a/test-framework/providers/jetty/src/main/java8/org/glassfish/jersey/test/jetty/JettyTestContainerFactory.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 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.test.jetty; - -import jakarta.ws.rs.ProcessingException; -import org.glassfish.jersey.jetty.internal.LocalizationMessages; -import org.glassfish.jersey.test.DeploymentContext; -import org.glassfish.jersey.test.spi.TestContainer; -import org.glassfish.jersey.test.spi.TestContainerFactory; - -import java.net.URI; - -/** - * Jetty test factory stub for JDK 1.8 only - * - * since Jetty 11+ does not support JDKs below 11 - */ -public class JettyTestContainerFactory implements TestContainerFactory { - - @Override - public TestContainer create(final URI baseUri, final DeploymentContext context) throws IllegalArgumentException { - throw new ProcessingException(LocalizationMessages.NOT_SUPPORTED()); - } -} diff --git a/tests/e2e-client/pom.xml b/tests/e2e-client/pom.xml index 55e95d3ae9..5677395464 100644 --- a/tests/e2e-client/pom.xml +++ b/tests/e2e-client/pom.xml @@ -187,16 +187,6 @@ - - jdk11+ - - [11,) - - - - -Djdk.tls.server.protocols=TLSv1.2 - - xdk @@ -224,4 +214,9 @@ + + + -Djdk.tls.server.protocols=TLSv1.2 + + diff --git a/tests/e2e/pom.xml b/tests/e2e/pom.xml index 179e28bb14..9638cecca4 100644 --- a/tests/e2e/pom.xml +++ b/tests/e2e/pom.xml @@ -204,26 +204,6 @@ - - JettyExclude - - 1.8 - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org/glassfish/jersey/tests/e2e/container/Jersey2462Test.java - org/glassfish/jersey/tests/e2e/container/JettyEmptyHeaderParamTest.java - - - - - - sonar diff --git a/tests/integration/j-59/war/pom.xml b/tests/integration/j-59/war/pom.xml index 5743c6108d..f6268bf789 100644 --- a/tests/integration/j-59/war/pom.xml +++ b/tests/integration/j-59/war/pom.xml @@ -65,6 +65,11 @@ hamcrest-library test + + jakarta.jws + jakarta.jws-api + 1.1.1 + @@ -96,22 +101,6 @@ - - - jdk11+ - - [11,) - - - - jakarta.jws - jakarta.jws-api - 1.1.1 - - - - - false true diff --git a/tests/integration/jersey-2322/pom.xml b/tests/integration/jersey-2322/pom.xml index 5b8de1799f..428248f03d 100644 --- a/tests/integration/jersey-2322/pom.xml +++ b/tests/integration/jersey-2322/pom.xml @@ -58,14 +58,6 @@ org.apache.maven.plugins maven-compiler-plugin - - - **/* - - - **/* - - org.apache.maven.plugins diff --git a/tests/integration/servlet-4.0-mvc-1/pom.xml b/tests/integration/servlet-4.0-mvc-1/pom.xml index 23106f2795..5094b900ce 100644 --- a/tests/integration/servlet-4.0-mvc-1/pom.xml +++ b/tests/integration/servlet-4.0-mvc-1/pom.xml @@ -51,6 +51,14 @@ jakarta.servlet-api ${servlet5.version} + + jakarta.xml.bind + jakarta.xml.bind-api + + + com.sun.xml.bind + jaxb-osgi + org.glassfish.jersey.test-framework.providers @@ -91,24 +99,4 @@ - - - - jdk11+ - - [11,) - - - - jakarta.xml.bind - jakarta.xml.bind-api - - - com.sun.xml.bind - jaxb-osgi - - - - - diff --git a/tests/performance/test-cases/mbw-xml-jaxb/pom.xml b/tests/performance/test-cases/mbw-xml-jaxb/pom.xml index 9620115fb7..4d287f795e 100644 --- a/tests/performance/test-cases/mbw-xml-jaxb/pom.xml +++ b/tests/performance/test-cases/mbw-xml-jaxb/pom.xml @@ -46,6 +46,11 @@ jakarta.ws.rs-api provided + + com.sun.xml.bind + jaxb-osgi + + org.glassfish.jersey.test-framework.providers @@ -63,42 +68,4 @@ - - - jdk11+ - - [11,) - - - - jakarta.xml.bind - jakarta.xml.bind-api - - - com.sun.xml.bind - jaxb-osgi - - - - - jdk8 - - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org/glassfish/jersey/tests/performance/mbw/xml/XmlEntityTest.java - - - - - - - -