Merge "Breaking down initialization process using implementations of BootstrapConfigurator. - introduced interface BootstrapConfigurator which represents a single initialization step - each step defines init phase (dedicated to register into InjectionManager) and post-init phase (getting from InjectionManager) - step should be focused on the processing of single problem domain - configurators are dependent on the order of their processing" into 2.x

Author: pavelbucek

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

@@ -52,17 +52,14 @@
 import javax.inject.Provider;
 import javax.inject.Singleton;
 
-import org.glassfish.jersey.internal.ContextResolverFactory;
 import org.glassfish.jersey.internal.JaxrsProviders;
 import org.glassfish.jersey.internal.PropertiesDelegate;
 import org.glassfish.jersey.internal.ServiceFinderBinder;
 import org.glassfish.jersey.internal.inject.AbstractBinder;
 import org.glassfish.jersey.internal.inject.ReferencingFactory;
 import org.glassfish.jersey.internal.spi.AutoDiscoverable;
 import org.glassfish.jersey.internal.util.collection.Ref;
-import org.glassfish.jersey.message.internal.MessageBodyFactory;
 import org.glassfish.jersey.message.internal.MessagingBinders;
-import org.glassfish.jersey.process.internal.RequestScope;
 import org.glassfish.jersey.process.internal.RequestScoped;
 import org.glassfish.jersey.spi.ExecutorServiceProvider;
 import org.glassfish.jersey.spi.ScheduledExecutorServiceProvider;
@@ -112,22 +109,19 @@ public PropertiesDelegate get() {
 
     @Override
     protected void configure() {
-        install(new RequestScope.Binder(), // must go first as it registers the request scope instance.
-                new MessagingBinders.MessageBodyProviders(clientRuntimeProperties, RuntimeType.CLIENT),
+        install(new MessagingBinders.MessageBodyProviders(clientRuntimeProperties, RuntimeType.CLIENT),
                 new MessagingBinders.HeaderDelegateProviders(),
-                new MessageBodyFactory.Binder(),
-                new ContextResolverFactory.Binder(),
                 new JaxrsProviders.Binder(),
                 new ServiceFinderBinder<>(AutoDiscoverable.class, clientRuntimeProperties, RuntimeType.CLIENT));
 
-        bindFactory(ReferencingFactory.<ClientConfig>referenceFactory()).to(new GenericType<Ref<ClientConfig>>() {
+        bindFactory(ReferencingFactory.referenceFactory()).to(new GenericType<Ref<ClientConfig>>() {
         }).in(RequestScoped.class);
 
         bindFactory(RequestContextInjectionFactory.class)
                 .to(ClientRequest.class)
                 .in(RequestScoped.class);
 
-        bindFactory(ReferencingFactory.<ClientRequest>referenceFactory()).to(new GenericType<Ref<ClientRequest>>() {
+        bindFactory(ReferencingFactory.referenceFactory()).to(new GenericType<Ref<ClientRequest>>() {
         }).in(RequestScoped.class);
 
         bindFactory(PropertiesDelegateFactory.class, Singleton.class).to(PropertiesDelegate.class).in(RequestScoped.class);

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

@@ -40,8 +40,10 @@
 
 package org.glassfish.jersey.client;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -55,17 +57,23 @@
 import org.glassfish.jersey.client.internal.LocalizationMessages;
 import org.glassfish.jersey.client.spi.Connector;
 import org.glassfish.jersey.client.spi.ConnectorProvider;
+import org.glassfish.jersey.internal.BootstrapBag;
+import org.glassfish.jersey.internal.BootstrapConfigurator;
+import org.glassfish.jersey.internal.ContextResolverFactory;
+import org.glassfish.jersey.internal.ExceptionMapperFactory;
 import org.glassfish.jersey.internal.ServiceFinder;
-import org.glassfish.jersey.internal.inject.AbstractBinder;
+import org.glassfish.jersey.internal.inject.Bindings;
 import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.internal.inject.Injections;
 import org.glassfish.jersey.internal.inject.ProviderBinder;
 import org.glassfish.jersey.internal.util.collection.LazyValue;
 import org.glassfish.jersey.internal.util.collection.Value;
 import org.glassfish.jersey.internal.util.collection.Values;
+import org.glassfish.jersey.message.internal.MessageBodyFactory;
 import org.glassfish.jersey.model.internal.CommonConfig;
 import org.glassfish.jersey.model.internal.ComponentBag;
 import org.glassfish.jersey.process.internal.ExecutorProviders;
+import org.glassfish.jersey.process.internal.RequestScope;
 
 /**
  * Jersey externalized implementation of client-side JAX-RS {@link javax.ws.rs.core.Configurable
@@ -81,6 +89,21 @@ public class ClientConfig implements Configurable<ClientConfig>, ExtendedConfig
      */
     private State state;
 
+    private static class RuntimeConfigConfigurator implements BootstrapConfigurator {
+
+        private final State runtimeConfig;
+
+        private RuntimeConfigConfigurator(State runtimeConfig) {
+            this.runtimeConfig = runtimeConfig;
+        }
+
+        @Override
+        public void init(InjectionManager injectionManager, BootstrapBag bootstrapBag) {
+            bootstrapBag.setConfiguration(runtimeConfig);
+            injectionManager.register(Bindings.service(runtimeConfig).to(Configuration.class));
+        }
+    }
+
     /**
      * Default encapsulation of the internal configuration state.
      */
@@ -89,36 +112,23 @@ private static class State implements Configurable<State>, ExtendedConfig {
         /**
          * Strategy that returns the same state instance.
          */
-        private static final StateChangeStrategy IDENTITY = new StateChangeStrategy() {
-
-            @Override
-            public State onChange(final State state) {
-                return state;
-            }
-        };
+        private static final StateChangeStrategy IDENTITY = state -> state;
         /**
          * Strategy that returns a copy of the state instance.
          */
-        private static final StateChangeStrategy COPY_ON_CHANGE = new StateChangeStrategy() {
-
-            @Override
-            public State onChange(final State state) {
-                return state.copy();
-            }
-        };
+        private static final StateChangeStrategy COPY_ON_CHANGE = State::copy;
 
         private volatile StateChangeStrategy strategy;
         private final CommonConfig commonConfig;
         private final JerseyClient client;
         private volatile ConnectorProvider connectorProvider;
 
-
         private final LazyValue<ClientRuntime> runtime = Values.lazy((Value<ClientRuntime>) this::initRuntime);
 
         /**
          * Configuration state change strategy.
          */
-        private static interface StateChangeStrategy {
+        private interface StateChangeStrategy {
 
             /**
              * Invoked whenever a mutator method is called in the given configuration
@@ -128,7 +138,7 @@ private static interface StateChangeStrategy {
              * @return state instance that will be mutated and returned from the
              * invoked configuration state mutator method.
              */
-            public State onChange(final State state);
+            State onChange(final State state);
         }
 
         /**
@@ -373,7 +383,7 @@ public ComponentBag getComponentBag() {
          */
         @SuppressWarnings("MethodOnlyUsedFromInnerClass")
         private ClientRuntime initRuntime() {
-            /**
+            /*
              * Ensure that any attempt to add a new provider, feature, binder or modify the connector
              * will cause a copy of the current state.
              */
@@ -382,8 +392,17 @@ private ClientRuntime initRuntime() {
             final State runtimeCfgState = this.copy();
             runtimeCfgState.markAsShared();
 
-            final InjectionManager injectionManager =
-                    Injections.createInjectionManager(new ClientBinder(runtimeCfgState.getProperties()));
+            InjectionManager injectionManager = Injections.createInjectionManager();
+            injectionManager.register(new ClientBinder(runtimeCfgState.getProperties()));
+
+            BootstrapBag bootstrapBag = new BootstrapBag();
+            List<BootstrapConfigurator> bootstrapConfigurators = Arrays.asList(
+                    new RequestScope.RequestScopeConfigurator(),
+                    new RuntimeConfigConfigurator(runtimeCfgState),
+                    new ContextResolverFactory.ContextResolversConfigurator(),
+                    new MessageBodyFactory.MessageBodyWorkersConfigurator(),
+                    new ExceptionMapperFactory.ExceptionMappersConfigurator());
+            bootstrapConfigurators.forEach(configurator -> configurator.init(injectionManager, bootstrapBag));
 
             // AutoDiscoverable.
             if (!CommonProperties.getValue(runtimeCfgState.getProperties(), RuntimeType.CLIENT,
@@ -396,27 +415,21 @@ private ClientRuntime initRuntime() {
             // Configure binders and features.
             runtimeCfgState.configureMetaProviders(injectionManager);
 
-            // Bind configuration.
-            final AbstractBinder configBinder = new AbstractBinder() {
-                @Override
-                protected void configure() {
-                    bind(runtimeCfgState).to(Configuration.class);
-                }
-            };
-            injectionManager.register(configBinder);
-
             // Bind providers.
             ProviderBinder.bindProviders(runtimeCfgState.getComponentBag(), RuntimeType.CLIENT, null, injectionManager);
 
+            injectionManager.completeRegistration();
+
+            bootstrapConfigurators.forEach(configurator -> configurator.postInit(injectionManager, bootstrapBag));
+
             // Bind executors.
             ExecutorProviders.createInjectionBindings(injectionManager);
 
             final ClientConfig configuration = new ClientConfig(runtimeCfgState);
             final Connector connector = connectorProvider.getConnector(client, configuration);
-            final ClientRuntime crt = new ClientRuntime(configuration, connector, injectionManager);
+            final ClientRuntime crt = new ClientRuntime(configuration, connector, injectionManager, bootstrapBag);
 
             client.registerShutdownHook(crt);
-
             return crt;
         }
 

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

@@ -40,7 +40,7 @@
 
 package org.glassfish.jersey.client;
 
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
@@ -52,16 +52,21 @@
 import java.util.logging.Logger;
 
 import javax.ws.rs.ProcessingException;
+import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MultivaluedMap;
 
+import javax.inject.Provider;
+
 import org.glassfish.jersey.client.internal.LocalizationMessages;
 import org.glassfish.jersey.client.spi.AsyncConnectorCallback;
 import org.glassfish.jersey.client.spi.Connector;
+import org.glassfish.jersey.internal.BootstrapBag;
 import org.glassfish.jersey.internal.Version;
 import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.internal.inject.Providers;
 import org.glassfish.jersey.internal.util.collection.LazyValue;
+import org.glassfish.jersey.internal.util.collection.Ref;
 import org.glassfish.jersey.internal.util.collection.Value;
 import org.glassfish.jersey.internal.util.collection.Values;
 import org.glassfish.jersey.message.MessageBodyWorkers;
@@ -98,13 +103,19 @@ class ClientRuntime implements JerseyClient.ShutdownHook, ClientExecutor {
     /**
      * Create new client request processing runtime.
      *
-     * @param config    client runtime configuration.
-     * @param connector client transport connector.
-     * @param injectionManager   injection manager.
+     * @param config           client runtime configuration.
+     * @param connector        client transport connector.
+     * @param injectionManager injection manager.
      */
-    public ClientRuntime(final ClientConfig config, final Connector connector, final InjectionManager injectionManager) {
-        Stage.Builder<ClientRequest> requestingChainBuilder = Stages
-                .chain(injectionManager.createAndInitialize(RequestProcessingInitializationStage.class));
+    public ClientRuntime(final ClientConfig config, final Connector connector, final InjectionManager injectionManager,
+            final BootstrapBag bootstrapBag) {
+        Provider<Ref<ClientRequest>> clientRequest =
+                injectionManager.getInstance(new GenericType<Provider<Ref<ClientRequest>>>() {}.getType());
+
+        RequestProcessingInitializationStage requestProcessingInitializationStage =
+                new RequestProcessingInitializationStage(clientRequest, bootstrapBag.getMessageBodyWorkers(), injectionManager);
+
+        Stage.Builder<ClientRequest> requestingChainBuilder = Stages.chain(requestProcessingInitializationStage);
 
         ChainableStage<ClientRequest> requestFilteringStage = ClientFilteringStages.createRequestFilteringStage(injectionManager);
         this.requestProcessingRoot = requestFilteringStage != null
@@ -116,12 +127,9 @@ public ClientRuntime(final ClientConfig config, final Connector connector, final
 
         this.config = config;
         this.connector = connector;
-
-        this.requestScope = injectionManager.getInstance(RequestScope.class);
-
-        this.asyncRequestExecutor = Values.lazy((Value<ExecutorService>) ()
-                -> injectionManager.getInstance(ExecutorService.class, ClientAsyncExecutorLiteral.INSTANCE));
-
+        this.requestScope = bootstrapBag.getRequestScope();
+        this.asyncRequestExecutor = Values.lazy((Value<ExecutorService>)
+                () -> injectionManager.getInstance(ExecutorService.class, ClientAsyncExecutorLiteral.INSTANCE));
         this.backgroundScheduler = Values.lazy((Value<ScheduledExecutorService>) ()
                 -> injectionManager.getInstance(ScheduledExecutorService.class, ClientBackgroundSchedulerLiteral.INSTANCE));
 
@@ -146,44 +154,35 @@ public ClientRuntime(final ClientConfig config, final Connector connector, final
      * @return {@code Runnable} to be submitted for async processing using {@link #submit(Runnable)}.
      */
     Runnable createRunnableForAsyncProcessing(ClientRequest request, final ResponseCallback callback) {
-        return () -> {
-            requestScope.runInScope(() -> {
+        return () -> requestScope.runInScope(() -> {
+            try {
+                ClientRequest processedRequest;
                 try {
-                    ClientRequest processedRequest;
-                    try {
-                        processedRequest = Stages.process(request, requestProcessingRoot);
-                        processedRequest = addUserAgent(processedRequest, connector.getName());
-                    } catch (final AbortException aborted) {
-                        processResponse(aborted.getAbortResponse(), callback);
-                        return;
+                    processedRequest = Stages.process(request, requestProcessingRoot);
+                    processedRequest = addUserAgent(processedRequest, connector.getName());
+                } catch (final AbortException aborted) {
+                    processResponse(aborted.getAbortResponse(), callback);
+                    return;
+                }
+
+                final AsyncConnectorCallback connectorCallback = new AsyncConnectorCallback() {
+
+                    @Override
+                    public void response(final ClientResponse response) {
+                        requestScope.runInScope(() -> processResponse(response, callback));
                     }
 
-                    final AsyncConnectorCallback connectorCallback = new AsyncConnectorCallback() {
-
-                        @Override
-                        public void response(final ClientResponse response) {
-                            requestScope.runInScope(new Runnable() {
-                                public void run() {
-                                    processResponse(response, callback);
-                                }
-                            });
-                        }
-
-                        @Override
-                        public void failure(final Throwable failure) {
-                            requestScope.runInScope(new Runnable() {
-                                public void run() {
-                                    processFailure(failure, callback);
-                                }
-                            });
-                        }
-                    };
-                    connector.apply(processedRequest, connectorCallback);
-                } catch (final Throwable throwable) {
-                    processFailure(throwable, callback);
-                }
-            });
-        };
+                    @Override
+                    public void failure(final Throwable failure) {
+                        requestScope.runInScope(() -> processFailure(failure, callback));
+                    }
+                };
+
+                connector.apply(processedRequest, connectorCallback);
+            } catch (final Throwable throwable) {
+                processFailure(throwable, callback);
+            }
+        });
     }
 
     @Override
@@ -228,12 +227,7 @@ private void processFailure(final Throwable failure, final ResponseCallback call
     }
 
     private Future<?> submit(final ExecutorService executor, final Runnable task) {
-        return executor.submit(new Runnable() {
-            @Override
-            public void run() {
-                requestScope.runInScope(task);
-            }
-        });
+        return executor.submit(() -> requestScope.runInScope(task));
     }
 
     private ClientRequest addUserAgent(final ClientRequest clientRequest, final String connectorName) {
@@ -247,10 +241,10 @@ private ClientRequest addUserAgent(final ClientRequest clientRequest, final Stri
         } else if (!clientRequest.ignoreUserAgent()) {
             if (connectorName != null && !connectorName.isEmpty()) {
                 headers.put(HttpHeaders.USER_AGENT,
-                        Arrays.asList(String.format("Jersey/%s (%s)", Version.getVersion(), connectorName)));
+                        Collections.singletonList(String.format("Jersey/%s (%s)", Version.getVersion(), connectorName)));
             } else {
                 headers.put(HttpHeaders.USER_AGENT,
-                        Arrays.asList(String.format("Jersey/%s", Version.getVersion())));
+                        Collections.singletonList(String.format("Jersey/%s", Version.getVersion())));
             }
         }