SWARM-1471: Do not auto-generate the JAX-RS application if the application-path has not been defined in YAML.

docs/howto/autodetect-fractions/src/main/java/org/wildfly/swarm/howto/autodetect/MyRestApplication.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015-2018 Red Hat, Inc, and individual contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.wildfly.swarm.howto.autodetect;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/")
+public class MyRestApplication extends Application {
+}

docs/howto/create-a-datasource/src/main/java/org/wildfly/swarm/howto/datasources/MyRestApplication.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015-2018 Red Hat, Inc, and individual contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.wildfly.swarm.howto.datasources;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/")
+public class MyRestApplication extends Application {
+}

docs/howto/create-a-hollow-jar/src/main/java/org/wildfly/swarm/howto/hollowjar/MyRestApplication.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015-2018 Red Hat, Inc, and individual contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.wildfly.swarm.howto.hollowjar;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/")
+public class MyRestApplication extends Application {
+}

docs/howto/create-an-uberjar/src/main/java/org/wildfly/swarm/howto/uberjar/MyRestApplication.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015-2018 Red Hat, Inc, and individual contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.wildfly.swarm.howto.uberjar;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/")
+public class MyRestApplication extends Application {
+}

docs/howto/explicit-fractions/src/main/java/org/wildfly/swarm/howto/explicit/MyRestApplication.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015-2018 Red Hat, Inc, and individual contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.wildfly.swarm.howto.explicit;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/")
+public class MyRestApplication extends Application {
+}

docs/howto/use-a-bom/src/main/java/org/wildfly/swarm/howto/datasources/MyRestApplication.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015-2018 Red Hat, Inc, and individual contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.wildfly.swarm.howto.datasources;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/")
+public class MyRestApplication extends Application {
+}

fractions/javaee/jaxrs/src/main/java/org/wildfly/swarm/jaxrs/runtime/DefaultApplicationDeploymentProcessor.java

@@ -48,7 +48,8 @@ public class DefaultApplicationDeploymentProcessor implements DeploymentProcesso
      */
     static final ArchivePath PATH_WEB_XML = ArchivePaths.create(ArchivePaths.create("WEB-INF"), "web.xml");
 
-    @AttributeDocumentation("Set the JAX-RS application path, if the JAX-RS application class is autogenerated by Swarm")
+    @AttributeDocumentation("Set the JAX-RS application path. If set, WildFly Swarm will automatically generate a JAX-RS" +
+            " Application class and use this value as the @ApplicationPath")
     @Configurable("swarm.deployment.*.jaxrs.application-path")
     Defaultable<String> applicationPath = Defaultable.string("/");
 
@@ -76,7 +77,9 @@ public void process() throws Exception {
             return;
         }
 
-        addGeneratedApplication(archive.as(JAXRSArchive.class));
+        if (applicationPath.isExplicit()) {
+            addGeneratedApplication(archive.as(JAXRSArchive.class));
+        }
     }
 
     private void addGeneratedApplication(JAXRSArchive archive) {

fractions/javaee/jaxrs/src/test/java/org/wildfly/swarm/jaxrs/runtime/DefaultApplicationDeploymentProcessorTest.java

@@ -39,10 +39,10 @@ public class DefaultApplicationDeploymentProcessorTest {
     private static final String PATH = "WEB-INF/classes/org/wildfly/swarm/generated/WildFlySwarmDefaultJAXRSApplication.class";
 
     @Test
-    public void testApplicationPathAnnotation_None() throws Exception {
-        JAXRSArchive archive = ShrinkWrap.create(JAXRSArchive.class);
+    public void testApplicationPathAnnotation_SpecifiedInProjectDefaults() throws Exception {
+        JAXRSArchive archive = ShrinkWrap.create(JAXRSArchive.class, "app.war");
         DefaultApplicationDeploymentProcessor processor = new DefaultApplicationDeploymentProcessor(archive);
-
+        processor.applicationPath.set("/api-test"); // Simulate the behavior of loading the project defaults.
         processor.process();
 
         Node generated = archive.get(PATH);
@@ -121,6 +121,7 @@ public void testWebXmlApplicationServletMappingAbsent() throws Exception {
         archive.addClass(MyResource.class);
         archive.setWebXML(new StringAsset("<web-app><display-name>Foo</display-name></web-app>"));
         DefaultApplicationDeploymentProcessor processor = new DefaultApplicationDeploymentProcessor(archive);
+        processor.applicationPath.set("/api-test"); // Simulate the behavior of loading the project defaults.
 
         processor.process();
 
@@ -134,11 +135,12 @@ public void testMalformedWebXmlApplicationServletMappingAbsent() throws Exceptio
         archive.addClass(MyResource.class);
         archive.setWebXML(new StringAsset("blablabla"));
         DefaultApplicationDeploymentProcessor processor = new DefaultApplicationDeploymentProcessor(archive);
+        processor.applicationPath.set("/api-test"); // Simulate the behavior of loading the project defaults.
 
         processor.process();
 
         Node generated = archive.get(PATH);
         assertThat(generated).isNotNull();
     }
 
-}
+}

testsuite/testsuite-buildtool/multi-module/view/src/main/resources/project-defaults.yml

@@ -0,0 +1,5 @@
+swarm:
+  deployment:
+    endpoint.war:
+      jaxrs:
+        application-path: /

testsuite/testsuite-cdi-jaxrsapi/src/main/resources/project-defaults.yml

@@ -0,0 +1,5 @@
+swarm:
+  deployment:
+    JAXRSApiTest.war:
+      jaxrs:
+        application-path: /

testsuite/testsuite-classloader/src/main/resources/project-defaults.yml

@@ -0,0 +1,5 @@
+swarm:
+  deployment:
+    ClassLoaderTest.war:
+      jaxrs:
+        application-path: /

testsuite/testsuite-datasources/src/main/resources/project-defaults.yml

@@ -0,0 +1,5 @@
+swarm:
+  deployment:
+    ArquillianModulesTest.war:
+      jaxrs:
+        application-path: /

testsuite/testsuite-infinispan/src/main/resources/project-defaults.yml

@@ -0,0 +1,5 @@
+swarm:
+  deployment:
+    Swarm551Test.war:
+      jaxrs:
+        application-path: /

testsuite/testsuite-jaxrs/src/test/java/org/wildfly/swarm/jaxrs/ArqJAXRSExceptionMapperTest.java

@@ -16,6 +16,7 @@
 package org.wildfly.swarm.jaxrs;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.InputStreamReader;
 import java.net.URL;
 import java.net.URLConnection;
@@ -38,12 +39,16 @@ public class ArqJAXRSExceptionMapperTest {
 
     @Deployment(testable = false)
     public static Archive createDeployment() throws Exception {
+        URL url = Thread.currentThread().getContextClassLoader().getResource("project-test-defaults-path.yml");
+        assertThat(url).isNotNull();
+        File projectDefaults = new File(url.toURI());
         JAXRSArchive deployment = ShrinkWrap.create(JAXRSArchive.class, "myapp.war");
         deployment.addClass(JsonProcessingExceptionMapper.class);
         deployment.addClass(CustomExceptionMapper.class);
         deployment.addClass(CustomException.class);
         deployment.addResource(JsonParsingExceptionResource.class);
         deployment.addResource(CustomExceptionResource.class);
+        deployment.addAsResource(projectDefaults, "/project-defaults.yml");
         deployment.addAllDependencies();
         return deployment;
     }

testsuite/testsuite-jaxrs/src/test/java/org/wildfly/swarm/jaxrs/JAXRSArquillianTest.java

@@ -15,7 +15,9 @@
  */
 package org.wildfly.swarm.jaxrs;
 
+import java.io.File;
 import java.io.IOException;
+import java.net.URL;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
@@ -39,11 +41,15 @@ public class JAXRSArquillianTest {
 
     @Deployment(testable = false)
     public static Archive createDeployment() throws Exception {
+        URL url = Thread.currentThread().getContextClassLoader().getResource("project-test-defaults-path.yml");
+        assertThat(url).isNotNull();
+        File projectDefaults = new File(url.toURI());
         JAXRSArchive deployment = ShrinkWrap.create(JAXRSArchive.class, "myapp.war");
         deployment.addClass(SuccessfulChecks.class);
         deployment.addClass(CustomJsonProvider.class);
         deployment.addClass(MyResource.class);
         deployment.setContextRoot("rest");
+        deployment.addAsResource(projectDefaults, "/project-defaults.yml");
         deployment.addAllDependencies();
         return deployment;
     }

testsuite/testsuite-jaxrs/src/test/resources/project-test-defaults-path.yml

@@ -0,0 +1,6 @@
+# This file is translated in to the project defaults file in to the archives created during the test cases.
+swarm:
+  deployment:
+    myapp.war:
+      jaxrs:
+        application-path: /

testsuite/testsuite-jpa/src/test/java/org/wildfly/swarm/jpa/swarm513/SWARM_513Test.java

@@ -1,5 +1,8 @@
 package org.wildfly.swarm.jpa.swarm513;
 
+import java.io.File;
+import java.net.URL;
+
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
@@ -22,6 +25,8 @@
 import org.wildfly.swarm.jaxrs.JAXRSArchive;
 import org.wildfly.swarm.transactions.TransactionsFraction;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 /**
  * @author Heiko Braun
  */
@@ -30,7 +35,10 @@ public class SWARM_513Test {
 
     @Deployment(testable = true)
     public static Archive createDeployment() throws Exception {
-        JAXRSArchive deployment = ShrinkWrap.create(JAXRSArchive.class, "swarm_513.war");
+        URL url = Thread.currentThread().getContextClassLoader().getResource("project-test-defaults-path.yml");
+        assertThat(url).isNotNull();
+        File projectDefaults = new File(url.toURI());
+        JAXRSArchive deployment = ShrinkWrap.create(JAXRSArchive.class, "myapp.war");
         deployment.addResource(TicketEndpoint.class);
         deployment.addClass(Ticket.class);
         deployment.addClass(Tickets.class);
@@ -39,6 +47,7 @@ public static Archive createDeployment() throws Exception {
         deployment.addAsWebInfResource(new ClassLoaderAsset("META-INF/persistence.xml", SWARM_513Test.class.getClassLoader()), "classes/META-INF/persistence.xml");
         deployment.addAsWebInfResource(new ClassLoaderAsset("META-INF/import.sql", SWARM_513Test.class.getClassLoader()), "classes/META-INF/import.sql");
 
+        deployment.addAsResource(projectDefaults, "/project-defaults.yml");
         return deployment;
     }
 

testsuite/testsuite-jpa/src/test/resources/project-test-defaults-path.yml

@@ -0,0 +1,6 @@
+# This file is translated in to the project defaults file in to the archives created during the test cases.
+swarm:
+  deployment:
+    myapp.war:
+      jaxrs:
+        application-path: /

testsuite/testsuite-swagger-customized/src/main/resources/project-defaults.yml

@@ -2,5 +2,7 @@
 swarm:
   deployment:
     SwaggerConfiguredArquillianTest.war:
+      jaxrs:
+        application-path: /
       swagger:
-        title: My Custom App
+        title: My Custom App

testsuite/testsuite-swagger/src/main/resources/project-defaults.yml

@@ -0,0 +1,5 @@
+swarm:
+  deployment:
+    SwaggerArquillianTest.war:
+      jaxrs:
+        application-path: /

testsuite/testsuite-zipkin-jaxrs/src/main/resources/project-defaults.yml

@@ -0,0 +1,6 @@
+
+swarm:
+  deployment:
+    myapp.war:
+      jaxrs:
+        application-path: /

testsuite/testsuite-zipkin-jaxrs/src/test/java/org/wildfly/swarm/jaxrs/ZipkinJAXRSTest.java

@@ -1,6 +1,7 @@
 package org.wildfly.swarm.jaxrs;
 
 import java.io.File;
+import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.HashMap;
@@ -38,12 +39,14 @@ public class ZipkinJAXRSTest {
     private static final String SPAN_COLLECTOR = "com.github.kristofa.brave.LoggingSpanCollector";
 
 
-
     @Deployment
     public static Archive createDeployment() throws Exception {
-        JAXRSArchive deployment = ShrinkWrap.create(JAXRSArchive.class);
+        URL url = Thread.currentThread().getContextClassLoader().getResource("project-defaults.yml");
+        File projectDefaults = new File(url.toURI());
+        JAXRSArchive deployment = ShrinkWrap.create(JAXRSArchive.class, "myapp.war");
         deployment.addResource(MyResource.class);
         deployment.addAllDependencies();
+        deployment.addAsResource(projectDefaults, "/project-defaults.yml");
         return deployment;
     }