fix app tests failure

.github/workflows/java-ci.yml

@@ -39,15 +39,6 @@ jobs:
  with:
  distribution: 'graalvm'
  java-version: ${{ env.JAVA }}
- - name: Start NATS server
- run: |
- docker run -d -p 4222:4222 -p 6222:6222 -p 8222:8222 nats
- - name: Wait NATS Server to be ready
- run: |
- until nc -z localhost 4222; do
- echo "waitingfor Nats server to be ready..."
- sleep 1
- done
  - name: Build and test
  working-directory: src/${{ matrix.project-path }}
  run: |

src/orders/app/build.gradle

@@ -2,6 +2,7 @@ plugins {
  id("com.github.johnrengelman.shadow") version "8.1.1"
  id("io.micronaut.application") version "4.3.4"
  id("io.micronaut.aot") version "4.3.4"
+ id("io.micronaut.test-resources") version "4.3.4"
 }
 
 group = "micronaut.mushop"
@@ -36,60 +37,12 @@ dependencies {
  annotationProcessor("io.micronaut.validation:micronaut-validation-processor")
  annotationProcessor("io.micronaut.tracing:micronaut-tracing-opentelemetry-annotation")
 
-
-
-
-
-
-
-
- // annotationProcessor("io.micronaut:micronaut-inject-java")
-
-
-
- // implementation("io.micronaut.data:micronaut-data-tx-hibernate")
  implementation("io.micronaut.serde:micronaut-serde-jackson")
  implementation("io.micronaut.validation:micronaut-validation")
  implementation("jakarta.validation:jakarta.validation-api")
  implementation("io.micronaut:micronaut-retry")
-
-// implementation("io.micronaut:micronaut-jackson-databind")
-
-
-
-
-// implementation("io.micronaut.reactor:micronaut-reactor-http-client")
- // compileOnly("io.micronaut:micronaut-http-client")
- compileOnly("io.micronaut.openapi:micronaut-openapi-annotations")
- // compileOnly("io.micronaut:micronaut-http-client")
- // compileOnly("io.micronaut:micronaut-http-validation")
-
- // runtimeOnly("io.micronaut:micronaut-core")
- runtimeOnly("org.yaml:snakeyaml")
- testImplementation("io.micronaut:micronaut-http-client")
- // testImplementation("org.testcontainers:testcontainers")
- // testImplementation("io.micronaut.testresources:micronaut-test-resources-extensions-junit-platform")
- // implementation("io.micronaut:micronaut-inject-java:4.4.0")
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- implementation("org.mapstruct:mapstruct:1.5.5.Final")
-
  implementation("io.micronaut:micronaut-http-client")
- implementation("io.micronaut:micronaut-runtime")
- // implementation("io.micronaut:micronaut-validation")
+ implementation("org.mapstruct:mapstruct:1.5.5.Final")
 
  // Metrics
  implementation("io.micronaut:micronaut-management")
@@ -115,11 +68,14 @@ dependencies {
  // Swagger
  implementation("io.swagger.core.v3:swagger-annotations")
 
+ compileOnly("io.micronaut.openapi:micronaut-openapi-annotations")
+ runtimeOnly("org.yaml:snakeyaml")
  runtimeOnly("ch.qos.logback:logback-classic")
 
  testImplementation(project(":tck"))
  testImplementation("com.openpojo:openpojo:0.9.1")
- testImplementation("org.testcontainers:junit-jupiter")
+ testImplementation("io.micronaut:micronaut-http-client")
+
 }
 
 application {

src/orders/app/src/main/java/mushop/orders/repositories/CustomerOrderRepository.java

@@ -1,23 +1,23 @@
-/**
- * * Copyright © 2020, Oracle and/or its affiliates. All rights reserved.
- * * Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
- **/
-package mushop.orders.repositories;
-
-import io.micronaut.data.annotation.Join;
-import io.micronaut.data.annotation.Repository;
-import io.micronaut.data.jpa.repository.JpaRepository;
-import io.micronaut.data.model.Page;
-import io.micronaut.data.model.Pageable;
-import mushop.orders.entities.CustomerOrder;
-
-/**
- * Customer order repository.
- */
-@Repository
-public interface CustomerOrderRepository extends JpaRepository<CustomerOrder, Long> {
-
- @Join(value = "customer", type = Join.Type.FETCH)
- Page<CustomerOrder> findByCustomerId(String name, Pageable p);
-}
-
+/**
+ * * Copyright © 2020, Oracle and/or its affiliates. All rights reserved.
+ * * Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+ **/
+package mushop.orders.repositories;
+
+import io.micronaut.data.annotation.Join;
+import io.micronaut.data.annotation.Repository;
+import io.micronaut.data.jpa.repository.JpaRepository;
+import io.micronaut.data.model.Page;
+import io.micronaut.data.model.Pageable;
+import mushop.orders.entities.CustomerOrder;
+
+/**
+ * Customer order repository.
+ */
+@Repository
+public interface CustomerOrderRepository extends JpaRepository<CustomerOrder, Long> {
+
+ @Join(value = "customer", type = Join.Type.FETCH)
+ Page<CustomerOrder> findByCustomerId(String name, Pageable p);
+}
+

src/orders/app/src/main/resources/application-app.yml

@@ -1,7 +1,7 @@
-datasources:
- default:
- url: jdbc:h2:mem:devDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
- username: sa
- password: ''
- driverClassName: org.h2.Driver
- dialect: H2
+datasources:
+ default:
+ url: jdbc:h2:mem:devDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+ username: sa
+ password: ''
+ driverClassName: org.h2.Driver
+ dialect: H2

src/orders/app/src/main/resources/application.yml

@@ -40,12 +40,18 @@ mushop:
  orders: ${ORDERS_NEW:mushop-orders}
  shipments: ${ORDERS_SHIPPED:mushop-shipments}
 
-# nats:
-# addresses:
-# - nats://${NATS_HOST:localhost}:${NATS_PORT:4222}
+test-resources:
+ containers:
+ nats:
+ image-name: nats:latest
+ hostnames:
+ - nats.host
+ exposed-ports:
+ - nats.port: 4222
 nats:
  default:
- server: nats://${NATS_HOST:localhost}:${NATS_PORT:4222}
+ addresses:
+ - "nats://${nats.host}:${nats.port}"
 
 jpa:
  default:
@@ -54,3 +60,4 @@ jpa:
  hbm2ddl:
  auto: update
  show_sql: true
+

src/orders/aws/build.gradle

@@ -1,6 +1,8 @@
 plugins {
  id("com.github.johnrengelman.shadow") version "8.1.1"
  id("io.micronaut.application") version "4.3.4"
+ id("io.micronaut.aot") version "4.3.4"
+ id("io.micronaut.test-resources") version "4.3.4"
 }
 
 group = "micronaut.mushop"
@@ -15,21 +17,53 @@ micronaut {
  processing {
  incremental(true)
  annotations("mushop.orders.*")
+ }aot {
+ // Please review carefully the optimizations enabled below
+ // Check https://micronaut-projects.github.io/micronaut-aot/latest/guide/ for more details
+ optimizeServiceLoading = false
+ convertYamlToJava = false
+ precomputeOperations = true
+ cacheEnvironment = true
+ optimizeClassLoading = true
+ deduceEnvironment = true
+ optimizeNetty = true
+ replaceLogbackXml = true
  }
+// testResources {
+// enabled = true 
+// version = "2.5.0" // override Micronaut Test Resources version
+// explicitPort = 15471 // by default, uses a random port
+// inferClasspath = true // true by default
+// additionalModules.add(JDBC_MYSQL) // empty by default
+// clientTimeout = 60 // in seconds, maximum time to wait for resources to be available, 60s by default
+// serverIdleTimeoutMinutes = 60 // if the server doesn't receive any request for this amount of time, it will be shut down
+// sharedServer = true // false by default
+// sharedServerNamespace = 'custom' // unset by default
+// }
 }
 tasks.withType(Jar).configureEach { zip64 = true }
-
+test {
+ useJUnitPlatform()
+}
 dependencies {
  annotationProcessor("io.micronaut.data:micronaut-data-processor")
  annotationProcessor ("io.micronaut:micronaut-inject-java")
  compileOnly ("io.micronaut:micronaut-inject-java:${micronautVersion}")
  testImplementation("io.micronaut:micronaut-inject-java:${micronautVersion}")
-
+ implementation("io.micronaut.data:micronaut-data-jdbc")
+ implementation("io.micronaut.sql:micronaut-jdbc-hikari")
+
  implementation(project(":app")) {
  exclude group:'com.h2database', module:'h2'
  }
-
+ testAnnotationProcessor "io.micronaut:micronaut-inject-java"
+
+ testImplementation("org.junit.jupiter:junit-jupiter-api")
+ testImplementation("io.micronaut.test:micronaut-test-junit5")
+ testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+ testImplementation("org.junit.jupiter:junit-jupiter-engine")
  implementation("org.slf4j:jcl-over-slf4j")
+ // runtimeOnly("ch.qos.logback:logback-classic")
 
  // Authentication
  implementation("software.amazon.awssdk:sts")
@@ -42,12 +76,14 @@ dependencies {
  implementation("io.micronaut.micrometer:micronaut-micrometer-registry-cloudwatch")
 
  // Database
- implementation("mysql:mysql-connector-java")
-
+ // implementation("mysql:mysql-connector-java")
+ runtimeOnly("mysql:mysql-connector-java")
  testImplementation(project(":tck"))
- testImplementation("io.micronaut.nats:micronaut-nats")
- testImplementation("org.testcontainers:junit-jupiter")
- testImplementation("org.testcontainers:mysql")
+ implementation("io.micronaut.nats:micronaut-nats")
+ // testImplementation("org.testcontainers:junit-jupiter")
+ // runtimeOnly("mysql:mysql-connector-java")
+ // testImplementation("org.testcontainers:junit-jupiter")
+ // testImplementation("org.testcontainers:mysql")
 }
 
 application {

src/orders/aws/src/main/resources/application-ec2.yml

@@ -1,10 +1,29 @@
-micronaut:
- metrics:
- export:
- cloudwatch:
- enabled: true
- namespace: ${AWS_METRICS_NAMESPACE:micronaut_mushop}
-
-datasources:
- default:
- driverClassName: com.mysql.cj.jdbc.Driver
+micronaut:
+ metrics:
+ export:
+ cloudwatch:
+ enabled: true
+ namespace: ${AWS_METRICS_NAMESPACE:micronaut_mushop}
+
+# datasources:
+# default:
+# driverClassName: com.mysql.cj.jdbc.Driver
+test-resources:
+ containers:
+ mssql:
+ accept-license: true
+ nats:
+ image-name: nats:latest
+ hostnames:
+ - nats.host
+ exposed-ports:
+ - nats.port: 4222
+nats:
+ default:
+ addresses:
+ - "nats://${nats.host}:${nats.port}"
+datasources:
+ default:
+ db-type: mysql
+ dialect: MYSQL
+ driver-class-name: com.mysql.cj.jdbc.Driver

src/orders/aws/src/test/java/mushop/orders/controller/HealthControllerTest.java

@@ -1,7 +1,7 @@
-package mushop.orders.controller;
-
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
-
-@MicronautTest
-public class HealthControllerTest extends AbstractHealthControllerTest {
-}
+package mushop.orders.controller;
+
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+
+@MicronautTest
+public class HealthControllerTest extends AbstractHealthControllerTest {
+}

src/orders/aws/src/test/java/mushop/orders/controller/OrderControllerTest.java

@@ -1,7 +1,7 @@
-package mushop.orders.controller;
-
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
-
-@MicronautTest
-public class OrderControllerTest extends AbstractOrderControllerTest {
-}
+package mushop.orders.controller;
+
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+
+@MicronautTest
+public class OrderControllerTest extends AbstractOrderControllerTest {
+}

src/orders/aws/src/test/resources/application-test.yml

@@ -1,10 +1,10 @@
-micronaut:
- metrics:
- export:
- cloudwatch:
- enabled: false
-
-datasources:
- default:
-  url: jdbc:tc:mysql:8:///db
-  driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
+micronaut:
+ metrics:
+ export:
+ cloudwatch:
+ enabled: false
+datasources:
+ default:
+  db-type: mysql
+ dialect: MYSQL
+ driver-class-name: com.mysql.cj.jdbc.Driver

src/orders/oci/build.gradle

@@ -1,6 +1,7 @@
 plugins {
  id("com.github.johnrengelman.shadow") version "8.1.1"
  id("io.micronaut.application") version "4.3.4"
+ id("io.micronaut.test-resources") version "4.3.4"
 }
 
 group = "micronaut.mushop"
@@ -43,7 +44,7 @@ dependencies {
 
  testImplementation(project(":tck"))
  testImplementation("io.micronaut.nats:micronaut-nats")
- testImplementation("org.testcontainers:junit-jupiter")
+ // testImplementation("org.testcontainers:junit-jupiter")
  testImplementation("org.testcontainers:oracle-xe")
 }