fix: web jersey

Guilherme Biff Zarelli · Guilherme Biff Zarelli · commit 3614e3c9d979 · 2023-01-18T12:01:57.000-03:00
diff --git a/acceptance-test/pom.xml b/acceptance-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>modular-architecture</artifactId>
         <groupId>br.com.helpdev</groupId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.0.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/acceptance-test/src/test/java/br/com/helpdev/atdd/DefaultContainerStarterTest.java b/acceptance-test/src/test/java/br/com/helpdev/atdd/DefaultContainerStarterTest.java
@@ -67,7 +67,7 @@ private static GenericContainer<?> buildAppContainer(final Startable... dependsO
         .withEnv("MYSQL_URL", "jdbc:mysql://testdb:" + MySQLContainer.MYSQL_PORT + "/test?autoReconnect=true&useSSL=false")
         .withExposedPorts(8080)
         //TODO: change to: '/actuator/health' if you use spring
-        .waitingFor(Wait.forHttp("/q/health/ready").forStatusCode(200))
+        .waitingFor(Wait.forHttp("/actuator/health").forStatusCode(200))
         .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("APP_CONTAINER")));
   }
 
diff --git a/adapter/input/jaxrs-controller-v1/pom.xml b/adapter/input/jaxrs-controller-v1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>modular-architecture</artifactId>
         <groupId>br.com.helpdev</groupId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.0.4-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/adapter/output/jpa-mysql-repository/pom.xml b/adapter/output/jpa-mysql-repository/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>modular-architecture</artifactId>
         <groupId>br.com.helpdev</groupId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.0.4-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/adapter/output/restclient-http-services/pom.xml b/adapter/output/restclient-http-services/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>modular-architecture</artifactId>
         <groupId>br.com.helpdev</groupId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.0.4-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/app/quarkus-app/pom.xml b/app/quarkus-app/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>modular-architecture</artifactId>
         <groupId>br.com.helpdev</groupId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.0.4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/app/quarkus-app/src/main/resources/application.properties b/app/quarkus-app/src/main/resources/application.properties
@@ -1,12 +1,12 @@
+# DI use-case
+quarkus.index-dependency.use-case.group-id=br.com.helpdev
+quarkus.index-dependency.use-case.artifact-id=use-case
 # DI output
 quarkus.index-dependency.restclient-http-services.group-id=br.com.helpdev
 quarkus.index-dependency.restclient-http-services.artifact-id=restclient-http-services
 #
 quarkus.index-dependency.jpa-mysql-repository.group-id=br.com.helpdev
 quarkus.index-dependency.jpa-mysql-repository.artifact-id=jpa-mysql-repository
-# DI use-case
-quarkus.index-dependency.use-case.group-id=br.com.helpdev
-quarkus.index-dependency.use-case.artifact-id=use-case
 # DI input
 quarkus.index-dependency.jaxrs-controller-v1.group-id=br.com.helpdev
 quarkus.index-dependency.jaxrs-controller-v1.artifact-id=jaxrs-controller-v1
diff --git a/app/spring-app/pom.xml b/app/spring-app/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>modular-architecture</artifactId>
         <groupId>br.com.helpdev</groupId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.0.4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -31,6 +31,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -41,11 +48,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jaxrs-controller-v1</artifactId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -56,8 +59,8 @@
             <artifactId>jpa-mysql-repository</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>jaxrs-controller-v1</artifactId>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
@@ -81,7 +84,6 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
         </dependency>
-
         <dependency>
             <groupId>net.logstash.logback</groupId>
             <artifactId>logstash-logback-encoder</artifactId>
@@ -90,12 +92,10 @@
     </dependencies>
 
     <build>
-        <finalName>spring-application</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring-boot.version}</version>
                 <configuration>
                     <mainClass>br.com.helpdev.SpringSampleApplication</mainClass>
                     <layers>
diff --git a/app/spring-app/src/layers.xml b/app/spring-app/src/layers.xml
@@ -12,12 +12,16 @@
 		<into layer="snapshot-dependencies">
 			<include>*:*:*SNAPSHOT</include>
 		</into>
+		<into layer="internal-dependencies">
+			<include>br.com.helpdev:*:*</include>
+		</into>
 		<into layer="dependencies" />
 	</dependencies>
 	<layerOrder>
 		<layer>dependencies</layer>
 		<layer>spring-boot-loader</layer>
+		<layer>internal-dependencies</layer>
 		<layer>snapshot-dependencies</layer>
 		<layer>application</layer>
 	</layerOrder>
-</layers>
+</layers>
diff --git a/app/spring-app/src/main/java/br/com/helpdev/SpringSampleApplication.java b/app/spring-app/src/main/java/br/com/helpdev/SpringSampleApplication.java
@@ -1,11 +1,13 @@
 package br.com.helpdev;
 
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication(
     scanBasePackages = {"br.com.helpdev"}
 )
+@EnableAutoConfiguration
 public class SpringSampleApplication {
 
   public static void main(String[] args) {
diff --git a/app/spring-app/src/main/java/br/com/helpdev/config/WebJerseyConfiguration.java b/app/spring-app/src/main/java/br/com/helpdev/config/WebJerseyConfiguration.java
@@ -1,30 +1,27 @@
 package br.com.helpdev.config;
 
-import java.util.Objects;
-import java.util.stream.Collectors;
 import javax.ws.rs.Path;
 import javax.ws.rs.ext.Provider;
+import lombok.extern.slf4j.Slf4j;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
-import org.springframework.util.ClassUtils;
 
 @Configuration
+@Slf4j
 public class WebJerseyConfiguration extends ResourceConfig {
 
   public WebJerseyConfiguration() {
-    packages("br.com.helpdev.controller");
     var scanner = new ClassPathScanningCandidateComponentProvider(false);
     scanner.addIncludeFilter(new AnnotationTypeFilter(Provider.class));
     scanner.addIncludeFilter(new AnnotationTypeFilter(Path.class));
-    registerClasses(
-        scanner.findCandidateComponents("br.com.helpdev.controller").stream()
-            .map(
-                beanDefinition ->
-                    ClassUtils.resolveClassName(
-                        Objects.requireNonNull(beanDefinition.getBeanClassName()),
-                        getClassLoader()))
-            .collect(Collectors.toSet()));
+    scanner.findCandidateComponents("br.com.helpdev.controller").forEach(beanDefinition -> {
+      try {
+        register(Class.forName(beanDefinition.getBeanClassName()));
+      } catch (ClassNotFoundException e) {
+        log.warn("Failed to register: {}", beanDefinition.getBeanClassName());
+      }
+    });
   }
 }
diff --git a/app/spring-app/src/main/resources/application.properties b/app/spring-app/src/main/resources/application.properties
@@ -1,4 +1,5 @@
 spring.jpa.hibernate.ddl-auto=update
+spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
 spring.datasource.url=${MYSQL_URL:jdbc:mysql://localhost:3306/sample}
 spring.datasource.username=${MYSQL_USER:user}
 spring.datasource.password=${MYSQL_PASSWORD:pass123}
diff --git a/core/domain/pom.xml b/core/domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>modular-architecture</artifactId>
         <groupId>br.com.helpdev</groupId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.0.4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/core/use-case/pom.xml b/core/use-case/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>modular-architecture</artifactId>
         <groupId>br.com.helpdev</groupId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.0.4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
     <artifactId>modular-architecture</artifactId>
 
     <packaging>pom</packaging>
-    <version>0.0.3-SNAPSHOT</version>
+    <version>0.0.4-SNAPSHOT</version>
 
     <profiles>
         <profile>
@@ -35,7 +35,8 @@
         <profile>
             <id>spring</id>
             <properties>
-                <spring-boot.version>2.7.7</spring-boot.version>
+                <spring-boot.version>2.7.1</spring-boot.version>
+                <spring-cloud.version>2021.0.3</spring-cloud.version>
             </properties>
 
             <modules>
@@ -72,7 +73,6 @@
         <!-- Build / Plugins -->
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
         <maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
-        <maven-dependency-plugin.version>3.3.0</maven-dependency-plugin.version>
         <spotbugs-maven-plugin.version>4.5.3.0</spotbugs-maven-plugin.version>
         <spotbugs.version>4.5.3</spotbugs.version>
         <checkstyle-version>8.39</checkstyle-version>
@@ -101,7 +101,7 @@
 
         <!-- Others -->
         <jersey.version>2.32</jersey.version>
-        <lombok.version>1.18.20</lombok.version>
+        <lombok.version>1.18.24</lombok.version>
 
         <slf4j.version>1.7.36</slf4j.version>
         <logback-core.version>1.2.3</logback-core.version>
@@ -110,7 +110,6 @@
         <rest-assured.version>4.3.3</rest-assured.version>
         <jackson-databind.version>2.13.4.2</jackson-databind.version>
         <jackson-datatype.version>2.14.1</jackson-datatype.version>
-        <modelmapper.version>2.3.0</modelmapper.version>
     </properties>
 
     <dependencies>
@@ -187,11 +186,6 @@
                 <version>${microprofile-rest-api.version}</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>org.modelmapper</groupId>
-                <artifactId>modelmapper</artifactId>
-                <version>${modelmapper.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
@@ -331,17 +325,6 @@
                 </dependencies>
             </plugin>
 
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                    <compilerArgs>
-                        <arg>-parameters</arg>
-                    </compilerArgs>
-                </configuration>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ private static GenericContainer<?> buildAppContainer(final Startable... dependsO`
`67`	`67`	`.withEnv("MYSQL_URL", "jdbc:mysql://testdb:" + MySQLContainer.MYSQL_PORT + "/test?autoReconnect=true&useSSL=false")`
`68`	`68`	`.withExposedPorts(8080)`
`69`	`69`	`//TODO: change to: '/actuator/health' if you use spring`
`70`		`- .waitingFor(Wait.forHttp("/q/health/ready").forStatusCode(200))`
	`70`	`+ .waitingFor(Wait.forHttp("/actuator/health").forStatusCode(200))`
`71`	`71`	`.withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("APP_CONTAINER")));`
`72`	`72`	`}`
`73`	`73`