Merge "JERSEY-2930: fixed CDI integration so that all locators get propagated to the CDI injection targets. If injection happens at bootstrap (to inject app scoped beans), then the last locator seen is used effectively as that locator belongs to the actually initialised application. Uncommented cdi-test-webapp related tests (that used to fail in AS environment)."

Author: japod

ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/CdiComponentProvider.java

@@ -885,6 +885,7 @@ private abstract class Hk2InjectedCdiTarget implements Hk2InjectedTarget {
         private final ClassLoader targetClassLoader;
 
         private volatile ServiceLocator effectiveLocator;
+        private volatile boolean multipleLocators = false;
 
         public Hk2InjectedCdiTarget(final Class<?> componentClass,
                                     final InjectionTarget delegate) {
@@ -900,7 +901,8 @@ public Hk2InjectedCdiTarget(final Class<?> componentClass,
         public void inject(final Object t, final CreationalContext cc) {
             delegate.inject(t, cc);
 
-            final ServiceLocator injectingLocator = (effectiveLocator != null) ? effectiveLocator : getEffectiveLocator();
+            final ServiceLocator il = multipleLocators ? getEffectiveLocator() : effectiveLocator;
+            final ServiceLocator injectingLocator = (il != null) ? il : effectiveLocator;
 
             if (injectingLocator != null) {
                 injectingLocator.inject(t, CdiComponentProvider.CDI_CLASS_ANALYZER);
@@ -929,6 +931,9 @@ public void dispose(final Object t) {
 
         @Override
         public void setLocator(final ServiceLocator effectiveLocator) {
+            if (this.effectiveLocator != null) {
+                this.multipleLocators = true;
+            }
             this.effectiveLocator = effectiveLocator;
         }
     }

ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/GenericHk2LocatorManager.java

@@ -79,10 +79,12 @@ public void registerLocator(final ServiceLocator locator) {
                 this.locator = null;
                 multipleLocators = true;
             } // first and second case
-            for (final Hk2InjectedTarget target : injectionTargets) {
-                target.setLocator(this.locator);
-            }
-        } // ignore otherwise
+        }
+
+        // pass the locator to registered injection targets anyway
+        for (final Hk2InjectedTarget target : injectionTargets) {
+            target.setLocator(locator);
+        }
     }
 
     @Override

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

@@ -60,15 +60,12 @@
  *
  * @author Jakub Podlesak (jakub.podlesak at oracle.com)
  */
-// TODO: uncomment once JERSEY-2930 gets fixed
-//@ApplicationPath("secondary")
+@ApplicationPath("secondary")
 @ApplicationScoped
-public class SecondaryApplication { //extends Application {
+public class SecondaryApplication extends Application {
 
 
-    private static final Logger LOGGER = Logger.getLogger(SecondaryApplication.class.getName());
-
-//    @Override
+    @Override
     public Set<Class<?>> getClasses() {
         final Set<Class<?>> classes = new HashSet<Class<?>>();
         classes.add(SecondNonJaxRsBeanInjectedResource.class);

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

@@ -62,7 +62,6 @@
 import org.junit.After;
 import org.junit.Assume;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -75,7 +74,6 @@
  *
  * @author Jakub Podlesak (jakub.podlesak at oracle.com)
  */
-@Ignore("waiting for https://java.net/jira/browse/JERSEY-2930")
 public class NonJaxRsBeanJaxRsInjectionTest {
 
     public static final String MAIN_URI = "/main";
@@ -127,10 +125,7 @@ private void initializeWeld() {
 
     private void startGrizzlyContainer() throws IOException {
         final ResourceConfig firstConfig = ResourceConfig.forApplicationClass(MainApplication.class);
-
-        // TODO: replace after https://java.net/jira/browse/JERSEY-2930 gets fixed
-        final ResourceConfig secondConfig = ResourceConfig.forApplicationClass(MainApplication.class);
-//        final ResourceConfig secondConfig = ResourceConfig.forApplicationClass(SecondaryApplication.class);
+        final ResourceConfig secondConfig = ResourceConfig.forApplicationClass(SecondaryApplication.class);
 
         httpServer = GrizzlyHttpServerFactory.createHttpServer(MAIN_APP_URI, firstConfig, false);
         final HttpHandler secondHandler = createGrizzlyContainer(secondConfig);

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

@@ -60,7 +60,6 @@
  *
  * @author Jakub Podlesak (jakub.podlesak at oracle.com)
  */
-@Ignore("waiting for https://java.net/jira/browse/JERSEY-2930")
 public class SecondJaxRsInjectedCdiBeanTest extends JerseyTest {
     Weld weld;
 
@@ -77,11 +76,10 @@ public void tearDown() throws Exception {
         super.tearDown();
     }
 
-    // TODO: uncomment after https://java.net/jira/browse/JERSEY-2930 gets fixed
-//    @Override
-//    protected Application configure() {
-//        return new SecondaryApplication();
-//    }
+    @Override
+    protected Application configure() {
+        return new SecondaryApplication();
+    }
 
     @Override
     protected URI getBaseUri() {