Merge "JAX-RS providers backed by dependent CDI beans can not be handled as request scoped components, cdi-test-webapp tests enabled by default (standalone grizzly)"

Author: shamoh

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

@@ -160,11 +160,18 @@ public class CdiComponentProvider implements ComponentProvider, Extension {
         @Override
         public Boolean compute(final Class<?> clazz) {
             return Application.class.isAssignableFrom(clazz)
-                    || Providers.isJaxRsProvider(clazz)
+                    || jaxRsProvidersCache.compute(clazz)
                     || Resource.from(clazz) != null;
         }
     });
 
+    private final Cache<Class<?>, Boolean> jaxRsProvidersCache = new Cache<>(new Computable<Class<?>, Boolean>() {
+        @Override
+        public Boolean compute(final Class<?> clazz) {
+            return Providers.isJaxRsProvider(clazz);
+        }
+    });
+
     private final Hk2CustomBoundTypesProvider customHk2TypesProvider;
     private final Hk2LocatorManager locatorManager;
 
@@ -313,12 +320,13 @@ public boolean bind(final Class<?> clazz, final Set<Class<?>> providerContracts)
         }
 
         final boolean isJaxRsApp = isJaxRsComponent && Application.class.isAssignableFrom(clazz);
+        final boolean isJaxRsProvider = jaxRsProvidersCache.compute(clazz);
 
         final DynamicConfiguration dc = Injections.getConfiguration(locator);
 
         final Class<? extends Annotation> beanScopeAnnotation = CdiUtil.getBeanScope(clazz, beanManager);
         final boolean isRequestScoped = beanScopeAnnotation == RequestScoped.class
-                                        || beanScopeAnnotation == Dependent.class && !isJaxRsApp;
+                                        || (beanScopeAnnotation == Dependent.class && !isJaxRsApp && !isJaxRsProvider);
 
         Factory beanFactory = isRequestScoped
                 ? new RequestScopedCdiBeanHk2Factory(clazz, locator, beanManager, isCdiManaged)

tests/integration/cdi-test-webapp/pom.xml

@@ -76,25 +76,40 @@
             <type>pom</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.ext.cdi</groupId>
+            <artifactId>jersey-weld2-se</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
+
     <build>
         <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skipTests>${skipTests}</skipTests>
-                    <systemPropertyVariables>
-                        <jersey.config.test.container.factory>${testContainerFactory}</jersey.config.test.container.factory>
-                        <jersey.config.test.container.port>${testContainerPort}</jersey.config.test.container.port>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
-    <properties>
-        <skipTests>true</skipTests>
-        <testContainerFactory>org.glassfish.jersey.test.external.ExternalTestContainerFactory</testContainerFactory>
-        <testContainerPort>8080</testContainerPort>
-    </properties>
+
+    <profiles>
+        <profile>
+            <id>run-external-tests</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <jersey.config.test.container.factory>${external.container.factory}</jersey.config.test.container.factory>
+                                <jersey.config.test.container.port>${external.container.port}</jersey.config.test.container.port>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+            <properties>
+                <!-- External test container configuration is done via properties to allow overriding via command line. -->
+                <external.container.factory>org.glassfish.jersey.test.external.ExternalTestContainerFactory</external.container.factory>
+                <external.container.port>8080</external.container.port>
+                <maven.test.skip>false</maven.test.skip>
+            </properties>
+        </profile>
+    </profiles>
 </project>

tests/integration/cdi-test-webapp/src/main/resources/META-INF/beans.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+    Copyright (c) 2013-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
+    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.
+
+-->
+<beans/>

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

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013-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
@@ -46,6 +46,8 @@
 
 import org.glassfish.jersey.test.JerseyTest;
 
+import org.jboss.weld.environment.se.Weld;
+
 /**
  * Test for CDI web application resources.
  * Run with:
@@ -58,6 +60,21 @@
  */
 public class CdiTest extends JerseyTest {
 
+    Weld weld;
+
+    @Override
+    public void setUp() throws Exception {
+        weld = new Weld();
+        weld.initialize();
+        super.setUp();
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        weld.shutdown();
+        super.tearDown();
+    }
+
     @Override
     protected Application configure() {
         return new MyApplication();

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

@@ -45,6 +45,8 @@
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
 
+import org.glassfish.jersey.test.external.ExternalTestContainerFactory;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -91,8 +93,14 @@ public void testGet() {
 
     @Test
     public void testCounter() {
+
         final WebTarget counter = target().path("jcdibean/singleton").path(p).queryParam("x", x).path("counter");
 
+        if (!ExternalTestContainerFactory.class.isAssignableFrom(getTestContainerFactory().getClass())) {
+             // TODO: remove this workaround once JERSEY-2744 is resolved
+            counter.request().put(Entity.text("10"));
+        }
+
         String c10 = counter.request().get(String.class);
         assertThat(c10, containsString("10"));
 

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

@@ -45,6 +45,8 @@
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
 
+import org.glassfish.jersey.test.external.ExternalTestContainerFactory;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -94,6 +96,11 @@ public void testCounter() {
 
         final WebTarget counter = target().path("jcdibean/dependent/singleton").path(p).queryParam("x", x).path("counter");
 
+        if (!ExternalTestContainerFactory.class.isAssignableFrom(getTestContainerFactory().getClass())) {
+            // TODO: remove this workaround once JERSEY-2744 is resolved
+            counter.request().put(Entity.text("10"));
+        }
+
         String c10 = counter.request().get(String.class);
         assertThat(c10, containsString("10"));