Replacing HK2 Factory interface by Supplier and DisposableSupplier.

Change-Id: I7103e19a1d7a30debb2f843c2a8a6d986a76d7e7

Author: Petr Bouda

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

@@ -57,6 +57,7 @@
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -72,7 +73,6 @@
 import org.glassfish.jersey.internal.inject.ClassBinding;
 import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.internal.inject.InstanceBinding;
-import org.glassfish.jersey.internal.inject.SupplierFactory;
 import org.glassfish.jersey.server.ApplicationHandler;
 import org.glassfish.jersey.server.model.Invocable;
 import org.glassfish.jersey.server.spi.ComponentProvider;
@@ -110,15 +110,15 @@ public final class EjbComponentProvider implements ComponentProvider, ResourceMe
     /**
      * HK2 factory to provide EJB components obtained via JNDI lookup.
      */
-    private static class EjbFactory<T> extends SupplierFactory<T> {
+    private static class EjbFactory<T> implements Supplier<T> {
 
         final InitialContext ctx;
         final Class<T> clazz;
         final EjbComponentProvider ejbProvider;
 
         @SuppressWarnings("unchecked")
         @Override
-        public T provide() {
+        public T get() {
             try {
                 return (T) lookup(ctx, clazz, clazz.getSimpleName(), ejbProvider);
             } catch (NamingException ex) {
@@ -282,7 +282,7 @@ public boolean bind(Class<?> component, Set<Class<?>> providerContracts) {
             registerEjbInterceptor();
         }
 
-        Binding binding = Bindings.factory(new EjbFactory(component, initialContext, EjbComponentProvider.this))
+        Binding binding = Bindings.supplier(new EjbFactory(component, initialContext, EjbComponentProvider.this))
                 .to(component)
                 .to(providerContracts);
         injectionManager.register(binding);

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

@@ -82,7 +82,6 @@
 import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.internal.inject.Providers;
 import org.glassfish.jersey.internal.inject.ReferencingFactory;
-import org.glassfish.jersey.internal.inject.SupplierFactory;
 import org.glassfish.jersey.internal.util.ReflectionHelper;
 import org.glassfish.jersey.internal.util.collection.Ref;
 import org.glassfish.jersey.internal.util.collection.Value;
@@ -168,13 +167,7 @@ private AsyncContextDelegateProvider getAsyncExtensionDelegate() {
             return providers.next();
         }
 
-        return new AsyncContextDelegateProvider() {
-
-            @Override
-            public AsyncContextDelegate createDelegate(final HttpServletRequest request, final HttpServletResponse response) {
-                return DEFAULT_ASYNC_DELEGATE;
-            }
-        };
+        return (request, response) -> DEFAULT_ASYNC_DELEGATE;
     }
 
     @SuppressWarnings("JavaDoc")
@@ -219,32 +212,21 @@ protected void configure() {
                 bindFactory(HttpServletRequestReferencingFactory.class).to(HttpServletRequest.class)
                         .proxy(true).proxyForSameScope(false).in(RequestScoped.class);
 
-                bindFactory(ReferencingFactory.<HttpServletRequest>referenceFactory())
+                bindFactory(ReferencingFactory.referenceFactory())
                         .to(new GenericType<Ref<HttpServletRequest>>() {}).in(RequestScoped.class);
 
                 // response
                 bindFactory(HttpServletResponseReferencingFactory.class).to(HttpServletResponse.class)
                         .proxy(true).proxyForSameScope(false).in(RequestScoped.class);
-                bindFactory(ReferencingFactory.<HttpServletResponse>referenceFactory())
+                bindFactory(ReferencingFactory.referenceFactory())
                         .to(new GenericType<Ref<HttpServletResponse>>() {}).in(RequestScoped.class);
             }
 
-            bindFactory(new SupplierFactory<ServletContext>() {
-                @Override
-                public ServletContext provide() {
-                    return webConfig.getServletContext();
-                }
-            }).to(ServletContext.class).in(Singleton.class);
+            bindFactory(webConfig::getServletContext).to(ServletContext.class).in(Singleton.class);
 
             final ServletConfig servletConfig = webConfig.getServletConfig();
             if (webConfig.getConfigType() == WebConfig.ConfigType.ServletConfig) {
-                bindFactory(new SupplierFactory<ServletConfig>() {
-                    @Override
-                    public ServletConfig provide() {
-                        return servletConfig;
-                    }
-
-                }).to(ServletConfig.class).in(Singleton.class);
+                bindFactory(() -> servletConfig).to(ServletConfig.class).in(Singleton.class);
 
                 // @PersistenceUnit
                 final Enumeration initParams = servletConfig.getInitParameterNames();
@@ -257,22 +239,10 @@ public ServletConfig provide() {
                     }
                 }
             } else {
-                bindFactory(new SupplierFactory<FilterConfig>() {
-                    @Override
-                    public FilterConfig provide() {
-                        return webConfig.getFilterConfig();
-                    }
-
-                }).to(FilterConfig.class).in(Singleton.class);
+                bindFactory(webConfig::getFilterConfig).to(FilterConfig.class).in(Singleton.class);
             }
 
-            bindFactory(new SupplierFactory<WebConfig>() {
-                @Override
-                public WebConfig provide() {
-                    return webConfig;
-                }
-
-            }).to(WebConfig.class).in(Singleton.class);
+            bindFactory(() -> webConfig).to(WebConfig.class).in(Singleton.class);
 
             install(new ServiceFinderBinder<>(AsyncContextDelegateProvider.class, applicationProperties, RuntimeType.SERVER));
             install(new ServiceFinderBinder<>(FilterUrlMappingsProvider.class, applicationProperties, RuntimeType.SERVER));

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

@@ -41,6 +41,7 @@
 package org.glassfish.jersey.client;
 
 import java.util.Map;
+import java.util.function.Supplier;
 
 import javax.ws.rs.RuntimeType;
 import javax.ws.rs.client.Client;
@@ -58,7 +59,6 @@
 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.inject.SupplierFactory;
 import org.glassfish.jersey.internal.spi.AutoDiscoverable;
 import org.glassfish.jersey.internal.util.collection.Ref;
 import org.glassfish.jersey.message.internal.MessageBodyFactory;
@@ -86,7 +86,7 @@ public RequestContextInjectionFactory(Provider<Ref<ClientRequest>> referenceFact
         }
     }
 
-    private static class PropertiesDelegateFactory extends SupplierFactory<PropertiesDelegate> {
+    private static class PropertiesDelegateFactory implements Supplier<PropertiesDelegate> {
 
         private final Provider<ClientRequest> requestProvider;
 
@@ -96,7 +96,7 @@ private PropertiesDelegateFactory(Provider<ClientRequest> requestProvider) {
         }
 
         @Override
-        public PropertiesDelegate provide() {
+        public PropertiesDelegate get() {
             return requestProvider.get().getPropertiesDelegate();
         }
     }
@@ -119,7 +119,7 @@ protected void configure() {
                 new MessageBodyFactory.Binder(),
                 new ContextResolverFactory.Binder(),
                 new JaxrsProviders.Binder(),
-                new ServiceFinderBinder<AutoDiscoverable>(AutoDiscoverable.class, clientRuntimeProperties, RuntimeType.CLIENT));
+                new ServiceFinderBinder<>(AutoDiscoverable.class, clientRuntimeProperties, RuntimeType.CLIENT));
 
         bindFactory(ReferencingFactory.<ClientConfig>referenceFactory()).to(new GenericType<Ref<ClientConfig>>() {
         }).in(RequestScoped.class);

core-common/src/main/java/org/glassfish/jersey/hk2/ContextInjectionResolverImpl.java

@@ -56,7 +56,6 @@
 import org.glassfish.jersey.internal.inject.AbstractBinder;
 import org.glassfish.jersey.internal.inject.ContextInjectionResolver;
 import org.glassfish.jersey.internal.inject.ForeignRequestScopeBridge;
-import org.glassfish.jersey.internal.inject.SupplierFactory;
 import org.glassfish.jersey.internal.util.ReflectionHelper;
 import org.glassfish.jersey.internal.util.collection.Cache;
 import org.glassfish.jersey.internal.util.collection.LazyValue;
@@ -162,11 +161,15 @@ public Class<?> getInjecteeClass() {
     }
 
     private Factory asFactory(final ServiceHandle handle) {
-        return new SupplierFactory() {
+        return new Factory() {
             @Override
             public Object provide() {
                 return handle.getService();
             }
+
+            @Override
+            public void dispose(final Object instance) {
+            }
         };
     }