Build core-common on JDK 11

Possible to create multirelease jar

Signed-off-by: Jan Supol <[email protected]>

core-common/src/main/java/org/glassfish/jersey/internal/util/JerseyPublisher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -25,21 +25,23 @@
 import java.util.function.Consumer;
 
 import org.glassfish.jersey.internal.LocalizationMessages;
+import org.glassfish.jersey.internal.jsr166.SubmissionPublisherFactory;
+import org.glassfish.jersey.internal.jsr166.SubmittableFlowPublisher;
 import org.glassfish.jersey.internal.jsr166.Flow;
-import org.glassfish.jersey.internal.jsr166.SubmissionPublisher;
-
 
 /**
  * Implementation of {@link Flow.Publisher} corresponding to reactive streams specification.
  * <p>
- * Delegates to {@link SubmissionPublisher} repackaged from jsr166.
+ * Delegates to {@link SubmittableFlowPublisher} implementation either repackaged from jsr166 for jdk8, or a facade of jdk9
+ * {@code SubmissionPublisher}
  *
  * @author Adam Lindenthal (adam.lindenthal at oracle.com)
  */
-public class JerseyPublisher<T> implements Flow.Publisher<T> {
+public class JerseyPublisher<T> implements SubmittableFlowPublisher<T> {
 
     private static final int DEFAULT_BUFFER_CAPACITY = 256;
-    private SubmissionPublisher<T> submissionPublisher = new SubmissionPublisher<>();
+    private SubmittableFlowPublisher<T> submissionPublisher = SubmissionPublisherFactory.createSubmissionPublisher();
+
 
     private final PublisherStrategy strategy;
 
@@ -90,7 +92,7 @@ public JerseyPublisher(final Executor executor) {
      */
     public JerseyPublisher(final Executor executor, final PublisherStrategy strategy) {
         this.strategy = strategy;
-        submissionPublisher = new SubmissionPublisher<>(executor, DEFAULT_BUFFER_CAPACITY);
+        submissionPublisher = SubmissionPublisherFactory.createSubmissionPublisher(executor, DEFAULT_BUFFER_CAPACITY);
     }
 
 
@@ -128,7 +130,7 @@ public JerseyPublisher(final int maxBufferCapacity) {
      */
     public JerseyPublisher(final Executor executor, final int maxBufferCapacity, PublisherStrategy strategy) {
         this.strategy = strategy;
-        submissionPublisher = new SubmissionPublisher<>(executor, maxBufferCapacity);
+        submissionPublisher = SubmissionPublisherFactory.createSubmissionPublisher(executor, maxBufferCapacity);
     }
 
     @Override
@@ -147,7 +149,7 @@ public void subscribe(final Flow.Subscriber<? super T> subscriber) {
      * @throws NullPointerException if data is null
      * @throws java.util.concurrent.RejectedExecutionException if thrown by Executor
      */
-    private int submit(final T data) {
+    public int submit(final T data) {
         return submissionPublisher.submit(data);
     }
 
@@ -203,7 +205,7 @@ public CompletableFuture<Void> consume(final Consumer<? super T> consumer) {
      * @throws NullPointerException       if item is null
      * @throws RejectedExecutionException if thrown by Executor
      */
-    private int offer(T item, BiPredicate<Flow.Subscriber<? super T>, ? super T> onDrop) {
+    public int offer(T item, BiPredicate<Flow.Subscriber<? super T>, ? super T> onDrop) {
         return offer(item, 0, TimeUnit.MILLISECONDS, onDrop);
     }
 
@@ -252,7 +254,7 @@ private int offer(T item, BiPredicate<Flow.Subscriber<? super T>, ? super T> onD
      * @throws NullPointerException       if item is null
      * @throws RejectedExecutionException if thrown by Executor
      */
-    private int offer(T item,
+    public int offer(T item,
                       long timeout,
                       TimeUnit unit,
                       BiPredicate<Flow.Subscriber<? super T>, ? super T> onDrop) {

core-common/src/main/java/org/glassfish/jersey/internal/jsr166/SubmissionPublisher.java → core-common/src/main/java8/org/glassfish/jersey/internal/jsr166/SubmissionPublisher.java

@@ -134,7 +134,7 @@
  * @author Doug Lea
  * @since 9
  */
-public class SubmissionPublisher<T> implements Flow.Publisher<T>,
+public class SubmissionPublisher<T> implements Flow.Publisher<T>, SubmittableFlowPublisher<T>,
         AutoCloseable {
     /*
      * Most mechanics are handled by BufferedSubscription. This class

core-common/src/main/java8/org/glassfish/jersey/internal/jsr166/SubmissionPublisherFactory.java

@@ -0,0 +1,53 @@
+/*
+ * 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 <T> SubmittableFlowPublisher<T> createSubmissionPublisher() {
+        return new SubmissionPublisher<T>();
+    }
+
+    public static <T> SubmittableFlowPublisher<T> createSubmissionPublisher(Executor executor,
+                                                                            int maxBufferCapacity) {
+        return new SubmissionPublisher<T>(executor, maxBufferCapacity);
+    }
+
+    public static <T> SubmittableFlowPublisher<T> createSubmissionPublisher(Executor executor,
+                                                                            int maxBufferCapacity,
+                                                                            BiConsumer<? super Flow.Subscriber<? super T>,
+                                                                                    ? super Throwable> handler) {
+        return new SubmissionPublisher<T>(executor, maxBufferCapacity, handler);
+    }
+
+}