JERSEY-2527: Jersey CDI extension registers unnecessary/redundant CDI beans

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

Author: japod

containers/glassfish/jersey-gf-cdi/src/main/java/org/glassfish/jersey/gf/cdi/internal/CdiComponentProvider.java

@@ -616,16 +616,6 @@ public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) {
         });
     }
 
-    @SuppressWarnings("unused")
-    private void processProducerMethod(@Observes final ProcessProducerMethod processProducerMethod) {
-        typesSeenBeforeValidation.addAll(processProducerMethod.getAnnotatedProducerMethod().getTypeClosure());
-    }
-
-    @SuppressWarnings("unused")
-    private void processProducerField(@Observes final ProcessProducerField processProducerField) {
-        typesSeenBeforeValidation.addAll(processProducerField.getAnnotatedProducerField().getTypeClosure());
-    }
-
     @SuppressWarnings("unused")
     private void afterTypeDiscovery(@Observes final AfterTypeDiscovery afterTypeDiscovery) {
         final List<Class<?>> interceptors = afterTypeDiscovery.getInterceptors();
@@ -673,11 +663,10 @@ public Object intercept(final InvocationContext ic) throws Exception {
     private void processInjectionTarget(@Observes final ProcessInjectionTarget event) {
         final InjectionTarget it = event.getInjectionTarget();
         final Class<?> componentClass = event.getAnnotatedType().getJavaClass();
-        typesSeenBeforeValidation.add(event.getAnnotatedType().getBaseType());
 
-        final Set<InjectionPoint> filteredInjectionPoints = filterHk2InjectionPointsOut(it.getInjectionPoints());
+        final Set<InjectionPoint> cdiInjectionPoints = filterHk2InjectionPointsOut(it.getInjectionPoints());
 
-        for (final InjectionPoint injectionPoint : filteredInjectionPoints) {
+        for (final InjectionPoint injectionPoint : cdiInjectionPoints) {
             final Member member = injectionPoint.getMember();
             if (member instanceof Field) {
                 addInjecteeToSkip(componentClass, fieldsToSkip, (Field) member);
@@ -702,45 +691,42 @@ public Set getInjectionPoints() {
                 @Override
                 public Set getInjectionPoints() {
                     // Inject CDI beans into JAX-RS resources/providers/application.
-                    return filteredInjectionPoints;
+                    return cdiInjectionPoints;
                 }
             });
         }
     }
 
-    // TODO: refactor the following method
     private Set<InjectionPoint> filterHk2InjectionPointsOut(final Set<InjectionPoint> originalInjectionPoints) {
         final Set<InjectionPoint> filteredInjectionPoints = new HashSet<InjectionPoint>();
         for (InjectionPoint ip : originalInjectionPoints) {
             final Type injectedType = ip.getType();
-            if (injectedType instanceof Class<?>) {
-                if (!isJerseyOrDependencyType((Class<?>)injectedType)
-                        && !(customHk2TypesProvider != null && customHk2TypesProvider.getHk2Types().contains(injectedType))) {
-                    filteredInjectionPoints.add(ip);
-                } else {
-                    //remember the type, we would need to mock it's CDI binding at runtime
-                    hk2ProvidedTypes.add(injectedType);
-                }
+            if (customHk2TypesProvider != null && customHk2TypesProvider.getHk2Types().contains(injectedType)) {
+                //remember the type, we would need to mock it's CDI binding at runtime
+                hk2ProvidedTypes.add(injectedType);
             } else {
-                if (isInjectionProvider(injectedType)) {
-                    if (!isProviderOfJerseyType((ParameterizedType)injectedType)
-                            && !(customHk2TypesProvider != null && customHk2TypesProvider.getHk2Types().contains(injectedType))) {
+                if (injectedType instanceof Class<?>) {
+                    if (isJerseyOrDependencyType((Class<?>)injectedType)) {
+                        //remember the type, we would need to mock it's CDI binding at runtime
+                        hk2ProvidedTypes.add(injectedType);
+                    } else {
                         filteredInjectionPoints.add(ip);
+                    }
+                } else { // it is not a class, maybe provider type?:
+                    if (isInjectionProvider(injectedType)
+                        && (isProviderOfJerseyType((ParameterizedType)injectedType))) {
+                            //remember the type, we would need to mock it's CDI binding at runtime
+                            hk2ProvidedTypes.add(((ParameterizedType)injectedType).getActualTypeArguments()[0]);
                     } else {
-                        //remember the type, we would need to mock it's CDI binding at runtime
-                        hk2ProvidedTypes.add(((ParameterizedType)injectedType).getActualTypeArguments()[0]);
+                        filteredInjectionPoints.add(ip);
                     }
-                } else {
-                    filteredInjectionPoints.add(ip);
                 }
             }
         }
         return filteredInjectionPoints;
     }
 
     private final Set<Type> hk2ProvidedTypes = Collections.synchronizedSet(new HashSet<Type>());
-    private final Set<Type> potentionalHk2CustomBoundTypes = Collections.synchronizedSet(new HashSet<Type>());
-    private final Set<Type> typesSeenBeforeValidation = Collections.synchronizedSet(new HashSet<Type>());
     private final Set<Type> jerseyVetoedTypes = Collections.synchronizedSet(new HashSet<Type>());
 
     private boolean isInjectionProvider(final Type injectedType) {
@@ -750,7 +736,10 @@ private boolean isInjectionProvider(final Type injectedType) {
 
     private boolean isProviderOfJerseyType(final ParameterizedType provider) {
         final Type firstArgumentType = provider.getActualTypeArguments()[0];
-        return firstArgumentType instanceof Class && isJerseyOrDependencyType((Class<?>)firstArgumentType);
+        if (firstArgumentType instanceof Class && isJerseyOrDependencyType((Class<?>)firstArgumentType)) {
+            return true;
+        }
+        return (customHk2TypesProvider != null && customHk2TypesProvider.getHk2Types().contains(firstArgumentType));
     }
 
     /**
@@ -763,23 +752,7 @@ public static class CdiDefaultAnnotation extends AnnotationLiteral<Default> impl
     @SuppressWarnings({ "unused", "unchecked", "rawtypes" })
     private void afterDiscoveryObserver(@Observes AfterBeanDiscovery abd) {
 
-        if (customHk2TypesProvider == null) {
-            potentionalHk2CustomBoundTypes.removeAll(typesSeenBeforeValidation);
-            potentionalHk2CustomBoundTypes.removeAll(_getContracts(typesSeenBeforeValidation));
-            final boolean configLogEnabled = LOGGER.isLoggable(Level.CONFIG);
-            final Set<Type> effectiveHk2CustomBoundTypes = configLogEnabled ? new HashSet<Type>() : null;
-            for (Type t : potentionalHk2CustomBoundTypes) {
-                if (!isNothingWeWantToMessUpWith(t)) { // need to avoid built-in beans conflict
-                    hk2ProvidedTypes.add(t);
-                    if (configLogEnabled) {
-                        effectiveHk2CustomBoundTypes.add(t);
-                    }
-                }
-            }
-            if (configLogEnabled) {
-                LOGGER.config(listTypes(new StringBuilder().append("\n"), effectiveHk2CustomBoundTypes).toString());
-            }
-        } else {
+        if (customHk2TypesProvider != null) {
             hk2ProvidedTypes.addAll(customHk2TypesProvider.getHk2Types());
         }
 
@@ -901,19 +874,12 @@ private boolean isJerseyOrDependencyType(final Class<?> clazz) {
 
         final String pkgName = pkg.getName();
 
-        final boolean result = pkgName.contains("org.glassfish.hk2")
+        return pkgName.contains("org.glassfish.hk2")
                                 || pkgName.contains("jersey.repackaged")
                                 || pkgName.contains("org.jvnet.hk2")
                                 || (pkgName.startsWith("org.glassfish.jersey")
                                     && !pkgName.startsWith("org.glassfish.jersey.examples")
                                     && !pkgName.startsWith("org.glassfish.jersey.tests"));
-
-        // TODO: refactor this, it needs to get out of this checking method
-        if (!result) {
-            potentionalHk2CustomBoundTypes.add(clazz);
-        }
-
-        return result;
     }
 
     private static BeanManager beanManagerFromJndi() {

tests/integration/cdi-with-jersey-injection-custom-cfg-webapp/src/test/java/org/glassfish/jersey/tests/cdi/resources/RequestSensitiveTest.java

@@ -98,6 +98,6 @@ public void testCdiInjection() {
     @Test
     public void testHk2Injection() {
         String s = target().path(resource).path("path").path(straight).request().get(String.class);
-        assertThat(s, equalTo(String.format("/%s/path/%s", resource, straight)));
+        assertThat(s, equalTo(String.format("%s/path/%s", resource, straight)));
     }
 }

tests/integration/cdi-with-jersey-injection-webapp/pom.xml

@@ -55,6 +55,11 @@
     <description>Jersey CDI test web application, this one uses Jersey (non JAX-RS) component injection</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.glassfish.jersey.containers.glassfish</groupId>
+            <artifactId>jersey-gf-cdi</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-server</artifactId>

tests/integration/cdi-with-jersey-injection-webapp/src/main/java/org/glassfish/jersey/tests/cdi/resources/MyHk2TypesProvider.java

@@ -0,0 +1,59 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2014 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
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package org.glassfish.jersey.tests.cdi.resources;
+
+import java.lang.reflect.Type;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.glassfish.jersey.gf.cdi.spi.Hk2CustomBoundTypesProvider;
+
+/**
+ * Tell Jersey CDI extension what types should be bridged from HK2 to CDI.
+ *
+ * @author Jakub Podlesak (jakub.podlesak at oracle.com)
+ */
+public class MyHk2TypesProvider implements Hk2CustomBoundTypesProvider {
+
+    @Override
+    public Set<Type> getHk2Types() {
+        return new HashSet<Type>(){{add(MyApplication.MyInjection.class);}};
+    }
+}

tests/integration/cdi-with-jersey-injection-webapp/src/test/java/org/glassfish/jersey/tests/cdi/resources/RequestSensitiveTest.java

@@ -98,6 +98,6 @@ public void testCdiInjection() {
     @Test
     public void testHk2Injection() {
         String s = target().path(resource).path("path").path(straight).request().get(String.class);
-        assertThat(s, equalTo(String.format("/%s/path/%s", resource, straight)));
+        assertThat(s, equalTo(String.format("%s/path/%s", resource, straight)));
     }
 }