AQ messaging example update (#100)

* AQ messaging example update * Run tests on random ports
helidon-io · Dec 4, 2024 · 1d4a9d7 · 1d4a9d7
1 parent d433b18
commit 1d4a9d7
Show file tree

Hide file tree

Showing 23 changed files with 401 additions and 215 deletions.
diff --git a/examples/dbclient/jdbc/src/main/java/io/helidon/examples/dbclient/jdbc/JdbcExampleMain.java b/examples/dbclient/jdbc/src/main/java/io/helidon/examples/dbclient/jdbc/JdbcExampleMain.java
@@ -46,12 +46,14 @@ public static void main(String[] args) {
         LogConfig.configureRuntime();
 
         // Prepare routing for the server
-        WebServer server = setupServer(WebServer.builder());
+        WebServer server = setupServer(WebServer.builder())
+                .build()
+                .start();
 
         System.out.println("WEB server is up! http://localhost:" + server.port() + "/");
     }
 
-    static WebServer setupServer(WebServerConfig.Builder builder) {
+    static WebServerConfig.Builder setupServer(WebServerConfig.Builder builder) {
         // By default, this will pick up application.yaml from the classpath
         Config config = Config.global();
 
@@ -68,8 +70,6 @@ static WebServer setupServer(WebServerConfig.Builder builder) {
         return builder
                 .config(config.get("server"))
                 .addFeature(observe)
-                .routing(routing -> routing.register("/db", new PokemonService(dbClient)))
-                .build()
-                .start();
+                .routing(routing -> routing.register("/db", new PokemonService(dbClient)));
     }
 }
diff --git a/...ient/jdbc/src/test/java/io/helidon/examples/dbclient/jdbc/AbstractPokemonServiceTest.java b/...ient/jdbc/src/test/java/io/helidon/examples/dbclient/jdbc/AbstractPokemonServiceTest.java
@@ -41,7 +41,11 @@ abstract class AbstractPokemonServiceTest {
     private static WebClient client;
 
     static void beforeAll() {
-        server = JdbcExampleMain.setupServer(WebServer.builder());
+        server = JdbcExampleMain.setupServer(WebServer.builder())
+                .port(-1)
+                .build()
+                .start();
+
         client = WebClient.create(config -> config.baseUri("http://localhost:" + server.port())
                 .addMediaSupport(JsonpSupport.create()));
     }

diff --git a/...dbclient/mongodb/src/main/java/io/helidon/examples/dbclient/mongo/MongoDbExampleMain.java b/...dbclient/mongodb/src/main/java/io/helidon/examples/dbclient/mongo/MongoDbExampleMain.java
@@ -56,20 +56,20 @@ static WebServer startServer() {
         // load logging configuration
         LogConfig.configureRuntime();
 
-        WebServer server = setupServer(WebServer.builder());
+        WebServer server = setupServer(WebServer.builder())
+                .build()
+                .start();
 
         System.out.println("WEB server is up! http://localhost:" + server.port() + "/");
         return server;
     }
 
-    static WebServer setupServer(WebServerConfig.Builder builder) {
+    static WebServerConfig.Builder setupServer(WebServerConfig.Builder builder) {
         // By default, this will pick up application.yaml from the classpath
         Config config = Config.create();
 
         return builder.routing(routing -> routing(routing, config))
-                .config(config.get("server"))
-                .build()
-                .start();
+                .config(config.get("server"));
     }
 
     /**

diff --git a/examples/dbclient/mongodb/src/test/java/io/helidon/examples/dbclient/mongo/MainIT.java b/examples/dbclient/mongodb/src/test/java/io/helidon/examples/dbclient/mongo/MainIT.java
@@ -58,7 +58,11 @@ public class MainIT {
     static void beforeAll() {
         String url = String.format("mongodb://127.0.0.1:%s/pokemon", container.getMappedPort(27017));
         System.setProperty(CONNECTION_URL_KEY, url);
-        server = MongoDbExampleMain.setupServer(WebServer.builder());
+        server = MongoDbExampleMain.setupServer(WebServer.builder())
+                .port(-1)
+                .build()
+                .start();
+
         client = WebClient.create(config -> config.baseUri("http://localhost:" + server.port())
                 .addMediaSupport(JsonbSupport.create(Config.create()))
                 .addMediaSupport(JsonpSupport.create()));

diff --git a/examples/dbclient/pokemons/src/main/java/io/helidon/examples/dbclient/pokemons/Main.java b/examples/dbclient/pokemons/src/main/java/io/helidon/examples/dbclient/pokemons/Main.java
@@ -74,12 +74,14 @@ private static void startServer() {
         Config config = mongo ? Config.create(ConfigSources.classpath(MONGO_CFG)) : Config.create();
         Config.global(config);
 
-        WebServer server = setupServer(WebServer.builder());
+        WebServer server = setupServer(WebServer.builder())
+                .build()
+                .start();
 
         System.out.println("WEB server is up! http://localhost:" + server.port() + "/");
     }
 
-    static WebServer setupServer(WebServerConfig.Builder builder) {
+    static WebServerConfig.Builder setupServer(WebServerConfig.Builder builder) {
 
         Config config = Config.global();
         // Client services are added through a service loader - see mongoDB example for explicit services
@@ -94,9 +96,7 @@ static WebServer setupServer(WebServerConfig.Builder builder) {
                 .build();
         return builder.config(config.get("server"))
                 .addFeature(observe)
-                .routing(Main::routing)
-                .build()
-                .start();
+                .routing(Main::routing);
     }
 
     /**

diff --git a/...emons/src/test/java/io/helidon/examples/dbclient/pokemons/AbstractPokemonServiceTest.java b/...emons/src/test/java/io/helidon/examples/dbclient/pokemons/AbstractPokemonServiceTest.java
@@ -42,7 +42,11 @@ abstract class AbstractPokemonServiceTest {
     private static WebClient client;
 
     static void beforeAll() {
-        server = Main.setupServer(WebServer.builder());
+        server = Main.setupServer(WebServer.builder())
+                .port(-1)
+                .build()
+                .start();
+
         client = WebClient.create(config -> config.baseUri("http://localhost:" + server.port())
                 .addMediaSupport(JsonpSupport.create()));
     }

diff --git a/examples/messaging/README.md b/examples/messaging/README.md
@@ -26,16 +26,10 @@ docker run --name='activemq' --rm -p 61616:61616 -p 8161:8161 rmohr/activemq
 ### Test Oracle database
 * Start ActiveMQ server locally: 
 ```shell
-cd ./docker/oracle-aq-18-xe
+cd ./docker/oracle-aq
 ./buildAndRun.sh
 ```
 
-For stopping Oracle database container use:
-```shell
-cd ./docker/oracle-aq-18-xe
-./stopAndClean.sh
-```
-
 ## Helidon SE Reactive Messaging with Kafka Example
 For demonstration of Helidon SE Messaging with Kafka connector, 
 continue to [Kafka with WebSocket SE Example](kafka-websocket-se/README.md)

diff --git a/examples/messaging/docker/oracle-aq-18-xe/buildAndRun.sh b/examples/messaging/docker/oracle-aq-18-xe/buildAndRun.sh
diff --git a/...ssaging/docker/oracle-aq-18-xe/Dockerfile → ...les/messaging/docker/oracle-aq/Dockerfile b/...ssaging/docker/oracle-aq-18-xe/Dockerfile → ...les/messaging/docker/oracle-aq/Dockerfile
@@ -13,8 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+FROM container-registry.oracle.com/database/express:latest
 
-FROM oracle/database:18.4.0-xe as base
-
-
-COPY init.sql /docker-entrypoint-initdb.d/setup/
+ENV "ORACLE_PWD"="frank"
+ENV "ORACLE_ALLOW_REMOTE"="true"
+ENV "ORACLE_SID"="XE"
+ENV "PORT"="1521"
+COPY ["init.sql","/opt/oracle/scripts/startup/"]
+EXPOSE 1521
diff --git a/...ng/docker/oracle-aq-18-xe/stopAndClean.sh → ...messaging/docker/oracle-aq/buildAndRun.sh b/...ng/docker/oracle-aq-18-xe/stopAndClean.sh → ...messaging/docker/oracle-aq/buildAndRun.sh
@@ -15,6 +15,8 @@
 # limitations under the License.
 #
 
-docker stop oracle-aq-example
-docker container rm oracle-aq-example
-docker image rm helidon/oracle-aq-example:latest
+IMAGE_NAME=helidon/oracle-aq-example
+CONTAINER_NAME=oracle-aq-example
+
+docker build -t ${IMAGE_NAME} . -f Dockerfile
+docker run -p 1521:1521 --rm --name ${CONTAINER_NAME} ${IMAGE_NAME}
diff --git a/...aging/docker/oracle-aq-18-xe/examples.sql → ...s/messaging/docker/oracle-aq/examples.sql b/...aging/docker/oracle-aq-18-xe/examples.sql → ...s/messaging/docker/oracle-aq/examples.sql
diff --git a/...messaging/docker/oracle-aq-18-xe/init.sql → examples/messaging/docker/oracle-aq/init.sql b/...messaging/docker/oracle-aq-18-xe/init.sql → examples/messaging/docker/oracle-aq/init.sql
diff --git a/examples/messaging/oracle-aq-websocket-mp/pom.xml b/examples/messaging/oracle-aq-websocket-mp/pom.xml
@@ -17,8 +17,8 @@
   -->
 
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.helidon.applications</groupId>
@@ -34,7 +34,7 @@
     <dependencies>
         <dependency>
             <groupId>io.helidon.microprofile.bundles</groupId>
-            <artifactId>helidon-microprofile</artifactId>
+            <artifactId>helidon-microprofile-core</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.microprofile.messaging</groupId>
@@ -53,12 +53,59 @@
             <groupId>io.helidon.microprofile.websocket</groupId>
             <artifactId>helidon-microprofile-websocket</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.logging</groupId>
+            <artifactId>helidon-logging-jul</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jul-to-slf4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.smallrye</groupId>
             <artifactId>jandex</artifactId>
             <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>oracle-xe</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.microprofile.testing</groupId>
+            <artifactId>helidon-microprofile-testing-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.messaging.mock</groupId>
+            <artifactId>helidon-messaging-mock</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>5.11.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -72,6 +119,27 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>io.smallrye</groupId>
+                <artifactId>jandex-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>make-index</id>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>