fix(customer-service): switch to jakarta namespace

vincenzocorso · Nov 17, 2023 · 7bf7fa0 · 7bf7fa0
1 parent 345eb94
commit 7bf7fa0
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 38 deletions.
diff --git a/.../java/it/vincenzocorso/carsharing/customerservice/adapters/messaging/CommandsHandler.java b/.../java/it/vincenzocorso/carsharing/customerservice/adapters/messaging/CommandsHandler.java
@@ -6,12 +6,12 @@
 import it.vincenzocorso.carsharing.common.messaging.commands.CommandHeaders;
 import it.vincenzocorso.carsharing.common.messaging.commands.CommandProducer;
 import it.vincenzocorso.carsharing.customerservice.domain.ports.in.RentVehicle;
+import jakarta.enterprise.context.ApplicationScoped;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Message;
 
-import javax.enterprise.context.ApplicationScoped;
 import java.util.concurrent.CompletionStage;
 
 @ApplicationScoped

diff --git a/...corso/carsharing/customerservice/adapters/persistence/mongodb/CustomerDocumentMapper.java b/...corso/carsharing/customerservice/adapters/persistence/mongodb/CustomerDocumentMapper.java
@@ -3,10 +3,9 @@
 import it.vincenzocorso.carsharing.customerservice.domain.models.Customer;
 import it.vincenzocorso.carsharing.customerservice.domain.models.CustomerDetails;
 import it.vincenzocorso.carsharing.customerservice.domain.models.DriverLicense;
+import jakarta.enterprise.context.ApplicationScoped;
 import org.bson.types.ObjectId;
 
-import javax.enterprise.context.ApplicationScoped;
-
 @ApplicationScoped
 public class CustomerDocumentMapper {
 	public CustomerDocument convertToDocument(Customer customer) {

diff --git a/...rsharing/customerservice/adapters/persistence/mongodb/CustomerMongoRepositoryAdapter.java b/...rsharing/customerservice/adapters/persistence/mongodb/CustomerMongoRepositoryAdapter.java
@@ -4,9 +4,9 @@
 import it.vincenzocorso.carsharing.customerservice.domain.models.Customer;
 import it.vincenzocorso.carsharing.customerservice.domain.models.SearchCustomerCriteria;
 import it.vincenzocorso.carsharing.customerservice.domain.ports.out.CustomerRepository;
+import jakarta.enterprise.context.ApplicationScoped;
 import org.bson.types.ObjectId;
 
-import javax.enterprise.context.ApplicationScoped;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;

diff --git a/...ain/java/it/vincenzocorso/carsharing/customerservice/adapters/web/CustomerController.java b/...ain/java/it/vincenzocorso/carsharing/customerservice/adapters/web/CustomerController.java
@@ -5,12 +5,13 @@
 import it.vincenzocorso.carsharing.customerservice.domain.models.SearchCustomerCriteria;
 import it.vincenzocorso.carsharing.customerservice.domain.ports.in.RegisterCustomer;
 import it.vincenzocorso.carsharing.customerservice.domain.ports.in.SearchCustomer;
+import jakarta.ws.rs.core.Response;
 import lombok.AllArgsConstructor;
 
-import javax.ws.rs.core.Response;
 import java.util.List;
 
-import static javax.ws.rs.core.Response.Status.*;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.OK;
 
 @AllArgsConstructor
 public class CustomerController implements CustomerRestApi {

diff --git a/...rc/main/java/it/vincenzocorso/carsharing/customerservice/adapters/web/CustomerMapper.java b/...rc/main/java/it/vincenzocorso/carsharing/customerservice/adapters/web/CustomerMapper.java
@@ -3,8 +3,7 @@
 import it.vincenzocorso.carsharing.customerservice.domain.models.Customer;
 import it.vincenzocorso.carsharing.customerservice.domain.models.CustomerDetails;
 import it.vincenzocorso.carsharing.customerservice.domain.models.DriverLicense;
-
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class CustomerMapper {

diff --git a/...ncenzocorso/carsharing/customerservice/adapters/web/CustomerNotFoundExceptionHandler.java b/...ncenzocorso/carsharing/customerservice/adapters/web/CustomerNotFoundExceptionHandler.java
@@ -4,10 +4,10 @@
 import it.vincenzocorso.carsharing.common.web.ErrorResponses;
 import it.vincenzocorso.carsharing.common.web.Issue;
 import it.vincenzocorso.carsharing.customerservice.domain.exceptions.CustomerNotFoundException;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
 import java.util.List;
 
 @Provider

diff --git a/...c/main/java/it/vincenzocorso/carsharing/customerservice/adapters/web/CustomerRestApi.java b/...c/main/java/it/vincenzocorso/carsharing/customerservice/adapters/web/CustomerRestApi.java
@@ -1,11 +1,11 @@
 package it.vincenzocorso.carsharing.customerservice.adapters.web;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 @Path("/customers")
 @Produces(MediaType.APPLICATION_JSON)

diff --git a/...n/java/it/vincenzocorso/carsharing/customerservice/adapters/web/DriverLicenseDetails.java b/...n/java/it/vincenzocorso/carsharing/customerservice/adapters/web/DriverLicenseDetails.java
@@ -1,11 +1,11 @@
 package it.vincenzocorso.carsharing.customerservice.adapters.web;
 
+import jakarta.validation.constraints.Future;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Past;
 import lombok.Builder;
 
-import javax.validation.constraints.Future;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Past;
 import java.time.LocalDate;
 
 @Builder

diff --git a/...ava/it/vincenzocorso/carsharing/customerservice/adapters/web/RegisterCustomerRequest.java b/...ava/it/vincenzocorso/carsharing/customerservice/adapters/web/RegisterCustomerRequest.java
@@ -1,8 +1,8 @@
 package it.vincenzocorso.carsharing.customerservice.adapters.web;
 
+import jakarta.validation.constraints.*;
 import lombok.Builder;
 
-import javax.validation.constraints.*;
 import java.time.LocalDate;
 
 @Builder

diff --git a/.../it/vincenzocorso/carsharing/customerservice/adapters/web/ValidationExceptionHandler.java b/.../it/vincenzocorso/carsharing/customerservice/adapters/web/ValidationExceptionHandler.java
@@ -3,13 +3,13 @@
 import it.vincenzocorso.carsharing.common.web.ErrorResponse;
 import it.vincenzocorso.carsharing.common.web.ErrorResponses;
 import it.vincenzocorso.carsharing.common.web.Issue;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Path;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.Path;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
 import java.util.Iterator;
 import java.util.List;
 

diff --git a/...service/src/main/java/it/vincenzocorso/carsharing/customerservice/config/BeansConfig.java b/...service/src/main/java/it/vincenzocorso/carsharing/customerservice/config/BeansConfig.java
@@ -4,9 +4,8 @@
 import it.vincenzocorso.carsharing.customerservice.adapters.web.ValidationExceptionHandler;
 import it.vincenzocorso.carsharing.customerservice.domain.CustomerService;
 import it.vincenzocorso.carsharing.customerservice.domain.ports.out.CustomerRepository;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 
 @ApplicationScoped
 public class BeansConfig {

diff --git a/...java/it/vincenzocorso/carsharing/customerservice/adapters/web/CustomerControllerTest.java b/...java/it/vincenzocorso/carsharing/customerservice/adapters/web/CustomerControllerTest.java
@@ -8,22 +8,23 @@
 import it.vincenzocorso.carsharing.customerservice.domain.models.SearchCustomerCriteria;
 import it.vincenzocorso.carsharing.customerservice.domain.ports.in.RegisterCustomer;
 import it.vincenzocorso.carsharing.customerservice.domain.ports.in.SearchCustomer;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.core.MediaType;
 import org.apache.http.HttpStatus;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
-import javax.inject.Inject;
-import javax.ws.rs.core.MediaType;
-
 import java.util.List;
 
-import static io.restassured.RestAssured.*;
+import static io.restassured.RestAssured.given;
+import static it.vincenzocorso.carsharing.customerservice.adapters.web.FakeCustomerDto.CUSTOMER_RESPONSE;
+import static it.vincenzocorso.carsharing.customerservice.adapters.web.FakeCustomerDto.REGISTER_CUSTOMER_REQUEST;
 import static it.vincenzocorso.carsharing.customerservice.domain.FakeCustomer.*;
-import static it.vincenzocorso.carsharing.customerservice.adapters.web.FakeCustomerDto.*;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.when;
 
 @QuarkusTest
 class CustomerControllerTest {