Initial commit of CDI SE implementation.

- Registration of internal Jersey components and components registered in Application class
- Supports for getting Suppliers from CdiSeInjectionManager
- Supports injection of JAX-RS/Jersey components (@*Param, @context annotations)
- Creates proxies in Singleton and ApplicationScoped classes during the field injection
- Integration tests prove that CDI interceptors, decorators, events are working
- CDI 2 SE HelloWorld example

Change-Id: I67a491704699cd39ace000d2277bac9c9d7c2020

Author: Petr Bouda

bom/pom.xml

@@ -336,6 +336,11 @@
                 <artifactId>jersey-hk2</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.inject</groupId>
+                <artifactId>jersey-cdi2-se</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.glassfish.jersey.test-framework</groupId>
                 <artifactId>jersey-test-framework-core</artifactId>

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

@@ -72,6 +72,7 @@
 import org.glassfish.jersey.message.MessageBodyWorkers;
 import org.glassfish.jersey.model.internal.ManagedObjectsFinalizer;
 import org.glassfish.jersey.process.internal.ChainableStage;
+import org.glassfish.jersey.process.internal.RequestContext;
 import org.glassfish.jersey.process.internal.RequestScope;
 import org.glassfish.jersey.process.internal.Stage;
 import org.glassfish.jersey.process.internal.Stages;
@@ -111,7 +112,7 @@ class ClientRuntime implements JerseyClient.ShutdownHook, ClientExecutor {
     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());
+                () -> injectionManager.getInstance(new GenericType<Ref<ClientRequest>>() {}.getType());
 
         RequestProcessingInitializationStage requestProcessingInitializationStage =
                 new RequestProcessingInitializationStage(clientRequest, bootstrapBag.getMessageBodyWorkers(), injectionManager);
@@ -257,7 +258,7 @@ private ClientRequest addUserAgent(final ClientRequest clientRequest, final Stri
      * <p>
      * NOTE: the method does not explicitly start a new request scope context. Instead
      * it is assumed that the method is invoked from within a context of a proper, running
-     * {@link RequestScope.Instance request scope instance}. A caller may use the
+     * {@link RequestContext request context}. A caller may use the
      * {@link #getRequestScope()} method to retrieve the request scope instance and use it to
      * initialize the proper request scope context prior the method invocation.
      * </p>

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

@@ -57,6 +57,7 @@
 import javax.ws.rs.core.Response;
 
 import org.glassfish.jersey.internal.util.Producer;
+import org.glassfish.jersey.process.internal.RequestContext;
 import org.glassfish.jersey.process.internal.RequestScope;
 
 /**
@@ -73,7 +74,7 @@ class InboundJaxrsResponse extends Response {
 
     private final ClientResponse context;
     private final RequestScope scope;
-    private final RequestScope.Instance scopeInstance;
+    private final RequestContext requestContext;
 
     /**
      * Create new scoped client response.
@@ -85,9 +86,9 @@ public InboundJaxrsResponse(final ClientResponse context, final RequestScope sco
         this.context = context;
         this.scope = scope;
         if (this.scope != null) {
-            this.scopeInstance = scope.referenceCurrent();
+            this.requestContext = scope.referenceCurrent();
         } else {
-            this.scopeInstance = null;
+            this.requestContext = null;
         }
     }
 
@@ -165,8 +166,8 @@ public void close() throws ProcessingException {
         try {
             context.close();
         } finally {
-            if (scopeInstance != null) {
-                scopeInstance.release();
+            if (requestContext != null) {
+                requestContext.release();
             }
         }
     }
@@ -259,8 +260,8 @@ public String toString() {
     }
 
     private <T> T runInScopeIfPossible(Producer<T> producer) {
-        if (scope != null && scopeInstance != null) {
-            return scope.runInScope(scopeInstance, producer);
+        if (scope != null && requestContext != null) {
+            return scope.runInScope(requestContext, producer);
         } else {
             return producer.call();
         }

core-common/src/main/java/org/glassfish/jersey/internal/inject/AliasBinding.java

@@ -53,7 +53,7 @@
  */
 public class AliasBinding {
 
-    private final String contract;
+    private final Class<?> contract;
     private final Set<Annotation> qualifiers = new LinkedHashSet<>();
     @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
     private Optional<String> scope = Optional.empty();
@@ -65,7 +65,7 @@ public class AliasBinding {
      *
      * @param contract contract of the alias.
      */
-     /* package */ AliasBinding(String contract) {
+     /* package */ AliasBinding(Class<?> contract) {
         this.contract = contract;
     }
 
@@ -74,7 +74,7 @@ public class AliasBinding {
      *
      * @return binding's contract.
      */
-    public String getContract() {
+    public Class<?> getContract() {
         return contract;
     }
 

core-common/src/main/java/org/glassfish/jersey/internal/inject/Binding.java

@@ -65,7 +65,7 @@ public abstract class Binding<T, D extends Binding> {
     private final Set<AliasBinding> aliases = new HashSet<>();
     private Class<? extends Annotation> scope = null;
     private String name = null;
-    private Type implementationType = null;
+    private Class<T> implementationType = null;
     private String analyzer = null;
     private Boolean proxiable = null;
     private Boolean proxyForSameScope = null;
@@ -139,7 +139,7 @@ public String getName() {
      *
      * @return service's type.
      */
-    public Type getImplementationType() {
+    public Class<T> getImplementationType() {
         return implementationType;
     }
 
@@ -166,6 +166,7 @@ public Set<AliasBinding> getAliases() {
      *
      * @return current instance.
      */
+    // TODO: Candidate to remove, used only in legacy CDI integration.
     public D analyzeWith(String analyzer) {
         this.analyzer = analyzer;
         return (D) this;
@@ -252,10 +253,9 @@ public D named(String name) {
      * @param contract contract of the alias.
      * @return instance of a new alias for this binding descriptor that can be further specified.
      */
-    public AliasBinding addAlias(String contract) {
+    public AliasBinding addAlias(Class<?> contract) {
         AliasBinding alias = new AliasBinding(contract);
         aliases.add(alias);
-
         return alias;
     }
 
@@ -293,8 +293,8 @@ public void ranked(int rank) {
      *
      * @return current instance.
      */
-    D asType(Type t) {
-        this.implementationType = t;
+    D asType(Class type) {
+        this.implementationType = type;
         return (D) this;
     }
 }

core-common/src/main/java/org/glassfish/jersey/internal/inject/Bindings.java

@@ -105,7 +105,8 @@ public static <T> ClassBinding<T> serviceAsContract(Class<T> serviceType) {
      */
     @SuppressWarnings("unchecked")
     public static <T> ClassBinding<T> service(GenericType<T> serviceType) {
-        return (ClassBinding<T>) new ClassBinding<>(serviceType.getRawType()).asType(serviceType.getType());
+        return (ClassBinding<T>) new ClassBinding<>(serviceType.getRawType())
+                .asType((Class<T>) serviceType.getType());
     }
 
     /**
@@ -120,7 +121,7 @@ public static <T> ClassBinding<T> service(GenericType<T> serviceType) {
     @SuppressWarnings("unchecked")
     public static <T> ClassBinding<T> serviceAsContract(GenericType<T> serviceType) {
         return (ClassBinding<T>) new ClassBinding<>(serviceType.getRawType())
-                .asType(serviceType.getType())
+                .asType((Class<T>) serviceType.getType())
                 .to(serviceType.getType());
     }
 
@@ -136,7 +137,7 @@ public static <T> ClassBinding<T> serviceAsContract(GenericType<T> serviceType)
     @SuppressWarnings("unchecked")
     public static <T> ClassBinding<T> serviceAsContract(Type serviceType) {
         return new ClassBinding<>((Class<T>) ReflectionHelper.getRawClass(serviceType))
-                .asType(serviceType)
+                .asType((Class<T>) serviceType)
                 .to(serviceType);
     }
 

core-common/src/main/java/org/glassfish/jersey/internal/inject/ClassBinding.java

@@ -57,6 +57,7 @@ public class ClassBinding<T> extends Binding<T, ClassBinding<T>> {
      */
     ClassBinding(Class<T> service) {
         this.service = service;
+        asType(service);
     }
 
     /**

core-common/src/main/java/org/glassfish/jersey/internal/inject/Injectee.java

@@ -110,9 +110,23 @@ public interface Injectee {
     ForeignDescriptor getInjecteeDescriptor();
 
     /**
-     * This method returns {@code true} if the injectee value is provided using factory class.
+     * This method returns scope in which the parent class is registered.
+     *
+     * @return scope annotation.
+     */
+    Class<? extends Annotation> getParentClassScope();
+
+    /**
+     * This method returns {@code true} if the injectee value is provided using {@link java.util.function.Supplier}.
      *
      * @return {@code true} if the injectee is a factory.
      */
     boolean isFactory();
+
+    /**
+     * This method returns {@code true} if the injectee value is provided using {@link javax.inject.Provider}.
+     *
+     * @return {@code true} if the injectee is a provider.
+     */
+    boolean isProvider();
 }

core-common/src/main/java/org/glassfish/jersey/internal/inject/InjecteeImpl.java

@@ -47,8 +47,11 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Set;
 
+import org.glassfish.jersey.internal.util.Pretty;
+
 /**
  * An Injectee represents the point of injection. It can be used by injection resolvers to discover all of the information
  * available about the entity being injected into.
@@ -57,11 +60,13 @@ public class InjecteeImpl implements Injectee {
 
     private Type requiredType;
     private Set<Annotation> qualifiers;
+    private Class<? extends Annotation> parentClassScope;
     private int position = -1;
     private Class<?> injecteeClass;
     private AnnotatedElement parent;
     private boolean isOptional = false;
     private boolean isFactory = false;
+    private boolean isProvider = false;
     private ForeignDescriptor injecteeDescriptor;
 
     @Override
@@ -96,6 +101,21 @@ public void setRequiredQualifiers(Set<Annotation> requiredQualifiers) {
 
     }
 
+    @Override
+    public Class<? extends Annotation> getParentClassScope() {
+        return parentClassScope;
+    }
+
+
+    /**
+     * Sets the scope in which the parent class is registered.
+     *
+     * @return parent class scope.
+     */
+    public void setParentClassScope(Class<? extends Annotation> parentClassScope) {
+        this.parentClassScope = parentClassScope;
+    }
+
     @Override
     public boolean isFactory() {
         return isFactory;
@@ -110,6 +130,20 @@ public void setFactory(boolean factory) {
         isFactory = factory;
     }
 
+    @Override
+    public boolean isProvider() {
+        return isProvider;
+    }
+
+    /**
+     * Sets a flag whether the injectee is a provider.
+     *
+     * @param provider {@code true} flag whether the injectee is provider.
+     */
+    public void setProvider(boolean provider) {
+        isProvider = provider;
+    }
+
     @Override
     public int getPosition() {
         return position;
@@ -188,4 +222,40 @@ public ForeignDescriptor getInjecteeDescriptor() {
     public void setInjecteeDescriptor(ForeignDescriptor injecteeDescriptor) {
         this.injecteeDescriptor = injecteeDescriptor;
     }
+
+    @Override
+    public String toString() {
+        return "InjecteeImpl(requiredType=" + Pretty.type(requiredType)
+                + ",parent=" + Pretty.clazz(parent.getClass())
+                + ",qualifiers=" + Pretty.collection(qualifiers)
+                + ",position=" + position
+                + ",factory=" + isFactory
+                + ",provider=" + isProvider
+                + ",optional=" + isOptional
+                + "," + System.identityHashCode(this) + ")";
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof InjecteeImpl)) {
+            return false;
+        }
+        InjecteeImpl injectee = (InjecteeImpl) o;
+        return position == injectee.position
+                && isOptional == injectee.isOptional
+                && isFactory == injectee.isFactory
+                && isProvider == injectee.isProvider
+                && Objects.equals(requiredType, injectee.requiredType)
+                && Objects.equals(qualifiers, injectee.qualifiers)
+                && Objects.equals(injecteeClass, injectee.injecteeClass)
+                && Objects.equals(parent, injectee.parent);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(requiredType, qualifiers, position, injecteeClass, parent, isOptional, isFactory);
+    }
 }

core-common/src/main/java/org/glassfish/jersey/internal/inject/Injections.java

@@ -40,12 +40,16 @@
 
 package org.glassfish.jersey.internal.inject;
 
-import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
 
 import javax.ws.rs.WebApplicationException;
 
 import org.glassfish.jersey.internal.LocalizationMessages;
 import org.glassfish.jersey.internal.ServiceFinder;
+import org.glassfish.jersey.model.internal.RankedComparator;
+import org.glassfish.jersey.model.internal.RankedProvider;
 
 /**
  * Injection binding utility methods.
@@ -81,21 +85,35 @@ public static InjectionManager createInjectionManager(Binder binder) {
      * Creates an unnamed, parented {@link InjectionManager}. In case the {@code parent} injection manager is not specified, the
      * locator will not be parented.
      *
-     * @param parent  The parent of this injection manager. Services can be found in the parent (and all grand-parents). May be
-     *                {@code null}. An underlying DI provider checks whether the parent is in a proper type.
+     * @param parent The parent of this injection manager. Services can be found in the parent (and all grand-parents). May be
+     *               {@code null}. An underlying DI provider checks whether the parent is in a proper type.
      * @return an injection manager with all the bindings.
      */
     public static InjectionManager createInjectionManager(Object parent) {
         return lookupInjectionManagerFactory().create(parent);
     }
 
     private static InjectionManagerFactory lookupInjectionManagerFactory() {
-        Iterator<InjectionManagerFactory> iterator = ServiceFinder.find(InjectionManagerFactory.class).iterator();
-        if (iterator.hasNext()) {
-            return iterator.next();
-        } else {
-            throw new IllegalStateException(LocalizationMessages.INJECTION_MANAGER_FACTORY_NOT_FOUND());
+        return lookupService(InjectionManagerFactory.class)
+                .orElseThrow(() -> new IllegalStateException(LocalizationMessages.INJECTION_MANAGER_FACTORY_NOT_FOUND()));
+    }
+
+    /**
+     * Look for a service of given type. If more then one service is found the method sorts them are returns the one with highest
+     * priority.
+     *
+     * @param clazz type of service to look for.
+     * @param <T>   type of service to look for.
+     * @return instance of service with highest priority or {@code null} if service of given type cannot be found.
+     * @see javax.annotation.Priority
+     */
+    private static <T> Optional<T> lookupService(final Class<T> clazz) {
+        List<RankedProvider<T>> providers = new LinkedList<>();
+        for (T provider : ServiceFinder.find(clazz)) {
+            providers.add(new RankedProvider<>(provider));
         }
+        providers.sort(new RankedComparator<>(RankedComparator.Order.DESCENDING));
+        return providers.isEmpty() ? Optional.empty() : Optional.ofNullable(providers.get(0).getProvider());
     }
 
     /**