Removing the need to fetch ContainerRequest from InjectionManager for every injection point in Resource Method Injection in one request.

- Changing ValueSupplierProvider#get() to #apply(ContainerRequest)
- Renaming ValueSupplierProvider to ValueParamProvider
- InjectionResolvers accepts Provider<ContainerRequest>

Change-Id: I83bb9a312594f619f78cd29b5010243f09872175

Author: Petr Bouda

core-server/src/main/java/org/glassfish/jersey/server/ApplicationHandler.java

@@ -103,7 +103,7 @@
 import org.glassfish.jersey.server.internal.ProcessingProviders;
 import org.glassfish.jersey.server.internal.inject.ParamConverterConfigurator;
 import org.glassfish.jersey.server.internal.inject.ParamExtractorConfigurator;
-import org.glassfish.jersey.server.internal.inject.ValueSupplierProviderConfigurator;
+import org.glassfish.jersey.server.internal.inject.ValueParamProviderConfigurator;
 import org.glassfish.jersey.server.internal.monitoring.ApplicationEventImpl;
 import org.glassfish.jersey.server.internal.monitoring.CompositeApplicationEventListener;
 import org.glassfish.jersey.server.internal.monitoring.MonitoringContainerListener;
@@ -295,7 +295,7 @@ private void initialize(ApplicationConfigurator applicationConfigurator, Injecti
                 new RequestScope.RequestScopeConfigurator(),
                 new ParamConverterConfigurator(),
                 new ParamExtractorConfigurator(),
-                new ValueSupplierProviderConfigurator(),
+                new ValueParamProviderConfigurator(),
                 new JerseyResourceContextConfigurator(),
                 new ComponentProviderConfigurator(),
                 new JaxrsProviders.ProvidersConfigurator(),
@@ -384,7 +384,7 @@ private ServerRuntime initialize(InjectionManager injectionManager, List<Bootstr
 
             if (!disableValidation()) {
                 ComponentModelValidator validator = new ComponentModelValidator(
-                        bootstrapBag.getValueSupplierProviders(), bootstrapBag.getMessageBodyWorkers());
+                        bootstrapBag.getValueParamProviders(), bootstrapBag.getMessageBodyWorkers());
                     validator.validate(bootstrapBag.getResourceModel());
             }
 
@@ -413,7 +413,7 @@ private ServerRuntime initialize(InjectionManager injectionManager, List<Bootstr
                     .resourceContext(bootstrapBag.getResourceContext())
                     .configuration(runtimeConfig)
                     .entityProviders(msgBodyWorkers)
-                    .valueSupplierProviders(bootstrapBag.getValueSupplierProviders())
+                    .valueSupplierProviders(bootstrapBag.getValueParamProviders())
                     .modelProcessors(Providers.getAllRankedSortedProviders(injectionManager, ModelProcessor.class))
                     .createService(serviceType -> Injections.getOrCreate(injectionManager, serviceType))
                     .processingProviders(processingProviders)

core-server/src/main/java/org/glassfish/jersey/server/ServerBootstrapBag.java

@@ -54,7 +54,7 @@
 import org.glassfish.jersey.server.model.ResourceMethodInvoker;
 import org.glassfish.jersey.server.model.ResourceModel;
 import org.glassfish.jersey.server.spi.ComponentProvider;
-import org.glassfish.jersey.server.spi.internal.ValueSupplierProvider;
+import org.glassfish.jersey.server.spi.internal.ValueParamProvider;
 
 /**
  * {@inheritDoc}
@@ -67,7 +67,7 @@ public class ServerBootstrapBag extends BootstrapBag {
 
     private Application application;
     private ApplicationHandler applicationHandler;
-    private Collection<ValueSupplierProvider> valueSupplierProviders;
+    private Collection<ValueParamProvider> valueParamProviders;
     private MultivaluedParameterExtractorProvider multivaluedParameterExtractorProvider;
     private ProcessingProviders processingProviders;
     private JerseyResourceContext resourceContext;
@@ -134,13 +134,13 @@ public void setMultivaluedParameterExtractorProvider(MultivaluedParameterExtract
         this.multivaluedParameterExtractorProvider = provider;
     }
 
-    public Collection<ValueSupplierProvider> getValueSupplierProviders() {
-        requireNonNull(valueSupplierProviders, new GenericType<Collection<ValueSupplierProvider>>() {}.getType());
-        return valueSupplierProviders;
+    public Collection<ValueParamProvider> getValueParamProviders() {
+        requireNonNull(valueParamProviders, new GenericType<Collection<ValueParamProvider>>() {}.getType());
+        return valueParamProviders;
     }
 
-    public void setValueSupplierProviders(Collection<ValueSupplierProvider> valueSupplierProviders) {
-        this.valueSupplierProviders = valueSupplierProviders;
+    public void setValueParamProviders(Collection<ValueParamProvider> valueParamProviders) {
+        this.valueParamProviders = valueParamProviders;
     }
 
     public JerseyResourceContext getResourceContext() {

core-server/src/main/java/org/glassfish/jersey/server/internal/inject/AbstractRequestDerivedValueSupplier.java

@@ -43,41 +43,37 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.function.Supplier;
+import java.util.function.Function;
 
 import javax.inject.Provider;
 
 import org.glassfish.jersey.server.ContainerRequest;
 import org.glassfish.jersey.server.model.Parameter;
-import org.glassfish.jersey.server.spi.internal.ValueSupplierProvider;
+import org.glassfish.jersey.server.spi.internal.ValueParamProvider;
 
 /**
- * A parameter value supplier provider that provides parameter value factories
+ * A parameter value provider that provides parameter value factories
  * which are using {@link MultivaluedParameterExtractorProvider} to extract parameter
  * values from the supplied {@link javax.ws.rs.core.MultivaluedMap multivalued
  * parameter map}.
  *
  * @author Paul Sandoz
  * @author Marek Potociar (marek.potociar at oracle.com)
  */
-public abstract class AbstractValueSupplierProvider implements ValueSupplierProvider {
+public abstract class AbstractValueParamProvider implements ValueParamProvider {
 
     private final Provider<MultivaluedParameterExtractorProvider> mpep;
     private final Set<Parameter.Source> compatibleSources;
-    private final Provider<ContainerRequest> requestProvider;
 
     /**
      * Initialize the provider.
      *
      * @param mpep              multivalued map parameter extractor provider.
-     * @param requestProvider   container request provider.
      * @param compatibleSources compatible parameter sources.
      */
-    protected AbstractValueSupplierProvider(Provider<MultivaluedParameterExtractorProvider> mpep,
-                                            Provider<ContainerRequest> requestProvider,
+    protected AbstractValueParamProvider(Provider<MultivaluedParameterExtractorProvider> mpep,
                                             Parameter.Source... compatibleSources) {
         this.mpep = mpep;
-        this.requestProvider = requestProvider;
         this.compatibleSources = new HashSet<>(Arrays.asList(compatibleSources));
     }
 
@@ -96,32 +92,29 @@ protected final MultivaluedParameterExtractor<?> get(Parameter parameter) {
     }
 
     /**
-     * Create a value supplier for the parameter. May return {@code null} in case
-     * the parameter is not supported by the value supplier provider.
+     * Create a value provider for the parameter. May return {@code null} in case
+     * the parameter is not supported by the value provider.
      *
-     * @param parameter       parameter requesting the value supplier instance.
-     * @param requestProvider container request provider that provides request context specific access to the
-     *                        {@link ContainerRequest} instance.
+     * @param parameter       parameter requesting the value provider instance.
      * @return parameter value supplier. Returns {@code null} if parameter is not supported.
      */
-    protected abstract AbstractRequestDerivedValueSupplier<?> createValueSupplier(
-            Parameter parameter, Provider<ContainerRequest> requestProvider);
+    protected abstract Function<ContainerRequest, ?> createValueProvider(Parameter parameter);
 
     /**
-     * Get an injected value supplier for the parameter. May return {@code null}
-     * in case the parameter is not supported by the value supplier provider.
+     * Get an injected value provider for the parameter. May return {@code null}
+     * in case the parameter is not supported by the value provider.
      *
-     * @param parameter parameter requesting the value supplier instance.
+     * @param parameter parameter requesting the value provider instance.
      * @return injected parameter value supplier. Returns {@code null} if parameter
      * is not supported.
      */
     @Override
-    public final Supplier<?> getValueSupplier(Parameter parameter) {
+    public final Function<ContainerRequest, ?> getValueProvider(Parameter parameter) {
         if (!compatibleSources.contains(parameter.getSource())) {
             // not compatible
             return null;
         }
-        return createValueSupplier(parameter, requestProvider);
+        return createValueProvider(parameter);
     }
 
     @Override

core-server/src/main/java/org/glassfish/jersey/server/internal/inject/AbstractValueSupplierProvider.java renamed to core-server/src/main/java/org/glassfish/jersey/server/internal/inject/AbstractValueParamProvider.java

@@ -40,22 +40,23 @@
 
 package org.glassfish.jersey.server.internal.inject;
 
-import java.util.function.Supplier;
+import java.util.function.Function;
 
 import javax.ws.rs.container.AsyncResponse;
 
 import javax.inject.Provider;
 
+import org.glassfish.jersey.server.ContainerRequest;
 import org.glassfish.jersey.server.internal.process.AsyncContext;
 import org.glassfish.jersey.server.model.Parameter;
-import org.glassfish.jersey.server.spi.internal.ValueSupplierProvider;
+import org.glassfish.jersey.server.spi.internal.ValueParamProvider;
 
 /**
  * Value factory provider supporting the {@link javax.ws.rs.container.Suspended} injection annotation.
  *
  * @author Marek Potociar (marek.potociar at oracle.com)
  */
-final class AsyncResponseValueSupplierProvider implements ValueSupplierProvider {
+final class AsyncResponseValueParamProvider implements ValueParamProvider {
 
     private final Provider<AsyncContext> asyncContextProvider;
 
@@ -64,20 +65,20 @@ final class AsyncResponseValueSupplierProvider implements ValueSupplierProvider
      *
      * @param asyncContextProvider async processing context provider.
      */
-    public AsyncResponseValueSupplierProvider(Provider<AsyncContext> asyncContextProvider) {
+    public AsyncResponseValueParamProvider(Provider<AsyncContext> asyncContextProvider) {
         this.asyncContextProvider = asyncContextProvider;
     }
 
     @Override
-    public Supplier<AsyncResponse> getValueSupplier(final Parameter parameter) {
+    public Function<ContainerRequest, AsyncResponse> getValueProvider(final Parameter parameter) {
         if (parameter.getSource() != Parameter.Source.SUSPENDED) {
             return null;
         }
         if (!AsyncResponse.class.isAssignableFrom(parameter.getRawType())) {
             return null;
         }
 
-        return asyncContextProvider::get;
+        return containerRequest -> asyncContextProvider.get();
     }
 
     @Override

core-server/src/main/java/org/glassfish/jersey/server/internal/inject/AsyncResponseValueSupplierProvider.java renamed to core-server/src/main/java/org/glassfish/jersey/server/internal/inject/AsyncResponseValueParamProvider.java

@@ -61,11 +61,11 @@
  * @author Miroslav Fuksa
  */
 @Singleton
-final class BeanParamValueSupplierProvider extends AbstractValueSupplierProvider {
+final class BeanParamValueParamProvider extends AbstractValueParamProvider {
 
     private final InjectionManager injectionManager;
 
-    private static final class BeanParamValueSupplier extends AbstractRequestDerivedValueSupplier<Object> {
+    private static final class BeanParamValueProvider implements Function<ContainerRequest, Object> {
         private final Parameter parameter;
         private final InjectionManager injectionManager;
 
@@ -81,16 +81,13 @@ public ForeignDescriptor apply(Class<?> key) {
                     }
                 });
 
-        private BeanParamValueSupplier(InjectionManager injectionManager, Parameter parameter,
-                Provider<ContainerRequest> requestProvider) {
-            super(requestProvider);
-
+        private BeanParamValueProvider(InjectionManager injectionManager, Parameter parameter) {
             this.injectionManager = injectionManager;
             this.parameter = parameter;
         }
 
         @Override
-        public Object get() {
+        public Object apply(ContainerRequest request) {
             Class<?> rawType = parameter.getRawType();
             Object fromHk2 = injectionManager.getInstance(rawType);
             if (fromHk2 != null) { // the bean parameter type is already bound in HK2, let's just take it from there
@@ -105,19 +102,15 @@ public Object get() {
      * Creates new instance initialized from parameters injected by HK2.
      *
      * @param mpep            multivalued parameter extractor provider.
-     * @param requestProvider request provider.
      */
-    public BeanParamValueSupplierProvider(Provider<MultivaluedParameterExtractorProvider> mpep,
-            Provider<ContainerRequest> requestProvider, InjectionManager injectionManager) {
-        super(mpep, requestProvider, Parameter.Source.BEAN_PARAM);
+    public BeanParamValueParamProvider(Provider<MultivaluedParameterExtractorProvider> mpep,
+            InjectionManager injectionManager) {
+        super(mpep, Parameter.Source.BEAN_PARAM);
         this.injectionManager = injectionManager;
     }
 
     @Override
-    public AbstractRequestDerivedValueSupplier<?> createValueSupplier(
-            Parameter parameter,
-            Provider<ContainerRequest> requestProvider) {
-
-        return new BeanParamValueSupplier(injectionManager, parameter, requestProvider);
+    public Function<ContainerRequest, ?> createValueProvider(Parameter parameter) {
+        return new BeanParamValueProvider(injectionManager, parameter);
     }
 }