diff --git a/acceptance-test/pom.xml b/acceptance-test/pom.xml index ef3b60a..b7f8fff 100644 --- a/acceptance-test/pom.xml +++ b/acceptance-test/pom.xml @@ -15,17 +15,16 @@ 17 17 true - 3.1.0 - 8.0.30 + 8.0.33 0.38.1 true - 2.35.0 + 3.0.0-beta-10 ${project.groupId} - jaxrs-controller-v1 + jakarta-controller-v1 org.junit.jupiter @@ -73,9 +72,9 @@ rest-assured-all - mysql - mysql-connector-java - ${mysql-connector-java.version} + com.mysql + mysql-connector-j + ${mysql-connector-j.version} com.github.javafaker @@ -84,8 +83,8 @@ com.github.tomakehurst - wiremock-jre8 - ${wiremock-jre8.version} + wiremock + ${wiremock.version} test diff --git a/adapter/input/jaxrs-controller-v1/pom.xml b/adapter/input/jakarta-controller-v1/pom.xml similarity index 78% rename from adapter/input/jaxrs-controller-v1/pom.xml rename to adapter/input/jakarta-controller-v1/pom.xml index f05c800..0e7ef5b 100644 --- a/adapter/input/jaxrs-controller-v1/pom.xml +++ b/adapter/input/jakarta-controller-v1/pom.xml @@ -10,13 +10,13 @@ 4.0.0 - jaxrs-controller-v1 + jakarta-controller-v1 17 17 - 2.2.6 - 2.1.5 + 2.2.14 + 2.2.15 @@ -25,19 +25,16 @@ lombok - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api io.swagger.core.v3 - swagger-core + swagger-core-jakarta ${swagger-core.version} compile - - javax.validation - validation-api - + ${project.groupId} domain @@ -85,32 +82,36 @@ + + - io.openapitools.swagger - swagger-maven-plugin + io.swagger.core.v3 + swagger-maven-plugin-jakarta ${swagger-maven-plugin.version} br.com.helpdev.controller - ${basedir}/target/resources/br/com/helpdev/controller - openapi - JSON,YAML + openapi + ${basedir}/target/resources/br/com/helpdev/controller + JSONANDYAML + true - generate-doc compile - generate + resolve + + org.apache.maven.plugins maven-resources-plugin - 2.6 + ${maven-resources-plugin.version} copy-resources diff --git a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/MessageController.java b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/MessageController.java similarity index 91% rename from adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/MessageController.java rename to adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/MessageController.java index 224c217..6d18846 100644 --- a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/MessageController.java +++ b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/MessageController.java @@ -13,16 +13,16 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; @Path("/v1/message") @Produces(MediaType.APPLICATION_JSON) diff --git a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/OpenApiController.java b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/OpenApiController.java similarity index 83% rename from adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/OpenApiController.java rename to adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/OpenApiController.java index a0ce4a6..0ed9ab6 100644 --- a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/OpenApiController.java +++ b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/OpenApiController.java @@ -4,12 +4,12 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.info.Contact; import io.swagger.v3.oas.annotations.info.Info; +import jakarta.inject.Named; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import java.io.InputStream; -import javax.inject.Named; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; @Named @Path("/v1/openapi") diff --git a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/config/CustomObjectMapperConfig.java b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/config/CustomObjectMapperConfig.java similarity index 100% rename from adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/config/CustomObjectMapperConfig.java rename to adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/config/CustomObjectMapperConfig.java diff --git a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/dto/ChatResponseDto.java b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/dto/ChatResponseDto.java similarity index 100% rename from adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/dto/ChatResponseDto.java rename to adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/dto/ChatResponseDto.java diff --git a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/dto/CommunicationChannelDto.java b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/dto/CommunicationChannelDto.java similarity index 100% rename from adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/dto/CommunicationChannelDto.java rename to adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/dto/CommunicationChannelDto.java diff --git a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/dto/ErrorDto.java b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/dto/ErrorDto.java similarity index 81% rename from adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/dto/ErrorDto.java rename to adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/dto/ErrorDto.java index 466df68..05c9200 100644 --- a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/dto/ErrorDto.java +++ b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/dto/ErrorDto.java @@ -3,9 +3,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import lombok.ToString; @Data @Builder diff --git a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/dto/MessageCreateDto.java b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/dto/MessageCreateDto.java similarity index 80% rename from adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/dto/MessageCreateDto.java rename to adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/dto/MessageCreateDto.java index 7d07e61..f322991 100644 --- a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/dto/MessageCreateDto.java +++ b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/dto/MessageCreateDto.java @@ -1,16 +1,14 @@ package br.com.helpdev.controller.dto; import com.fasterxml.jackson.annotation.JsonFormat; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.time.ZonedDateTime; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import lombok.ToString; @Data @Builder diff --git a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/dto/MessageResponseDto.java b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/dto/MessageResponseDto.java similarity index 100% rename from adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/dto/MessageResponseDto.java rename to adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/dto/MessageResponseDto.java diff --git a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/dto/RecipientDto.java b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/dto/RecipientDto.java similarity index 80% rename from adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/dto/RecipientDto.java rename to adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/dto/RecipientDto.java index c3e9b2f..ab1c438 100644 --- a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/dto/RecipientDto.java +++ b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/dto/RecipientDto.java @@ -1,13 +1,10 @@ package br.com.helpdev.controller.dto; -import br.com.helpdev.domain.Recipient; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import lombok.ToString; @Data @Builder diff --git a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/dto/StatusResponseDto.java b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/dto/StatusResponseDto.java similarity index 100% rename from adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/dto/StatusResponseDto.java rename to adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/dto/StatusResponseDto.java diff --git a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/handler/NotFoundExceptionMapper.java b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/handler/NotFoundExceptionMapper.java similarity index 81% rename from adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/handler/NotFoundExceptionMapper.java rename to adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/handler/NotFoundExceptionMapper.java index 910ca1a..0fe2965 100644 --- a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/handler/NotFoundExceptionMapper.java +++ b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/handler/NotFoundExceptionMapper.java @@ -2,9 +2,9 @@ import br.com.helpdev.controller.dto.ErrorDto; import br.com.helpdev.usecase.exception.MessageNotFoundException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; @Provider public class NotFoundExceptionMapper implements ExceptionMapper { diff --git a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/handler/NotificationExceptionMapper.java b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/handler/NotificationExceptionMapper.java similarity index 80% rename from adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/handler/NotificationExceptionMapper.java rename to adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/handler/NotificationExceptionMapper.java index 1b10be6..db32f11 100644 --- a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/handler/NotificationExceptionMapper.java +++ b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/handler/NotificationExceptionMapper.java @@ -2,9 +2,9 @@ import br.com.helpdev.controller.dto.ErrorDto; import br.com.helpdev.domain.exception.NotificationException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; @Provider public class NotificationExceptionMapper implements ExceptionMapper { diff --git a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/mapper/ControllerMessageMapper.java b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/mapper/ControllerMessageMapper.java similarity index 97% rename from adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/mapper/ControllerMessageMapper.java rename to adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/mapper/ControllerMessageMapper.java index f17d8e1..5952198 100644 --- a/adapter/input/jaxrs-controller-v1/src/main/java/br/com/helpdev/controller/mapper/ControllerMessageMapper.java +++ b/adapter/input/jakarta-controller-v1/src/main/java/br/com/helpdev/controller/mapper/ControllerMessageMapper.java @@ -13,11 +13,11 @@ import br.com.helpdev.domain.vo.MessageBody; import br.com.helpdev.domain.vo.MessageId; import br.com.helpdev.domain.vo.Phone; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; import java.util.Collection; import java.util.Collections; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Named; @Named @ApplicationScoped diff --git a/adapter/input/jaxrs-controller-v1/src/test/java/br/com/helpdev/controller/MessageControllerTest.java b/adapter/input/jakarta-controller-v1/src/test/java/br/com/helpdev/controller/MessageControllerTest.java similarity index 100% rename from adapter/input/jaxrs-controller-v1/src/test/java/br/com/helpdev/controller/MessageControllerTest.java rename to adapter/input/jakarta-controller-v1/src/test/java/br/com/helpdev/controller/MessageControllerTest.java diff --git a/adapter/input/jaxrs-controller-v1/src/test/java/br/com/helpdev/controller/OpenApiControllerTest.java b/adapter/input/jakarta-controller-v1/src/test/java/br/com/helpdev/controller/OpenApiControllerTest.java similarity index 99% rename from adapter/input/jaxrs-controller-v1/src/test/java/br/com/helpdev/controller/OpenApiControllerTest.java rename to adapter/input/jakarta-controller-v1/src/test/java/br/com/helpdev/controller/OpenApiControllerTest.java index 3fd0ac5..f9b338f 100644 --- a/adapter/input/jaxrs-controller-v1/src/test/java/br/com/helpdev/controller/OpenApiControllerTest.java +++ b/adapter/input/jakarta-controller-v1/src/test/java/br/com/helpdev/controller/OpenApiControllerTest.java @@ -1,3 +1,4 @@ + package br.com.helpdev.controller; import static org.assertj.core.api.Assertions.assertThat; diff --git a/adapter/input/jaxrs-controller-v1/src/test/java/br/com/helpdev/controller/handler/NotFoundExceptionMapperTest.java b/adapter/input/jakarta-controller-v1/src/test/java/br/com/helpdev/controller/handler/NotFoundExceptionMapperTest.java similarity index 100% rename from adapter/input/jaxrs-controller-v1/src/test/java/br/com/helpdev/controller/handler/NotFoundExceptionMapperTest.java rename to adapter/input/jakarta-controller-v1/src/test/java/br/com/helpdev/controller/handler/NotFoundExceptionMapperTest.java diff --git a/adapter/input/jaxrs-controller-v1/src/test/java/br/com/helpdev/controller/handler/NotificationExceptionMapperTest.java b/adapter/input/jakarta-controller-v1/src/test/java/br/com/helpdev/controller/handler/NotificationExceptionMapperTest.java similarity index 100% rename from adapter/input/jaxrs-controller-v1/src/test/java/br/com/helpdev/controller/handler/NotificationExceptionMapperTest.java rename to adapter/input/jakarta-controller-v1/src/test/java/br/com/helpdev/controller/handler/NotificationExceptionMapperTest.java diff --git a/adapter/input/jaxrs-controller-v1/src/test/java/br/com/helpdev/controller/mapper/ControllerMessageMapperTest.java b/adapter/input/jakarta-controller-v1/src/test/java/br/com/helpdev/controller/mapper/ControllerMessageMapperTest.java similarity index 100% rename from adapter/input/jaxrs-controller-v1/src/test/java/br/com/helpdev/controller/mapper/ControllerMessageMapperTest.java rename to adapter/input/jakarta-controller-v1/src/test/java/br/com/helpdev/controller/mapper/ControllerMessageMapperTest.java diff --git a/adapter/output/feign-http-services/pom.xml b/adapter/output/feign-http-services/pom.xml index 7c4b180..e7b38c2 100644 --- a/adapter/output/feign-http-services/pom.xml +++ b/adapter/output/feign-http-services/pom.xml @@ -17,7 +17,7 @@ 17 **/*Dto.* **.dto.* - 12.1 + 12.4 @@ -33,8 +33,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api com.fasterxml.jackson.core @@ -49,8 +49,8 @@ io.github.openfeign - feign-jaxrs - ${feign-jaxrs.version} + feign-jakarta + ${feign-jakarta.version} diff --git a/adapter/output/feign-http-services/src/main/java/br/com/helpdev/output/feign/ProtocolGeneratorClientImpl.java b/adapter/output/feign-http-services/src/main/java/br/com/helpdev/output/feign/ProtocolGeneratorClientImpl.java index 4a3e9d2..d152efa 100644 --- a/adapter/output/feign-http-services/src/main/java/br/com/helpdev/output/feign/ProtocolGeneratorClientImpl.java +++ b/adapter/output/feign-http-services/src/main/java/br/com/helpdev/output/feign/ProtocolGeneratorClientImpl.java @@ -3,9 +3,9 @@ import br.com.helpdev.output.feign.client.RandomDataApiClient; import br.com.helpdev.usecase.port.ProtocolGeneratorClient; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; @ApplicationScoped @Named diff --git a/adapter/output/feign-http-services/src/main/java/br/com/helpdev/output/feign/client/RandomDataApiClient.java b/adapter/output/feign-http-services/src/main/java/br/com/helpdev/output/feign/client/RandomDataApiClient.java index fbc5e03..4ce3862 100644 --- a/adapter/output/feign-http-services/src/main/java/br/com/helpdev/output/feign/client/RandomDataApiClient.java +++ b/adapter/output/feign-http-services/src/main/java/br/com/helpdev/output/feign/client/RandomDataApiClient.java @@ -1,8 +1,8 @@ package br.com.helpdev.output.feign.client; import br.com.helpdev.output.feign.client.dto.RandomIdNumberDto; -import javax.ws.rs.GET; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Produces; import org.springframework.cloud.openfeign.FeignClient; @FeignClient(name = "random-data-api", url = "${random-data-api.url}", path = "/api/id_number/random_id_number") diff --git a/adapter/output/feign-http-services/src/main/java/br/com/helpdev/output/feign/config/FeignContractConfiguration.java b/adapter/output/feign-http-services/src/main/java/br/com/helpdev/output/feign/config/FeignContractConfiguration.java index 0bce1bc..a47b1d0 100644 --- a/adapter/output/feign-http-services/src/main/java/br/com/helpdev/output/feign/config/FeignContractConfiguration.java +++ b/adapter/output/feign-http-services/src/main/java/br/com/helpdev/output/feign/config/FeignContractConfiguration.java @@ -1,7 +1,7 @@ package br.com.helpdev.output.feign.config; import feign.Contract; -import feign.jaxrs.JAXRSContract; +import feign.jaxrs.JakartaContract; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -15,7 +15,7 @@ public class FeignContractConfiguration { @Bean Contract contract() { - return new JAXRSContract(); + return new JakartaContract(); } } diff --git a/adapter/output/feign-http-services/src/test/java/br/com/helpdev/output/feign/config/FeignContractConfigurationTest.java b/adapter/output/feign-http-services/src/test/java/br/com/helpdev/output/feign/config/FeignContractConfigurationTest.java index 74ee284..4eddd07 100644 --- a/adapter/output/feign-http-services/src/test/java/br/com/helpdev/output/feign/config/FeignContractConfigurationTest.java +++ b/adapter/output/feign-http-services/src/test/java/br/com/helpdev/output/feign/config/FeignContractConfigurationTest.java @@ -1,13 +1,13 @@ package br.com.helpdev.output.feign.config; -import static org.assertj.core.api.Assertions.assertThat; - -import feign.jaxrs.JAXRSContract; +import feign.jaxrs.JakartaContract; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.junit.jupiter.MockitoExtension; +import static org.assertj.core.api.Assertions.assertThat; + @ExtendWith(MockitoExtension.class) class FeignContractConfigurationTest { @InjectMocks @@ -18,7 +18,7 @@ void shouldGeneratedNonNullJaxRsContract() { final var contract = feignContractConfiguration.contract(); assertThat(contract) - .isInstanceOf(JAXRSContract.class) + .isInstanceOf(JakartaContract.class) .isNotNull(); } } \ No newline at end of file diff --git a/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/MessageGateway.java b/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/MessageGateway.java index 61da72e..18cd34a 100644 --- a/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/MessageGateway.java +++ b/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/MessageGateway.java @@ -5,10 +5,10 @@ import br.com.helpdev.output.repository.entity.MessageEntityRepository; import br.com.helpdev.output.repository.mapper.MessageMapper; import br.com.helpdev.usecase.port.MessageRepository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; @Named @ApplicationScoped diff --git a/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/entity/ChatEntity.java b/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/entity/ChatEntity.java index 42d0e3f..5712852 100644 --- a/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/entity/ChatEntity.java +++ b/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/entity/ChatEntity.java @@ -1,17 +1,17 @@ package br.com.helpdev.output.repository.entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.time.ZonedDateTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/entity/MessageEntity.java b/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/entity/MessageEntity.java index 186313a..a8b78b1 100644 --- a/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/entity/MessageEntity.java +++ b/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/entity/MessageEntity.java @@ -1,19 +1,19 @@ package br.com.helpdev.output.repository.entity; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.time.ZonedDateTime; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/entity/MessageEntityRepository.java b/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/entity/MessageEntityRepository.java index c472590..cf580d1 100644 --- a/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/entity/MessageEntityRepository.java +++ b/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/entity/MessageEntityRepository.java @@ -1,11 +1,11 @@ package br.com.helpdev.output.repository.entity; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; @Named @ApplicationScoped diff --git a/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/entity/RecipientEntity.java b/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/entity/RecipientEntity.java index b96189b..bb22d34 100644 --- a/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/entity/RecipientEntity.java +++ b/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/entity/RecipientEntity.java @@ -1,7 +1,7 @@ package br.com.helpdev.output.repository.entity; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/mapper/MessageMapper.java b/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/mapper/MessageMapper.java index 6360920..2939c3e 100644 --- a/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/mapper/MessageMapper.java +++ b/adapter/output/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/mapper/MessageMapper.java @@ -14,12 +14,12 @@ import br.com.helpdev.output.repository.entity.MessageEntity; import br.com.helpdev.output.repository.entity.RecipientEntity; import br.com.helpdev.output.repository.entity.StatusEntity; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Named; @Named @ApplicationScoped diff --git a/adapter/output/jpa-mysql-repository/src/test/java/br/com/helpdev/output/repository/entity/MessageEntityRepositoryTest.java b/adapter/output/jpa-mysql-repository/src/test/java/br/com/helpdev/output/repository/entity/MessageEntityRepositoryTest.java index bfc51a7..f60c674 100644 --- a/adapter/output/jpa-mysql-repository/src/test/java/br/com/helpdev/output/repository/entity/MessageEntityRepositoryTest.java +++ b/adapter/output/jpa-mysql-repository/src/test/java/br/com/helpdev/output/repository/entity/MessageEntityRepositoryTest.java @@ -5,7 +5,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/adapter/output/restclient-http-services/pom.xml b/adapter/output/restclient-http-services/pom.xml index 6c8716b..b8d3319 100644 --- a/adapter/output/restclient-http-services/pom.xml +++ b/adapter/output/restclient-http-services/pom.xml @@ -21,8 +21,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api org.eclipse.microprofile.rest.client diff --git a/adapter/output/restclient-http-services/src/main/java/br/com/helpdev/output/restclient/ProtocolGeneratorClientImpl.java b/adapter/output/restclient-http-services/src/main/java/br/com/helpdev/output/restclient/ProtocolGeneratorClientImpl.java index 697230a..a0bc96f 100644 --- a/adapter/output/restclient-http-services/src/main/java/br/com/helpdev/output/restclient/ProtocolGeneratorClientImpl.java +++ b/adapter/output/restclient-http-services/src/main/java/br/com/helpdev/output/restclient/ProtocolGeneratorClientImpl.java @@ -3,9 +3,9 @@ import br.com.helpdev.output.restclient.client.RandomDataApiClient; import br.com.helpdev.usecase.port.ProtocolGeneratorClient; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.microprofile.rest.client.inject.RestClient; @ApplicationScoped diff --git a/adapter/output/restclient-http-services/src/main/java/br/com/helpdev/output/restclient/client/RandomDataApiClient.java b/adapter/output/restclient-http-services/src/main/java/br/com/helpdev/output/restclient/client/RandomDataApiClient.java index 95a4abc..c7e6729 100644 --- a/adapter/output/restclient-http-services/src/main/java/br/com/helpdev/output/restclient/client/RandomDataApiClient.java +++ b/adapter/output/restclient-http-services/src/main/java/br/com/helpdev/output/restclient/client/RandomDataApiClient.java @@ -1,9 +1,9 @@ package br.com.helpdev.output.restclient.client; import br.com.helpdev.output.restclient.client.dto.RandomIdNumberDto; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; @Path("/api/id_number/random_id_number") diff --git a/app/quarkus-app/pom.xml b/app/quarkus-app/pom.xml index 9c02e75..ad6e4c7 100644 --- a/app/quarkus-app/pom.xml +++ b/app/quarkus-app/pom.xml @@ -67,7 +67,7 @@ ${project.groupId} - jaxrs-controller-v1 + jakarta-controller-v1 ${project.groupId} @@ -124,7 +124,7 @@ org.jboss.jandex jandex-maven-plugin - 1.2.2 + 1.2.3 make-index diff --git a/app/quarkus-app/src/main/java/br/com/helpdev/quarkus/ObjectMapperConfig.java b/app/quarkus-app/src/main/java/br/com/helpdev/quarkus/ObjectMapperConfig.java index 7ae1082..b7c5f83 100644 --- a/app/quarkus-app/src/main/java/br/com/helpdev/quarkus/ObjectMapperConfig.java +++ b/app/quarkus-app/src/main/java/br/com/helpdev/quarkus/ObjectMapperConfig.java @@ -3,7 +3,7 @@ import br.com.helpdev.controller.config.CustomObjectMapperConfig; import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.jackson.ObjectMapperCustomizer; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class ObjectMapperConfig implements ObjectMapperCustomizer { diff --git a/app/quarkus-app/src/main/resources/application.properties b/app/quarkus-app/src/main/resources/application.properties index b05e4af..a7a0ee5 100644 --- a/app/quarkus-app/src/main/resources/application.properties +++ b/app/quarkus-app/src/main/resources/application.properties @@ -8,8 +8,8 @@ quarkus.index-dependency.restclient-http-services.artifact-id=restclient-http-se quarkus.index-dependency.jpa-mysql-repository.group-id=br.com.helpdev quarkus.index-dependency.jpa-mysql-repository.artifact-id=jpa-mysql-repository # DI input -quarkus.index-dependency.jaxrs-controller-v1.group-id=br.com.helpdev -quarkus.index-dependency.jaxrs-controller-v1.artifact-id=jaxrs-controller-v1 +quarkus.index-dependency.jakarta-controller-v1.group-id=br.com.helpdev +quarkus.index-dependency.jakarta-controller-v1.artifact-id=jakarta-controller-v1 # datasource configuration quarkus.datasource.db-kind=mysql quarkus.datasource.username=${MYSQL_USER:user} @@ -27,4 +27,4 @@ quarkus.smallrye-health.ui.enable=true quarkus.http.access-log.enabled=true # rest client br.com.helpdev.output.restclient.client.RandomDataApiClient/mp-rest/url=${RANDOM_DATA_API_URL:https://random-data-api.com} -br.com.helpdev.output.restclient.client.RandomDataApiClient/mp-rest/scope=javax.inject.Singleton \ No newline at end of file +br.com.helpdev.output.restclient.client.RandomDataApiClient/mp-rest/scope=jakarta.inject.Singleton \ No newline at end of file diff --git a/app/quarkus-app/src/test/resources/application.properties b/app/quarkus-app/src/test/resources/application.properties index b2e1ef0..63dc8d1 100644 --- a/app/quarkus-app/src/test/resources/application.properties +++ b/app/quarkus-app/src/test/resources/application.properties @@ -7,8 +7,8 @@ quarkus.index-dependency.jpa-mysql-repository.artifact-id=jpa-mysql-repository quarkus.index-dependency.use-case.group-id=br.com.helpdev quarkus.index-dependency.use-case.artifact-id=use-case # -quarkus.index-dependency.jaxrs-controller-v1.group-id=br.com.helpdev -quarkus.index-dependency.jaxrs-controller-v1.artifact-id=jaxrs-controller-v1 +quarkus.index-dependency.jakarta-controller-v1.group-id=br.com.helpdev +quarkus.index-dependency.jakarta-controller-v1.artifact-id=jakarta-controller-v1 # quarkus.datasource.db-kind=h2 quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test @@ -19,4 +19,4 @@ quarkus.hibernate-orm.log.bind-parameters=true quarkus.hibernate-orm.default.log.sql=true # rest client br.com.helpdev.output.restclient.client.RandomDataApiClient/mp-rest/url=https://random-data-api.com -br.com.helpdev.output.restclient.client.RandomDataApiClient/mp-rest/scope=javax.inject.Singleton \ No newline at end of file +br.com.helpdev.output.restclient.client.RandomDataApiClient/mp-rest/scope=jakarta.inject.Singleton \ No newline at end of file diff --git a/app/spring-app/pom.xml b/app/spring-app/pom.xml index 8fdffe7..26fa030 100644 --- a/app/spring-app/pom.xml +++ b/app/spring-app/pom.xml @@ -50,30 +50,39 @@ org.springframework.boot spring-boot-starter-data-jpa + + org.springframework.boot + spring-boot-starter-log4j2 + ${project.groupId} use-case ${project.groupId} - jpa-mysql-repository + jakarta-controller-v1 ${project.groupId} - feign-http-services + jpa-mysql-repository ${project.groupId} - jaxrs-controller-v1 + feign-http-services - mysql - mysql-connector-java - runtime + com.mysql + mysql-connector-j org.springframework.boot spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-logging + + io.micrometer @@ -99,6 +108,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring-boot.version} br.com.helpdev.SpringSampleApplication 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 index 050623c..3ff0899 100644 --- 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,9 +1,9 @@ package br.com.helpdev.config; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.ext.Provider; import java.util.Objects; import java.util.stream.Collectors; -import javax.ws.rs.Path; -import javax.ws.rs.ext.Provider; import org.glassfish.jersey.server.ResourceConfig; import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; import org.springframework.context.annotation.Configuration; diff --git a/app/spring-app/src/main/resources/application.properties b/app/spring-app/src/main/resources/application.properties index 0135f96..3df7e44 100644 --- a/app/spring-app/src/main/resources/application.properties +++ b/app/spring-app/src/main/resources/application.properties @@ -1,5 +1,6 @@ spring.jpa.hibernate.ddl-auto=update -spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect +spring.jpa.database-platform=org.hibernate.dialect.MySQLDialect +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.url=${MYSQL_URL:jdbc:mysql://localhost:3306/sample} spring.datasource.username=${MYSQL_USER:user} spring.datasource.password=${MYSQL_PASSWORD:pass123} @@ -7,4 +8,7 @@ spring.datasource.password=${MYSQL_PASSWORD:pass123} management.metrics.enable.all=true management.endpoints.web.exposure.include=* -random-data-api.url=${RANDOM_DATA_API_URL:https://random-data-api.com} \ No newline at end of file +random-data-api.url=${RANDOM_DATA_API_URL:https://random-data-api.com} + +# Issue: https://github.com/spring-cloud/spring-cloud-openfeign/issues/847 +spring.cloud.mvc.token-relay.enabled=false \ No newline at end of file diff --git a/core/use-case/src/main/java/br/com/helpdev/usecase/DeleteRequestNotification.java b/core/use-case/src/main/java/br/com/helpdev/usecase/DeleteRequestNotification.java index dfbe684..5b217da 100644 --- a/core/use-case/src/main/java/br/com/helpdev/usecase/DeleteRequestNotification.java +++ b/core/use-case/src/main/java/br/com/helpdev/usecase/DeleteRequestNotification.java @@ -4,9 +4,9 @@ import br.com.helpdev.domain.vo.MessageId; import br.com.helpdev.usecase.exception.MessageNotFoundException; import br.com.helpdev.usecase.port.MessageRepository; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; @Named @ApplicationScoped diff --git a/core/use-case/src/main/java/br/com/helpdev/usecase/FindRequestNotification.java b/core/use-case/src/main/java/br/com/helpdev/usecase/FindRequestNotification.java index a3c1afd..c28345c 100644 --- a/core/use-case/src/main/java/br/com/helpdev/usecase/FindRequestNotification.java +++ b/core/use-case/src/main/java/br/com/helpdev/usecase/FindRequestNotification.java @@ -6,9 +6,9 @@ import br.com.helpdev.domain.vo.MessageId; import br.com.helpdev.usecase.exception.MessageNotFoundException; import br.com.helpdev.usecase.port.MessageRepository; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; @Named @ApplicationScoped diff --git a/core/use-case/src/main/java/br/com/helpdev/usecase/PushRequestNotification.java b/core/use-case/src/main/java/br/com/helpdev/usecase/PushRequestNotification.java index d774a92..0dbc904 100644 --- a/core/use-case/src/main/java/br/com/helpdev/usecase/PushRequestNotification.java +++ b/core/use-case/src/main/java/br/com/helpdev/usecase/PushRequestNotification.java @@ -6,11 +6,11 @@ import br.com.helpdev.domain.exception.NotificationException; import br.com.helpdev.usecase.port.MessageRepository; import br.com.helpdev.usecase.port.ProtocolGeneratorClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.time.ZonedDateTime; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; @Named @ApplicationScoped diff --git a/pom.xml b/pom.xml index bea2245..17d7769 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ true - 2.15.0.Final + 3.2.0.Final quarkus-bom io.quarkus.platform @@ -25,7 +25,7 @@ core/domain core/use-case - adapter/input/jaxrs-controller-v1 + adapter/input/jakarta-controller-v1 adapter/output/jpa-mysql-repository adapter/output/restclient-http-services app/quarkus-app @@ -35,14 +35,14 @@ spring - 2.7.1 - 2021.0.3 + 3.1.1 + 2022.0.3 core/domain core/use-case - adapter/input/jaxrs-controller-v1 + adapter/input/jakarta-controller-v1 adapter/output/jpa-mysql-repository adapter/output/feign-http-services app/spring-app @@ -71,45 +71,45 @@ 1.7.4 - 3.10.1 - 3.1.1 - 4.5.3.0 - 4.5.3 + 3.11.0 + 3.3.0 + 4.7.3.5 + 4.7.3 8.39 4.3.0 - 3.0.0-M7 - 3.0.0-M7 + 3.1.2 + 3.1.2 0.15 0.8.8 + 3.3.1 - 5.6.0 - 3.3.3 - 3.22.0 - 1.17.1 + 5.9.3 + 5.4.0 + 3.24.2 + 1.18.3 1.0.2 - 2.35 + 3.1.2 - 2.0.2 - 2.1.1 - 1.3.3 - 2.2.3 - 2.0 - 2.0.1.Final + 4.0.1 + 3.1.0 + 2.0.1 + 3.1.0 + 3.0.1 + 3.0.2 2.3.1 - 2.35 - 1.18.24 + 1.18.28 - 1.7.36 - 1.2.3 - 6.6 + 2.0.7 + 1.4.8 + 7.4 - 4.3.3 - 2.13.4.2 - 2.14.1 + 5.2.0 + 2.15.2 + 2.15.2 @@ -125,7 +125,7 @@ ${project.groupId} - jaxrs-controller-v1 + jakarta-controller-v1 ${project.version} @@ -159,8 +159,8 @@ ${lombok.version} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${validation-api.version} @@ -176,14 +176,9 @@ test - javax.ws.rs - javax.ws.rs-api - ${javax.ws.rs-api.version} - - - javax.xml.bind - jaxb-api - ${jaxb-api.version} + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs-api.version} org.eclipse.microprofile.rest.client @@ -305,17 +300,22 @@ jersey-server ${glassfish.test.version} - - com.github.tomakehurst - wiremock-jre8 - ${wiremock.version} - test - + + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${java.version} + ${java.version} + + -parameters + + + org.eluder.coveralls