JERSEY-2017: Container agnostic CDI support

  - added ext/cdi/jersey-cdi1x module
  - added ext/cdi/jersey-cdi1x-ban-custom-hk2-binding module
  - added ext/cdi/jersey-cdi1x-transaction module
  - added ext/cdi/jersey-weld2-se module
  - added helloworld-weld example
  - fixed jersey-2137 integration test
  - enabled cdi-webapp tests to run on Grizzly
  - enabled cdi-webapp to run on Grizzly and Tomcat
  - fixed some FindBugs warnings 
  - incorporated Michal's comments

Change-Id: Ied4f4ce89f89470ea3ac461b2c5dcc0723e18179
Signed-off-by: Jakub Podlesak <[email protected]>

Author: japod

bom/pom.xml

@@ -147,18 +147,28 @@
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.glassfish.jersey.containers.glassfish</groupId>
-                <artifactId>jersey-gf-cdi</artifactId>
+                <groupId>org.glassfish.jersey.ext.cdi</groupId>
+                <artifactId>jersey-weld2-se</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.glassfish.jersey.containers.glassfish</groupId>
-                <artifactId>jersey-gf-ejb</artifactId>
+                <groupId>org.glassfish.jersey.ext.cdi</groupId>
+                <artifactId>jersey-cdi1x</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.ext.cdi</groupId>
+                <artifactId>jersey-cdi1x-transaction</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.ext.cdi</groupId>
+                <artifactId>jersey-ext-cdi1x-ban-custom-hk2-binding</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.glassfish.jersey.containers.glassfish</groupId>
-                <artifactId>jersey-gf-cdi-ban-custom-hk2-binding</artifactId>
+                <artifactId>jersey-gf-ejb</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

containers/glassfish/jersey-gf-cdi-ban-custom-hk2-binding/src/main/resources/META-INF/services/org.glassfish.jersey.gf.cdi.spi.Hk2CustomBoundTypesProvider

@@ -58,8 +58,6 @@
 
     <modules>
         <module>jersey-gf-ejb</module>
-        <module>jersey-gf-cdi</module>
-        <module>jersey-gf-cdi-ban-custom-hk2-binding</module>
     </modules>
 
 </project>

containers/glassfish/jersey-gf-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -41,6 +41,7 @@
 package org.glassfish.jersey.internal.inject;
 
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -232,7 +233,16 @@ public static <T> Iterable<RankedProvider<T>> getAllRankedProviders(final Servic
         for (final ServiceHandle<T> provider : providers) {
             final ActiveDescriptor<T> key = provider.getActiveDescriptor();
             if (!providerMap.containsKey(key)) {
-                providerMap.put(key, new RankedProvider<T>(provider.getService(), key.getRanking()));
+                final Set<Type> contractTypes = key.getContractTypes();
+                final Class<?> implementationClass = key.getImplementationClass();
+                boolean proxyGenerated = true;
+                for (Type ct : contractTypes) {
+                    if (((Class<?>)ct).isAssignableFrom(implementationClass)) {
+                        proxyGenerated = false;
+                        break;
+                    }
+                }
+                providerMap.put(key, new RankedProvider<T>(provider.getService(), key.getRanking(), proxyGenerated ? contractTypes : null));
             }
         }
 

containers/glassfish/jersey-gf-cdi/src/main/resources/META-INF/services/org.glassfish.jersey.server.spi.ComponentProvider

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -310,7 +310,7 @@ public Field[] run() {
             }
         };
     }
-    
+
     /**
      * Get privileged action to obtain fields on given class, recursively through inheritance hierarchy.
      * If run using security manager, the returned privileged action
@@ -329,7 +329,7 @@ public Field[] run() {
             	recurse(clazz, fields);
                 return fields.toArray(new Field[0]);
             }
-            
+
            private void recurse(final Class<?> clazz, final List<Field> fields) {
         	   fields.addAll(Arrays.asList(clazz.getDeclaredFields()));
         	   if(clazz.getSuperclass() != null) {
@@ -942,6 +942,27 @@ public static String getPropertyName(final Method method) {
         return new String(chars, offset, chars.length - offset);
     }
 
+    /**
+     * Determine the most specific type from given set.
+     *
+     * @param contractTypes to be taken into account.
+     * @return the most specific type.
+     */
+    public static Class<?> theMostSpecificTypeOf(Set<Type> contractTypes) {
+        Class<?> result = null;
+        for (Type t : contractTypes) {
+            final Class<?> next = (Class<?>) t;
+            if (result == null) {
+                result = next;
+            } else {
+                if (result.isAssignableFrom(next)) {
+                    result = next;
+                }
+            }
+        }
+        return result;
+    }
+
     /**
      * A tuple consisting of a concrete class and a declaring class that declares a
      * generic interface type.

containers/glassfish/pom.xml

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -108,7 +108,7 @@ public final class WriterInterceptorExecutor extends InterceptorExecutor<WriterI
      * @param entityStream {@link java.io.InputStream} from which an entity will be read. The stream is not
      *            closed after reading the entity.
      * @param workers {@link org.glassfish.jersey.message.MessageBodyWorkers Message body workers}.
-     * @param writerInterceptors Writer interceptor that are to be used to intercept the writing of an entity. The interceptors
+     * @param writerInterceptors Writer interceptors that are to be used to intercept writing of an entity.
      * @param serviceLocator Service locator.
      */
     public WriterInterceptorExecutor(final Object entity, final Class<?> rawType,

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

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -40,6 +40,9 @@
 
 package org.glassfish.jersey.model.internal;
 
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.Set;
 import javax.ws.rs.Priorities;
 
 import javax.annotation.Priority;
@@ -56,6 +59,7 @@ public class RankedProvider<T> {
 
     private final T provider;
     private final int rank;
+    private final Set<Type> contractTypes;
 
     /**
      * Creates a new {@code RankedProvider} instance. The rank of the provider is obtained from the {@link javax.annotation.Priority}
@@ -66,6 +70,7 @@ public class RankedProvider<T> {
     public RankedProvider(final T provider) {
         this.provider = provider;
         this.rank = computeRank(provider, ContractProvider.NO_PRIORITY);
+        this.contractTypes = null;
     }
 
     /**
@@ -75,8 +80,20 @@ public RankedProvider(final T provider) {
      * @param rank rank of this provider.
      */
     public RankedProvider(final T provider, final int rank) {
+        this(provider, rank, null);
+    }
+
+    /**
+     * Creates a new {@code RankedProvider} instance for given {@code provider} with specific {@code rank} (> 0).
+     *
+     * @param provider service provider to create a {@code RankedProvider} instance from.
+     * @param rank rank of this provider.
+     * @param contracts contracts implemented by the service provider
+     */
+    public RankedProvider(final T provider, final int rank, final Set<Type> contracts) {
         this.provider = provider;
         this.rank = computeRank(provider, rank);
+        this.contractTypes = contracts;
     }
 
     private int computeRank(final T provider, final int rank) {
@@ -99,6 +116,16 @@ public int getRank() {
         return rank;
     }
 
+    /**
+     * Get me set of implemented contracts.
+     * Returns null if no contracts are implemented.
+     *
+     * @return set of contracts or null if no contracts have been implemented.
+     */
+    public Set<Type> getContractTypes() {
+        return contractTypes;
+    }
+
     @Override
     public String toString() {
         return provider.getClass().getName();

core-common/src/main/java/org/glassfish/jersey/internal/util/ReflectionHelper.java

@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
 #
 # The contents of this file are subject to the terms of either the GNU
 # General Public License Version 2 only ("GPL") or the Common Development