Skip to content

feat: upgrade framework versions #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 18, 2023
Merged

feat: upgrade framework versions #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8d718b
feat: upgrade versions
Jul 13, 2023
0394a0d
feat: upgrade versions to spring
Jul 18, 2023
35a8b7e
feat: upgrade versions to spring
Jul 18, 2023
d4b12c1
feat: upgrade versions to spring
Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions acceptance-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
<maven.compiler.target>17</maven.compiler.target>
<mutation.skip>true</mutation.skip>
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
<mysql-connector-java.version>8.0.30</mysql-connector-java.version>
<mysql-connector-j.version>8.0.33</mysql-connector-j.version>
<docker-maven-plugin.version>0.38.1</docker-maven-plugin.version>
<mutation.skip>true</mutation.skip>
<wiremock-jre8.version>2.35.0</wiremock-jre8.version>
<wiremock.version>3.0.0-beta-10</wiremock.version>
</properties>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jaxrs-controller-v1</artifactId>
<artifactId>jakarta-controller-v1</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down Expand Up @@ -73,9 +73,9 @@
<artifactId>rest-assured-all</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql-connector-java.version}</version>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>${mysql-connector-j.version}</version>
</dependency>
<dependency>
<groupId>com.github.javafaker</groupId>
Expand All @@ -84,8 +84,8 @@
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8</artifactId>
<version>${wiremock-jre8.version}</version>
<artifactId>wiremock</artifactId>
<version>${wiremock.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
35 changes: 17 additions & 18 deletions adapter/input/jaxrs-controller-v1/pom.xml → adapter/input/jakarta-controller-v1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>jaxrs-controller-v1</artifactId>
<artifactId>jakarta-controller-v1</artifactId>

<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<swagger-core.version>2.2.6</swagger-core.version>
<swagger-maven-plugin.version>2.1.5</swagger-maven-plugin.version>
<swagger-core.version>2.2.14</swagger-core.version>
<swagger-maven-plugin.version>2.2.15</swagger-maven-plugin.version>
</properties>

<dependencies>
Expand All @@ -25,19 +25,16 @@
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-core</artifactId>
<artifactId>swagger-core-jakarta</artifactId>
<version>${swagger-core.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>domain</artifactId>
Expand Down Expand Up @@ -85,32 +82,34 @@

<build>
<plugins>
<!-- https://github.com/swagger-api/swagger-core/blob/master/modules/swagger-maven-plugin/README.md -->
<plugin>
<groupId>io.openapitools.swagger</groupId>
<artifactId>swagger-maven-plugin</artifactId>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-maven-plugin-jakarta</artifactId>
<version>${swagger-maven-plugin.version}</version>
<configuration>
<resourcePackages>
<resourcePackage>br.com.helpdev.controller</resourcePackage>
</resourcePackages>
<outputDirectory>${basedir}/target/resources/br/com/helpdev/controller</outputDirectory>
<outputFilename>openapi</outputFilename>
<outputFormats>JSON,YAML</outputFormats>
<outputFileName>openapi</outputFileName>
<outputPath>${basedir}/target/resources/br/com/helpdev/controller</outputPath>
<outputFormat>JSONANDYAML</outputFormat>

<prettyPrint>true</prettyPrint>
</configuration>
<executions>
<execution>
<id>generate-doc</id>
<phase>compile</phase>
<goals>
<goal>generate</goal>
<goal>resolve</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<version>3.3.1</version>
<executions>
<execution>
<id>copy-resources</id>
Expand Down
20 changes: 10 additions & 10 deletions ...helpdev/controller/MessageController.java → ...helpdev/controller/MessageController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions ...helpdev/controller/OpenApiController.java → ...helpdev/controller/OpenApiController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
0 ...ller/config/CustomObjectMapperConfig.java → ...ller/config/CustomObjectMapperConfig.java
View file
Open in desktop
File renamed without changes.
0 ...lpdev/controller/dto/ChatResponseDto.java → ...lpdev/controller/dto/ChatResponseDto.java
View file
Open in desktop
File renamed without changes.
0 ...ntroller/dto/CommunicationChannelDto.java → ...ntroller/dto/CommunicationChannelDto.java
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions .../com/helpdev/controller/dto/ErrorDto.java → .../com/helpdev/controller/dto/ErrorDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;

@Data
@Builder
Expand Down
8 changes: 3 additions & 5 deletions ...pdev/controller/dto/MessageCreateDto.java → ...pdev/controller/dto/MessageCreateDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 ...ev/controller/dto/MessageResponseDto.java → ...ev/controller/dto/MessageResponseDto.java
View file
Open in desktop
File renamed without changes.
5 changes: 1 addition & 4 deletions .../helpdev/controller/dto/RecipientDto.java → .../helpdev/controller/dto/RecipientDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 ...dev/controller/dto/StatusResponseDto.java → ...dev/controller/dto/StatusResponseDto.java
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ller/handler/NotFoundExceptionMapper.java → ...ller/handler/NotFoundExceptionMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<MessageNotFoundException> {
Expand Down
6 changes: 3 additions & 3 deletions .../handler/NotificationExceptionMapper.java → .../handler/NotificationExceptionMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<NotificationException> {
Expand Down
4 changes: 2 additions & 2 deletions ...oller/mapper/ControllerMessageMapper.java → ...oller/mapper/ControllerMessageMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ...dev/controller/MessageControllerTest.java → ...dev/controller/MessageControllerTest.java
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...dev/controller/OpenApiControllerTest.java → ...dev/controller/OpenApiControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

package br.com.helpdev.controller;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down
0 .../handler/NotFoundExceptionMapperTest.java → .../handler/NotFoundExceptionMapperTest.java
View file
Open in desktop
File renamed without changes.
0 ...dler/NotificationExceptionMapperTest.java → ...dler/NotificationExceptionMapperTest.java
View file
Open in desktop
File renamed without changes.
0 ...r/mapper/ControllerMessageMapperTest.java → ...r/mapper/ControllerMessageMapperTest.java
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions adapter/output/feign-http-services/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<maven.compiler.target>17</maven.compiler.target>
<coverage.exclude.code>**/*Dto.*</coverage.exclude.code>
<mutation.excluded.code>**.dto.*</mutation.excluded.code>
<feign-jaxrs.version>12.1</feign-jaxrs.version>
<feign-jakarta.version>12.4</feign-jakarta.version>
</properties>

<dependencyManagement>
Expand All @@ -33,8 +33,8 @@
</dependencyManagement>
<dependencies>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -49,8 +49,8 @@

<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-jaxrs</artifactId>
<version>${feign-jaxrs.version}</version>
<artifactId>feign-jakarta</artifactId>
<version>${feign-jakarta.version}</version>
</dependency>

<!-- Project dependencies-->
Expand Down
6 changes: 3 additions & 3 deletions ...-http-services/src/main/java/br/com/helpdev/output/feign/ProtocolGeneratorClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...n-http-services/src/main/java/br/com/helpdev/output/feign/client/RandomDataApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
4 changes: 2 additions & 2 deletions ...services/src/main/java/br/com/helpdev/output/feign/config/FeignContractConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -15,7 +15,7 @@ public class FeignContractConfiguration {

@Bean
Contract contract() {
return new JAXRSContract();
return new JakartaContract();
}

}
8 changes: 4 additions & 4 deletions ...ices/src/test/java/br/com/helpdev/output/feign/config/FeignContractConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -18,7 +18,7 @@ void shouldGeneratedNonNullJaxRsContract() {
final var contract = feignContractConfiguration.contract();

assertThat(contract)
.isInstanceOf(JAXRSContract.class)
.isInstanceOf(JakartaContract.class)
.isNotNull();
}
}
6 changes: 3 additions & 3 deletions ...t/jpa-mysql-repository/src/main/java/br/com/helpdev/output/repository/MessageGateway.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading