Fixed JAX-RS synthetic app creation + functional test.

microprofile/server/src/main/java/io/helidon/microprofile/server/JaxRsCdiExtension.java

@@ -82,16 +82,22 @@ private void collectResourceClasses(@Observes @WithAnnotations(Path.class) Proce
     public List<JaxRsApplication> applicationsToRun() {
         if (applications.isEmpty() && applicationMetas.isEmpty()) {
             // create a synthetic application from all resource classes
-            applicationMetas.add(JaxRsApplication.builder()
-                                         .applicationClass(Application.class)
-                                         .config(ResourceConfig.forApplication(new Application() {
-                                             @Override
-                                             public Set<Class<?>> getClasses() {
-                                                 return new HashSet<>(resources);
-                                             }
-                                         }))
-                                         .appName("SyntheticApplication")
-                                         .build());
+            // the classes set must be created before the lambda, as resources are cleared later on
+            if (resources.isEmpty()) {
+                LOGGER.warning("There are no JAX-RS applications or resources. Maybe you forgot META-INF/beans.xml file?");
+            } else {
+                Set<Class<?>> classes = new HashSet<>(resources);
+                applicationMetas.add(JaxRsApplication.builder()
+                                             .applicationClass(Application.class)
+                                             .config(ResourceConfig.forApplication(new Application() {
+                                                 @Override
+                                                 public Set<Class<?>> getClasses() {
+                                                     return classes;
+                                                 }
+                                             }))
+                                             .appName("SyntheticApplication")
+                                             .build());
+            }
         }
 
         // make sure the resources are used as a default if application does not define any

tests/functional/mp-synthetic-app/pom.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+
+  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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>helidon-tests-functional-project</artifactId>
+        <groupId>io.helidon.tests.functional</groupId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>helidon-tests-functional-mp-synthetic-app</artifactId>
+    <name>Helidon Functional Test: MP Synthetic Application</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.helidon.microprofile.bundles</groupId>
+            <artifactId>helidon-microprofile-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-client</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

tests/functional/mp-synthetic-app/src/main/java/io/helidon/tests/functional/mp/syntheticapp/ApplicationResource.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * 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 io.helidon.tests.functional.mp.syntheticapp;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ * Example JAX-RS resource that would be automatically picked-up to create a JAX-RS Synthetic Application.
+ */
+@Path("/mp/synthetic/app")
+@ApplicationScoped
+public class ApplicationResource {
+    @GET
+    public String testEndpoint() {
+        return "app-tested";
+    }
+}

tests/functional/mp-synthetic-app/src/main/java/io/helidon/tests/functional/mp/syntheticapp/DependentResource.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * 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 io.helidon.tests.functional.mp.syntheticapp;
+
+import javax.enterprise.context.Dependent;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ * Example JAX-RS resource that would be automatically picked-up to create a JAX-RS Synthetic Application.
+ */
+@Path("/mp/synthetic/dep")
+@Dependent
+public class DependentResource {
+    @GET
+    public String testEndpoint() {
+        return "dep-tested";
+    }
+}

tests/functional/mp-synthetic-app/src/main/java/io/helidon/tests/functional/mp/syntheticapp/MpSyntheticAppMain.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * 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 io.helidon.tests.functional.mp.syntheticapp;
+
+import javax.enterprise.inject.spi.CDI;
+
+import io.helidon.microprofile.cdi.Main;
+import io.helidon.microprofile.server.ServerCdiExtension;
+
+/**
+ * Main class to start this test.
+ */
+public class MpSyntheticAppMain {
+    public static void main(String[] args) {
+        Main.main(args);
+        System.out.println("Started on port: " + CDI.current().getBeanManager().getExtension(ServerCdiExtension.class)
+                .port());
+    }
+}

tests/functional/mp-synthetic-app/src/main/java/io/helidon/tests/functional/mp/syntheticapp/NoCdiAnnotResource.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * 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 io.helidon.tests.functional.mp.syntheticapp;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ * Example JAX-RS resource that would be automatically picked-up to create a JAX-RS Synthetic Application.
+ */
+@Path("/mp/synthetic/path")
+public class NoCdiAnnotResource {
+    @GET
+    public String testEndpoint() {
+        return "path-tested";
+    }
+}

tests/functional/mp-synthetic-app/src/main/java/io/helidon/tests/functional/mp/syntheticapp/RequestResource.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * 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 io.helidon.tests.functional.mp.syntheticapp;
+
+import javax.enterprise.context.RequestScoped;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ * Example JAX-RS resource that would be automatically picked-up to create a JAX-RS Synthetic Application.
+ */
+@Path("/mp/synthetic/req")
+@RequestScoped
+public class RequestResource {
+    @GET
+    public String testEndpoint() {
+        return "req-tested";
+    }
+}

tests/functional/mp-synthetic-app/src/main/java/io/helidon/tests/functional/mp/syntheticapp/package-info.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * 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.
+ */
+/**
+ * Functional test to make sure synthetic apps work.
+ */
+package io.helidon.tests.functional.mp.syntheticapp;

tests/functional/mp-synthetic-app/src/main/resources/META-INF/beans.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+
+  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.
+  -->
+
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+        xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+                           http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+        bean-discovery-mode="annotated">
+</beans>

tests/functional/mp-synthetic-app/src/main/resources/META-INF/microprofile-config.properties

@@ -0,0 +1,16 @@
+#
+# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# 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.
+#
+server.port=0

tests/functional/mp-synthetic-app/src/main/resources/logging.properties

@@ -0,0 +1,35 @@
+#
+# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# 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.
+#
+handlers=io.helidon.common.HelidonConsoleHandler
+# HelidonConsoleHandler uses a SimpleFormatter subclass that replaces "!thread!" with the current thread
+# java.util.logging.SimpleFormatter.format=%1$tY.%1$tm.%1$td %1$tH:%1$tM:%1$tS %4$s %3$s !thread!: %5$s%6$s%n
+# Global logging level. Can be overridden by specific loggers
+.level=WARNING
+io.helidon.level=INFO
+# Helidon Web Server has a custom log formatter that extends SimpleFormatter.
+# It replaces "!thread!" with the current thread name
+#java.util.logging.ConsoleHandler.level=ALL
+io.helidon.common.HelidonConsoleHandler.level=ALL
+#java.util.logging.ConsoleHandler.formatter=io.helidon.webserver.WebServerLogFormatter
+java.util.logging.SimpleFormatter.format=%1$tY.%1$tm.%1$td %1$tH:%1$tM:%1$tS %4$s %3$s !thread!: %5$s%6$s%n
+AUDIT.level=FINEST
+io.helidon.webserver.level=WARNING
+io.helidon.webserver.accesslog.AccessLogHandler.level=FINEST
+io.helidon.webserver.accesslog.AccessLogHandler.pattern=access.log
+io.helidon.webserver.accesslog.AccessLogHandler.append=true
+io.helidon.webserver.AccessLog.level=INFO
+io.helidon.webserver.AccessLog.useParentHandlers=false
+io.helidon.webserver.AccessLog.handlers=io.helidon.webserver.accesslog.AccessLogHandler