Default client executor server is no longer ForkJoinPool.commonPool.

Change-Id: I4790491c20b1a88b87d16c8ec796bfe9839f7d21

Author: pavelbucek

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

@@ -44,7 +44,6 @@
 import java.security.AccessController;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -71,6 +70,7 @@
 class ClientExecutorProvidersConfigurator extends AbstractExecutorProvidersConfigurator {
 
     private static final Logger LOGGER = Logger.getLogger(ClientExecutorProvidersConfigurator.class.getName());
+    private static final ExecutorService MANAGED_EXECUTOR_SERVICE = lookupManagedExecutorService();
 
     private final ComponentBag componentBag;
     private final JerseyClient client;
@@ -92,10 +92,10 @@ public void init(InjectionManager injectionManager, BootstrapBag bootstrapBag) {
 
         // if there is a users provided executor service, use it
         if (clientExecutorService != null) {
-            defaultAsyncExecutorProvider = new ClientExecutorServiceProvider(Values.<ExecutorService>of(clientExecutorService));
+            defaultAsyncExecutorProvider = new ClientExecutorServiceProvider(clientExecutorService);
         // otherwise, check for ClientProperties.ASYNC_THREADPOOL_SIZE - if that is set, Jersey will create the
         // ExecutorService to be used. If not and running on Java EE container, ManagedExecutorService will be used.
-        // Final fallback is ForkJoinPool.commonPool()).
+        // Final fallback is DefaultClientAsyncExecutorProvider with defined default.
         } else {
 
             // Default async request executors support
@@ -112,13 +112,11 @@ public void init(InjectionManager injectionManager, BootstrapBag bootstrapBag) {
 
                 defaultAsyncExecutorProvider = new DefaultClientAsyncExecutorProvider(asyncThreadPoolSize);
             } else {
-                defaultAsyncExecutorProvider = new ClientExecutorServiceProvider(Values.lazy(new Value<ExecutorService>() {
-                    @Override
-                    public ExecutorService get() {
-                        ExecutorService executorService = lookupManagedExecutorService();
-                        return executorService == null ? ForkJoinPool.commonPool() : executorService;
-                    }
-                }));
+                if (MANAGED_EXECUTOR_SERVICE != null) {
+                    defaultAsyncExecutorProvider = new ClientExecutorServiceProvider(MANAGED_EXECUTOR_SERVICE);
+                } else {
+                    defaultAsyncExecutorProvider = new DefaultClientAsyncExecutorProvider(0);
+                }
             }
         }
 
@@ -152,7 +150,7 @@ public ExecutorService get() {
         registerExecutors(injectionManager, componentBag, defaultAsyncExecutorProvider, defaultScheduledExecutorProvider);
     }
 
-    private ExecutorService lookupManagedExecutorService() {
+    private static ExecutorService lookupManagedExecutorService() {
         // Get the default ManagedExecutorService, if available
         try {
             // Android and some other environments don't have InitialContext class available.
@@ -200,15 +198,15 @@ private ScheduledExecutorService lookupManagedScheduledExecutorService() {
     @ClientAsyncExecutor
     public static class ClientExecutorServiceProvider implements ExecutorServiceProvider {
 
-        private final Value<ExecutorService> executorService;
+        private final ExecutorService executorService;
 
-        ClientExecutorServiceProvider(Value<ExecutorService> executorService) {
+        ClientExecutorServiceProvider(ExecutorService executorService) {
             this.executorService = executorService;
         }
 
         @Override
         public ExecutorService getExecutorService() {
-            return executorService.get();
+            return executorService;
         }
 
         @Override

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

@@ -48,7 +48,6 @@
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -304,10 +303,6 @@ private void cleanUpShutdownHooks() {
         }
     }
 
-    private ExecutorService getDefaultExecutorService() {
-        return ForkJoinPool.commonPool();
-    }
-
     private ScheduledExecutorService getDefaultScheduledExecutorService() {
         return Executors.newScheduledThreadPool(8);
     }

ext/rx/rx-client-rxjava/src/test/java/org/glassfish/jersey/client/rx/rxjava/RxObservableTest.java

@@ -223,7 +223,7 @@ private static void testResponse(final Response response, final int expectedStat
 
         // Executor.
         assertThat(response.getHeaderString("Test-Thread"), testDedicatedThread
-                ? containsString("jersey-rx-client-test") : containsString("ForkJoinPool.commonPool"));
+                ? containsString("jersey-rx-client-test") : containsString("jersey-client-async-executor"));
 
         // Properties.
         assertThat(response.getHeaderString("Test-Uri"), is("http://jersey.java.net"));

ext/rx/rx-client-rxjava2/src/test/java/org/glassfish/jersey/client/rx/rxjava2/RxFlowableTest.java

@@ -212,7 +212,7 @@ private static void testResponse(final Response response, final int expectedStat
 
         // Executor.
         assertThat(response.getHeaderString("Test-Thread"), testDedicatedThread
-                ? containsString("jersey-rx-client-test") : containsString("ForkJoinPool.commonPool"));
+                ? containsString("jersey-rx-client-test") : containsString("jersey-client-async-executor"));
 
         // Properties.
         assertThat(response.getHeaderString("Test-Uri"), is("http://jersey.java.net"));

tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/ClientExecutorTest.java

@@ -124,7 +124,7 @@ public void testDefaultExecutorRx() throws InterruptedException {
 
         latch.await(3, TimeUnit.SECONDS);
         assertNotNull(threadName);
-        assertThat(threadName, containsString("ForkJoinPool.commonPool"));
+        assertThat(threadName, containsString("jersey-client-async-executor"));
     }
 
     @Test
@@ -138,7 +138,7 @@ public void testDefaultExecutorAsync() throws InterruptedException {
 
         latch.await(3, TimeUnit.SECONDS);
         assertNotNull(threadName);
-        assertThat(threadName, containsString("ForkJoinPool.commonPool"));
+        assertThat(threadName, containsString("jersey-client-async-executor"));
     }
 
     @Test