Fix for JERSEY-2461: CDI extension injection should be done exclusively by CDI container

Change-Id: Ie64097ba58fe528575c853c5b229f6ba7717460c
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

@@ -227,7 +227,7 @@ public void preDestroy(final T instance) {
 
                 final AnnotatedType<T> annotatedType = beanManager.createAnnotatedType(clazz);
                 final InjectionTarget<T> injectionTarget = beanManager.createInjectionTarget(annotatedType);
-                final CreationalContext creationalContext = beanManager.createCreationalContext(null);
+                final CreationalContext<T> creationalContext = beanManager.createCreationalContext(null);
 
                 @Override
                 public T getInstance(final Class<T> clazz) {
@@ -526,10 +526,10 @@ private Set<InjectionPoint> filterHk2InjectionPointsOut(final Set<InjectionPoint
         return filteredInjectionPoints;
     }
 
-    private Set<Type> hk2ProvidedTypes = Collections.synchronizedSet(new HashSet<Type>());
-    private Set<Type> potentionalHk2CustomBoundTypes = Collections.synchronizedSet(new HashSet<Type>());
-    private Set<Type> typesSeenBeforeValidation = Collections.synchronizedSet(new HashSet<Type>());
-    private Set<Type> jerseyVetoedTypes = Collections.synchronizedSet(new HashSet<Type>());
+    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) {
         return injectedType instanceof ParameterizedType
@@ -586,7 +586,7 @@ private Hk2CustomBoundTypesProvider lookupHk2CustomBoundTypesProvider() throws S
         return providers.isEmpty() ? null : providers.get(0).getProvider();
     }
 
-    private Set<Type> _getContracts(Set<Type> types) {
+    private Set<Type> _getContracts(final Set<Type> types) {
         Set<Type> result = new HashSet<Type>();
 
         for (Type t : types) {
@@ -616,7 +616,7 @@ private void _addDerivedContracts(Type t, Set<Type> result) {
         }
     }
 
-    private boolean isNothingWeWantToMessUpWith(Type t) {
+    private boolean isNothingWeWantToMessUpWith(final Type t) {
         if (!(t instanceof Class)) {
             return false;
         }
@@ -635,7 +635,23 @@ private boolean isNothingWeWantToMessUpWith(Type t) {
 
         final String pkgName = pkg.getName();
 
-        return pkgName.startsWith("java.") || pkgName.startsWith("javax.");
+        if (pkgName.startsWith("java.") || pkgName.startsWith("javax.")) {
+            return true;
+        }
+
+        // rule out everyting implementing types from the "javax.enterprise.inject.spi" package
+        final Set<Type> contracts = _getContracts(new HashSet<Type>(){{add(t);}});
+        for (Type ct : contracts) {
+            final Class<?> cc = (Class<?>)ct;
+            if (!cc.isPrimitive() && !cc.isSynthetic()) {
+                final Package cp = cc.getPackage();
+                if (cp != null && cp.getName().startsWith("javax.enterprise.inject.spi")) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
     }
 
     private <T> void addInjecteeToSkip(final Class<?> componentClass, final Map<Class<?>, Set<T>> toSkip, final T member) {

tests/integration/cdi-test-webapp/src/main/java/org/glassfish/jersey/tests/cdi/resources/CounterResource.java

@@ -0,0 +1,85 @@
+/*
+ * 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 javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ * Part of JERSEY-2461 reproducer. This one will get injected with a CDI extension.
+ * HK2 should not mess up with this.
+ *
+ * @author Jakub Podlesak (jakub.podlesak at oracle.com)
+ */
+@RequestScoped
+@Path("counter")
+public class CounterResource {
+
+    final CustomExtension e;
+
+    /**
+     * To make CDI happy... namely to make the bean proxy-able.
+     */
+    public CounterResource() {
+        this.e = null;
+    }
+
+    /**
+     * This one will get used at runtime actually.
+     *
+     * @param extension current application CDI custom extension.
+     */
+    @Inject
+    public CounterResource(CustomExtension extension) {
+        this.e = extension;
+    }
+
+    /**
+     * Return custom extension counter state.
+     *
+     * @return next count.
+     */
+    @GET
+    public int getCount() {
+        return e.getCount();
+    }
+}

tests/integration/cdi-test-webapp/src/main/java/org/glassfish/jersey/tests/cdi/resources/CustomExtension.java

@@ -0,0 +1,64 @@
+/*
+ * 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.util.concurrent.atomic.AtomicInteger;
+import javax.enterprise.inject.spi.Extension;
+
+/**
+ * Part of JERSEY-2461 reproducer. We need an extension that we could inject,
+ * to make sure HK2 custom binding does not attempt to mess up.
+ *
+ * @author Jakub Podlesak (jakub.podlesak at oracle.com)
+ */
+public class CustomExtension implements Extension {
+
+    private AtomicInteger counter = new AtomicInteger();
+
+    /**
+     * A made up functionality. Does not really matter. CDI
+     * would refuse to deploy the application if something went wrong.
+     *
+     * @return next count.
+     */
+    public int getCount() {
+        return counter.incrementAndGet();
+    }
+}

tests/integration/cdi-test-webapp/src/main/java/org/glassfish/jersey/tests/cdi/resources/MyApplication.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-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
@@ -73,6 +73,7 @@ public Set<Class<?>> getClasses() {
         classes.add(StutteringEchoResource.class);
         classes.add(StutteringEcho.class);
         classes.add(ReversingEchoResource.class);
+        classes.add(CounterResource.class);
         return classes;
     }
 

tests/integration/cdi-test-webapp/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension

@@ -0,0 +1 @@
+org.glassfish.jersey.tests.cdi.resources.CustomExtension

tests/integration/cdi-test-webapp/src/test/java/org/glassfish/jersey/tests/cdi/resources/CounterTest.java

@@ -0,0 +1,73 @@
+/*
+ * 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 javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
+import org.junit.Test;
+
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.hamcrest.CoreMatchers.is;
+
+/**
+ * Part of JERSEY-2641 reproducer. Accessing CDI bean that has custom CDI
+ * extension injected.
+ *
+ * @author Jakub Podlesak (jakub.podlesak at oracle.com)
+ */
+public class CounterTest extends CdiTest {
+
+    @Test
+    public void testGet() {
+
+        final WebTarget target = target().path("counter");
+
+        final Response firstResponse = target.request().get();
+        assertThat(firstResponse.getStatus(), is(200));
+        int firstNumber = Integer.decode(firstResponse.readEntity(String.class));
+
+        final Response secondResponse = target.request().get();
+        assertThat(secondResponse.getStatus(), is(200));
+        int secondNumber = Integer.decode(secondResponse.readEntity(String.class));
+
+        assertTrue("Second request should have greater number!", secondNumber > firstNumber);
+    }
+}