fix: set env and port

Author: g-otn

pom.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<version>3.2.2</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>br.com.grupo63</groupId>
 	<artifactId>serviceorder</artifactId>
@@ -15,6 +16,10 @@
 	<description>FIAP SOAT1 2023 - Group 63 - Phase 4</description>
 	<properties>
 		<java.version>17</java.version>
+		<sonar.coverage.exclusions>
+			**/config/*,
+			**/dto/*DTO.*,
+		</sonar.coverage.exclusions>
 	</properties>
 	<repositories>
 		<repository>
@@ -114,7 +119,6 @@
 	</dependencies>
 
 	<build>
-		<finalName>app</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
@@ -127,6 +131,17 @@
 						</exclude>
 					</excludes>
 				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>build-info</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>io.github.git-commit-id</groupId>
+				<artifactId>git-commit-id-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
 		<resources>
@@ -163,16 +178,8 @@
 						<version>0.8.11</version>
 						<configuration>
 							<excludes>
-								<exclude>**/br/com/grupo63/serviceorder/controller/dto/ProductControllerDTO.class</exclude>
-								<exclude>**/br/com/grupo63/serviceorder/controller/dto/OrderItemControllerDTO.class</exclude>
-								<exclude>**/br/com/grupo63/serviceorder/controller/dto/OrderControllerDTO.class</exclude>
-								<exclude>**/br/com/grupo63/serviceorder/api/controller/order/dto/CreateOrderRequestDTO.class</exclude>
-								<exclude>**/br/com/grupo63/serviceorder/gateway/identification/dto/ClientDTO.class</exclude>
-								<exclude>**/br/com/grupo63/serviceorder/config/JwtFilterConfig.class</exclude>
-								<exclude>**/br/com/grupo63/serviceorder/config/JPAConfigurer.class</exclude>
-								<exclude>**/br/com/grupo63/serviceorder/config/JwtService.class</exclude>
-								<exclude>**/br/com/grupo63/serviceorder/config/JwtFilter.class</exclude>
-								<exclude>**/br/com/grupo63/serviceorder/config/ValidationConfig.class</exclude>
+								<exclude>**/dto/*DTO.*</exclude>
+								<exclude>**/config/**</exclude>
 								<exclude>**/br/com/grupo63/serviceorder/ServiceOrderApplication.class</exclude>
 							</excludes>
 						</configuration>
@@ -200,4 +207,4 @@
 			</build>
 		</profile>
 	</profiles>
-</project>
+</project>

src/main/java/br/com/grupo63/serviceorder/ServiceOrderApplication.java

@@ -1,12 +1,22 @@
 package br.com.grupo63.serviceorder;
 
+import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.enums.SecuritySchemeIn;
 import io.swagger.v3.oas.annotations.enums.SecuritySchemeType;
+import io.swagger.v3.oas.annotations.info.Info;
 import io.swagger.v3.oas.annotations.security.SecurityScheme;
+import io.swagger.v3.oas.annotations.servers.Server;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
+@OpenAPIDefinition(
+		info = @Info(title = "${info.name}", description = "${info.description}", version = "${info.version}"),
+		servers ={
+				@Server(url = "${server.servlet.context-path:}", description = "Current URL"),
+				@Server(url = "localhost:${server.port:8080}${server.servlet.context-path:}", description = "Localhost"),
+				@Server(url = "${app.docs-api-url:(no value)}${server.servlet.context-path:}", description = "Custom URL from env")
+		})
 @SecurityScheme(
 		name = "bearerAuth",
 		type = SecuritySchemeType.HTTP,

src/main/java/br/com/grupo63/serviceorder/gateway/identification/IIdentificationGateway.java

@@ -8,7 +8,7 @@
 
 import java.util.Optional;
 
-@FeignClient(name = "identification", url = "${urls.baseurl-identification}")
+@FeignClient(name = "identification", url = "${app.api-url.identification}")
 public interface IIdentificationGateway {
 
     @RequestMapping(method = RequestMethod.GET, value = "/identification/clients/{id}")

src/main/resources/application-dev.yml

@@ -23,9 +23,12 @@ jwt:
     key:
       public: "${JWT_PUBLIC_KEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqStd8n4SGNM0eZhV/hzU+urHA5/IMZPoP9YQ9ZcLKWiX33nI6bSuZMCrLZcJExf63xS+uxDpGxM8Mnk2zOdl+lPwANXLzP1us5P1PyA3YPycW9J7C5YTQW0GiEL3M93ZX7vMJiVoBYblP3JPlYnoYlBORuc0JPk33KtfEZP+78qXpPHM8imYrJLe8ceiDLLFDU/nh5KC2dWAy3ci1ahoJ1Q9ELhp3IZLvOTX57H/T2VKOYOya5+ST41h+JjzI+qGTVnLcKaW+k25YLlVnkSspvdx98+yQDi7kbOTS6yRZHUPD6wPk/nUozpD0nZKccoH4W+zMwmQVtsAA6JCA9gfGwIDAQAB}"
 
-urls:
-  baseurl-identification: '${BASE_URL_IDENTIFICATION:localhost:8081}'
-
 server:
   servlet:
-    context-path: "/order"
+    context-path: "/order"
+  port: 8002
+
+app:
+  docs-api-url: "${DOCS_API_URL:(no value)}"
+  api-url:
+    identification: "${API_URL_IDENTIFICATION:http://localhost:8001}"

src/main/resources/application-prod.yml

@@ -6,5 +6,3 @@ spring:
     username: ${DB_USERNAME:backend}
   devtools:
     add-properties: false
-urls:
-  baseurl: '/'

src/main/resources/application.yml

@@ -10,7 +10,7 @@ spring:
     show-sql: true
   profiles:
     # Value comes from Maven profile (pom.xml)
-    active: '@spring.profiles.active@'
+    active: "@spring.profiles.active@"
   flyway:
     locations: classpath:db/migrations/{vendor}/
     enabled: true
@@ -31,15 +31,21 @@ management:
   endpoint:
     health:
       show-components: always
+    shutdown:
+      enabled: true # For debugging
   endpoints:
     web:
       exposure:
-        include: health, info
-info:
-  name: '@project.name@'
-  description: '@project.description@'
-  version: '@project.version@'
+        include: health, info, metrics, shutdown
+
+# --- Custom keys ---
 
-docs:
-  api:
-    url: "${DOCS_API_URL:https://9ah1j49vm1.execute-api.us-east-2.amazonaws.com}"
+app:
+  docs-api-url: "${DOCS_API_URL:(no value)}"
+  api-url:
+    identification: ${API_URL_IDENTIFICATION}
+
+info:
+  name: "@project.name@"
+  description: "@project.description@"
+  version: "@project.version@"