Rename Instance Manager to Injection Manager, Descriptors to Bindings.

Change-Id: I1595fed034161d1ce28166688b7737d2d16d6050

Author: Petr Bouda

containers/glassfish/jersey-gf-ejb/src/main/java/org/glassfish/jersey/gf/ejb/internal/EjbComponentInterceptor.java

@@ -43,7 +43,7 @@
 import javax.interceptor.InvocationContext;
 
 import org.glassfish.jersey.ext.cdi1x.internal.CdiComponentProvider;
-import org.glassfish.jersey.spi.inject.InstanceManager;
+import org.glassfish.jersey.spi.inject.InjectionManager;
 
 /**
  * EJB interceptor to inject Jersey specific stuff into EJB beans.
@@ -52,22 +52,22 @@
  */
 public final class EjbComponentInterceptor {
 
-    private final InstanceManager instanceManager;
+    private final InjectionManager injectionManager;
 
     /**
-     * Create new EJB component instance manager.
+     * Create new EJB component injection manager.
      *
-     * @param instanceManager instance manager.
+     * @param injectionManager injection manager.
      */
-    public EjbComponentInterceptor(final InstanceManager instanceManager) {
-        this.instanceManager = instanceManager;
+    public EjbComponentInterceptor(final InjectionManager injectionManager) {
+        this.injectionManager = injectionManager;
     }
 
     @PostConstruct
     private void inject(final InvocationContext context) throws Exception {
 
         final Object beanInstance = context.getTarget();
-        instanceManager.inject(beanInstance, CdiComponentProvider.CDI_CLASS_ANALYZER);
+        injectionManager.inject(beanInstance, CdiComponentProvider.CDI_CLASS_ANALYZER);
 
         // Invoke next interceptor in chain
         context.proceed();

containers/glassfish/jersey-gf-ejb/src/main/java/org/glassfish/jersey/gf/ejb/internal/EjbComponentProvider.java

@@ -72,11 +72,11 @@
 import org.glassfish.jersey.server.model.Invocable;
 import org.glassfish.jersey.server.spi.ComponentProvider;
 import org.glassfish.jersey.server.spi.internal.ResourceMethodInvocationHandlerProvider;
-import org.glassfish.jersey.spi.inject.ClassBeanDescriptor;
-import org.glassfish.jersey.spi.inject.Descriptor;
-import org.glassfish.jersey.spi.inject.Descriptors;
-import org.glassfish.jersey.spi.inject.InstanceBeanDescriptor;
-import org.glassfish.jersey.spi.inject.InstanceManager;
+import org.glassfish.jersey.spi.inject.Binding;
+import org.glassfish.jersey.spi.inject.Bindings;
+import org.glassfish.jersey.spi.inject.ClassBinding;
+import org.glassfish.jersey.spi.inject.InjectionManager;
+import org.glassfish.jersey.spi.inject.InstanceBinding;
 
 import org.glassfish.ejb.deployment.descriptor.EjbBundleDescriptorImpl;
 import org.glassfish.ejb.deployment.descriptor.EjbDescriptor;
@@ -143,16 +143,16 @@ public EjbFactory(Class<T> rawType, InitialContext ctx, EjbComponentProvider ejb
         add("javax.ejb.Singleton");
     }});
 
-    private InstanceManager instanceManager = null;
+    private InjectionManager injectionManager = null;
 
     // ComponentProvider
     @Override
-    public void initialize(final InstanceManager instanceManager) {
-        this.instanceManager = instanceManager;
+    public void initialize(final InjectionManager injectionManager) {
+        this.injectionManager = injectionManager;
 
-        InstanceBeanDescriptor<EjbComponentProvider> descriptor = Descriptors.service(EjbComponentProvider.this)
+        InstanceBinding<EjbComponentProvider> descriptor = Bindings.service(EjbComponentProvider.this)
                 .to(ResourceMethodInvocationHandlerProvider.class);
-        this.instanceManager.register(descriptor);
+        this.injectionManager.register(descriptor);
     }
 
     private ApplicationInfo getApplicationInfo(EjbContainerUtil ejbUtil) throws NamingException {
@@ -190,7 +190,7 @@ private ApplicationInfo getApplicationInfo(EjbContainerUtil ejbUtil) throws Nami
 
     private void registerEjbInterceptor() {
         try {
-            final Object interceptor = new EjbComponentInterceptor(instanceManager);
+            final Object interceptor = new EjbComponentInterceptor(injectionManager);
             initialContext = getInitialContext();
             final EjbContainerUtil ejbUtil = EjbContainerUtilImpl.getInstance();
             final ApplicationInfo appInfo = getApplicationInfo(ejbUtil);
@@ -270,7 +270,7 @@ public boolean bind(Class<?> component, Set<Class<?>> providerContracts) {
             LOGGER.fine(LocalizationMessages.EJB_CLASS_BEING_CHECKED(component));
         }
 
-        if (instanceManager == null) {
+        if (injectionManager == null) {
             throw new IllegalStateException(LocalizationMessages.EJB_COMPONENT_PROVIDER_NOT_INITIALIZED_PROPERLY());
         }
 
@@ -282,10 +282,10 @@ public boolean bind(Class<?> component, Set<Class<?>> providerContracts) {
             registerEjbInterceptor();
         }
 
-        Descriptor descriptor = Descriptors.factory(new EjbFactory(component, initialContext, EjbComponentProvider.this))
+        Binding binding = Bindings.factory(new EjbFactory(component, initialContext, EjbComponentProvider.this))
                 .to(component)
                 .to(providerContracts);
-        instanceManager.register(descriptor);
+        injectionManager.register(binding);
 
         if (LOGGER.isLoggable(Level.CONFIG)) {
             LOGGER.config(LocalizationMessages.EJB_CLASS_BOUND_WITH_CDI(component));
@@ -300,11 +300,11 @@ public void done() {
     }
 
     private void registerEjbExceptionMapper() {
-        ClassBeanDescriptor<EjbExceptionMapper> descriptor =
-                Descriptors.serviceAsContract(EjbExceptionMapper.class)
+        ClassBinding<EjbExceptionMapper> descriptor =
+                Bindings.serviceAsContract(EjbExceptionMapper.class)
                     .in(Singleton.class);
 
-        instanceManager.register(descriptor);
+        injectionManager.register(descriptor);
     }
 
     private boolean isEjbComponent(Class<?> component) {

containers/grizzly2-http/src/main/java/org/glassfish/jersey/grizzly2/httpserver/GrizzlyHttpContainer.java

@@ -342,7 +342,7 @@ private void rethrow(final Throwable error) {
      * Create a new Grizzly HTTP container.
      *
      * @param application   JAX-RS / Jersey application to be deployed on Grizzly HTTP container.
-     * @param parentLocator parent instance manager.
+     * @param parentLocator parent injection manager.
      */
     /* package */ GrizzlyHttpContainer(final Application application, final ServiceLocator parentLocator) {
         this.appHandler = new ApplicationHandler(application, new GrizzlyBinder(), parentLocator);
@@ -372,9 +372,9 @@ public void service(final Request request, final Response response) {
             }
             requestContext.setWriter(responseWriter);
 
-            requestContext.setRequestScopedInitializer(instanceManager -> {
-                instanceManager.<Ref<Request>>getInstance(RequestTYPE).set(request);
-                instanceManager.<Ref<Response>>getInstance(ResponseTYPE).set(response);
+            requestContext.setRequestScopedInitializer(injectionManager -> {
+                injectionManager.<Ref<Request>>getInstance(RequestTYPE).set(request);
+                injectionManager.<Ref<Response>>getInstance(ResponseTYPE).set(response);
             });
             appHandler.handle(requestContext);
         } finally {

containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/ServletContainer.java

@@ -645,7 +645,7 @@ private String pickUrlMapping(final String requestUri, final List<String> filter
     private FilterUrlMappingsProvider getFilterUrlMappingsProvider() {
         FilterUrlMappingsProvider filterUrlMappingsProvider = null;
         final Iterator<FilterUrlMappingsProvider> providers = Providers.getAllProviders(
-                getApplicationHandler().getInstanceManager(), FilterUrlMappingsProvider.class).iterator();
+                getApplicationHandler().getInjectionManager(), FilterUrlMappingsProvider.class).iterator();
         if (providers.hasNext()) {
              filterUrlMappingsProvider = providers.next();
         }

containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebComponent.java

@@ -109,7 +109,7 @@
 import org.glassfish.jersey.servlet.spi.AsyncContextDelegateProvider;
 import org.glassfish.jersey.servlet.spi.FilterUrlMappingsProvider;
 import org.glassfish.jersey.spi.inject.AbstractBinder;
-import org.glassfish.jersey.spi.inject.InstanceManager;
+import org.glassfish.jersey.spi.inject.InjectionManager;
 import org.glassfish.jersey.uri.UriComponent;
 
 import org.glassfish.hk2.api.ServiceLocator;
@@ -147,20 +147,20 @@ public void complete() {
     private final boolean requestResponseBindingExternalized;
 
     private static final RequestScopedInitializerProvider DEFAULT_REQUEST_SCOPE_INITIALIZER_PROVIDER =
-            context -> (RequestScopedInitializer) instanceManager -> {
-                instanceManager.<Ref<HttpServletRequest>>getInstance(REQUEST_TYPE).set(context.getHttpServletRequest());
-                instanceManager.<Ref<HttpServletResponse>>getInstance(RESPONSE_TYPE).set(context.getHttpServletResponse());
+            context -> (RequestScopedInitializer) injectionManager -> {
+                injectionManager.<Ref<HttpServletRequest>>getInstance(REQUEST_TYPE).set(context.getHttpServletRequest());
+                injectionManager.<Ref<HttpServletResponse>>getInstance(RESPONSE_TYPE).set(context.getHttpServletResponse());
             };
 
     /**
      * Return the first found {@link AsyncContextDelegateProvider}
-     * (via {@link Providers#getAllProviders(InstanceManager, Class)}) or {@code #DEFAULT_ASYNC_DELEGATE} if
+     * (via {@link Providers#getAllProviders(InjectionManager, Class)}) or {@code #DEFAULT_ASYNC_DELEGATE} if
      * other delegate cannot be found.
      *
      * @return a non-null AsyncContextDelegateProvider.
      */
     private AsyncContextDelegateProvider getAsyncExtensionDelegate() {
-        final Iterator<AsyncContextDelegateProvider> providers = Providers.getAllProviders(appHandler.getInstanceManager(),
+        final Iterator<AsyncContextDelegateProvider> providers = Providers.getAllProviders(appHandler.getInjectionManager(),
                 AsyncContextDelegateProvider.class).iterator();
         if (providers.hasNext()) {
             return providers.next();
@@ -372,7 +372,7 @@ public WebComponent(final WebConfig webConfig, ResourceConfig resourceConfig) th
         this.queryParamsAsFormParams = !resourceConfig.isProperty(ServletProperties.QUERY_PARAMS_AS_FORM_PARAMS_DISABLED);
         this.configSetStatusOverSendError = ServerProperties.getValue(resourceConfig.getProperties(),
                 ServerProperties.RESPONSE_SET_STATUS_OVER_SEND_ERROR, false, Boolean.class);
-        this.backgroundTaskScheduler = appHandler.getInstanceManager()
+        this.backgroundTaskScheduler = appHandler.getInjectionManager()
                 .getInstance(ScheduledExecutorService.class, BackgroundSchedulerLiteral.INSTANCE);
     }
 

containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/PersistenceUnitBinder.java

@@ -55,7 +55,7 @@
 
 import org.glassfish.jersey.server.ContainerException;
 import org.glassfish.jersey.spi.inject.AbstractBinder;
-import org.glassfish.jersey.spi.inject.InstanceManager;
+import org.glassfish.jersey.spi.inject.InjectionManager;
 
 import org.glassfish.hk2.api.Injectee;
 import org.glassfish.hk2.api.InjectionResolver;
@@ -79,9 +79,9 @@ private static class PersistenceUnitInjectionResolver implements InjectionResolv
         private final Map<String, String> persistenceUnits = new HashMap<>();
 
         @Inject
-        private PersistenceUnitInjectionResolver(final InstanceManager instanceManager) {
+        private PersistenceUnitInjectionResolver(final InjectionManager injectionManager) {
             // Look for persistence units.
-            final ServletConfig servletConfig = instanceManager.getInstance(ServletConfig.class);
+            final ServletConfig servletConfig = injectionManager.getInstance(ServletConfig.class);
 
             for (final Enumeration parameterNames = servletConfig.getInitParameterNames(); parameterNames.hasMoreElements(); ) {
                 final String key = (String) parameterNames.nextElement();

containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/spi/ExtendedServletContainerProvider.java

@@ -48,7 +48,7 @@
 /**
  * Implementations could provide their own {@link HttpServletRequest} and {@link HttpServletResponse}
  * binding implementation in HK2 locator and also an implementation of {@link RequestScopedInitializer}
- * that is used to set actual request/response references in instance manager within each request.
+ * that is used to set actual request/response references in injection manager within each request.
  *
  * @author Jakub Podlesak (jakub.podlesak at oracle.com)
  * @since 2.21
@@ -61,15 +61,15 @@ public interface ExtendedServletContainerProvider extends ServletContainerProvid
      *
      * The provider returned will be used at runtime for every and each incoming request
      * so that the actual request/response instances could be made accessible
-     * from Jersey instance manager.
+     * from Jersey injection manager.
      *
      * @return request scoped initializer provider.
      */
     public RequestScopedInitializerProvider getRequestScopedInitializerProvider();
 
     /**
      * Used by Jersey runtime to tell if the extension covers HTTP Servlet request response
-     * handling with respect to underlying instance manager.
+     * handling with respect to underlying injection manager.
      *
      * Return {@code true}, if your implementation configures HK2 bindings
      * for {@link HttpServletRequest} and {@link HttpServletResponse}

containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/spi/RequestScopedInitializerProvider.java

@@ -51,7 +51,7 @@ public interface RequestScopedInitializerProvider {
 
     /**
      * Give me a request scope initializer that could be utilized
-     * to set the actual Servlet request data in instance manager.
+     * to set the actual Servlet request data in injection manager.
      *
      * @param context of the actual request.
      * @return initializer to be invoked at the start of request processing.

containers/jetty-http/src/main/java/org/glassfish/jersey/jetty/JettyHttpContainer.java

@@ -182,9 +182,9 @@ public void handle(final String target, final Request request, final HttpServlet
                 requestContext.headers(headerName, headerValue == null ? "" : headerValue);
             }
             requestContext.setWriter(responseWriter);
-            requestContext.setRequestScopedInitializer(instanceManager -> {
-                instanceManager.<Ref<Request>>getInstance(REQUEST_TYPE).set(request);
-                instanceManager.<Ref<Response>>getInstance(RESPONSE_TYPE).set(response);
+            requestContext.setRequestScopedInitializer(injectionManager -> {
+                injectionManager.<Ref<Request>>getInstance(REQUEST_TYPE).set(request);
+                injectionManager.<Ref<Response>>getInstance(RESPONSE_TYPE).set(response);
             });
 
             // Mark the request as handled before generating the body of the response
@@ -456,7 +456,7 @@ public void doStop() throws Exception {
      * Create a new Jetty HTTP container.
      *
      * @param application JAX-RS / Jersey application to be deployed on Jetty HTTP container.
-     * @param parentLocator parent instance manager.
+     * @param parentLocator parent injection manager.
      */
     JettyHttpContainer(final Application application, final ServiceLocator parentLocator) {
         this.appHandler = new ApplicationHandler(application, new JettyBinder(), parentLocator);

containers/netty-http/src/main/java/org/glassfish/jersey/netty/httpserver/NettyHttpContainer.java

@@ -95,7 +95,7 @@ public void reload(ResourceConfig configuration) {
      * @return Executor service associated with this container.
      */
     ExecutorService getExecutorService() {
-        return appHandler.getInstanceManager().getInstance(ExecutorServiceProvider.class).getExecutorService();
+        return appHandler.getInjectionManager().getInstance(ExecutorServiceProvider.class).getExecutorService();
     }
 
     /**
@@ -104,6 +104,6 @@ ExecutorService getExecutorService() {
      * @return Scheduled executor service associated with this container.
      */
     ScheduledExecutorService getScheduledExecutorService() {
-        return appHandler.getInstanceManager().getInstance(ScheduledExecutorServiceProvider.class).getExecutorService();
+        return appHandler.getInjectionManager().getInstance(ScheduledExecutorServiceProvider.class).getExecutorService();
     }
 }