diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/mapper/BpmnVersionMapper.java b/src/main/java/it/gov/pagopa/atml/mil/integration/mapper/BpmnVersionMapper.java deleted file mode 100644 index 3f925453..00000000 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/mapper/BpmnVersionMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package it.gov.pagopa.atml.mil.integration.mapper; - -import it.gov.pagopa.atml.mil.integration.entity.BpmnVersion; -import it.gov.pagopa.atml.mil.integration.model.CreationMetadata; -import it.gov.pagopa.atml.mil.integration.dto.BpmnCreationDto; -import org.mapstruct.Mapper; - -@Mapper -public interface BpmnVersionMapper { - - BpmnCreationDto toDto (BpmnVersion bpmnVersion); - - CreationMetadata toEntity (BpmnCreationDto bpmnCreationDto); -} diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/App.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/App.java similarity index 94% rename from src/main/java/it/gov/pagopa/atml/mil/integration/App.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/App.java index 787cbf4a..fde4d8a3 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/App.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/App.java @@ -1,7 +1,7 @@ -package it.gov.pagopa.atml.mil.integration; +package it.gov.pagopa.atmlayer.service.model; import io.quarkus.runtime.Startup; -import it.gov.pagopa.atml.mil.integration.model.ErrorResponse; +import it.gov.pagopa.atmlayer.service.model.model.ErrorResponse; import jakarta.ws.rs.ApplicationPath; import jakarta.ws.rs.core.Application; import jakarta.ws.rs.core.MediaType; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/client/MILAuthApi.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/client/MILAuthApi.java similarity index 83% rename from src/main/java/it/gov/pagopa/atml/mil/integration/client/MILAuthApi.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/client/MILAuthApi.java index e534a8e6..bbf0a916 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/client/MILAuthApi.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/client/MILAuthApi.java @@ -1,9 +1,9 @@ -package it.gov.pagopa.atml.mil.integration.client; +package it.gov.pagopa.atmlayer.service.model.client; import io.quarkus.rest.client.reactive.NotBody; import io.smallrye.mutiny.Uni; -import it.gov.pagopa.atml.mil.integration.model.mil.AuthPayload; -import it.gov.pagopa.atml.mil.integration.model.mil.MILAccessToken; +import it.gov.pagopa.atmlayer.service.model.model.mil.AuthPayload; +import it.gov.pagopa.atmlayer.service.model.model.mil.MILAccessToken; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/constraint/BankKeyConstraint.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/constraint/BankKeyConstraint.java similarity index 89% rename from src/main/java/it/gov/pagopa/atml/mil/integration/constraint/BankKeyConstraint.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/constraint/BankKeyConstraint.java index 0f6428e5..d3bcd708 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/constraint/BankKeyConstraint.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/constraint/BankKeyConstraint.java @@ -1,6 +1,6 @@ -package it.gov.pagopa.atml.mil.integration.constraint; +package it.gov.pagopa.atmlayer.service.model.constraint; -import it.gov.pagopa.atml.mil.integration.validator.BankKeyValidator; +import it.gov.pagopa.atmlayer.service.model.validator.BankKeyValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; import jakarta.validation.constraintvalidation.SupportedValidationTarget; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/dto/BpmnAssociationDto.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/dto/BpmnAssociationDto.java similarity index 80% rename from src/main/java/it/gov/pagopa/atml/mil/integration/dto/BpmnAssociationDto.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/dto/BpmnAssociationDto.java index 0e05f47f..98e21639 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/dto/BpmnAssociationDto.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/dto/BpmnAssociationDto.java @@ -1,6 +1,6 @@ -package it.gov.pagopa.atml.mil.integration.dto; +package it.gov.pagopa.atmlayer.service.model.dto; -import it.gov.pagopa.atml.mil.integration.model.AssociationMetadata; +import it.gov.pagopa.atmlayer.service.model.model.AssociationMetadata; import jakarta.validation.Valid; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.core.MediaType; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/dto/BpmnCreationDto.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/dto/BpmnCreationDto.java similarity index 79% rename from src/main/java/it/gov/pagopa/atml/mil/integration/dto/BpmnCreationDto.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/dto/BpmnCreationDto.java index ce1dd530..df48a5a6 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/dto/BpmnCreationDto.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/dto/BpmnCreationDto.java @@ -1,6 +1,6 @@ -package it.gov.pagopa.atml.mil.integration.dto; +package it.gov.pagopa.atmlayer.service.model.dto; -import it.gov.pagopa.atml.mil.integration.model.CreationMetadata; +import it.gov.pagopa.atmlayer.service.model.model.CreationMetadata; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.core.MediaType; import lombok.Data; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/dto/PersonDto.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/dto/PersonDto.java similarity index 85% rename from src/main/java/it/gov/pagopa/atml/mil/integration/dto/PersonDto.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/dto/PersonDto.java index a39bf769..4be7333e 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/dto/PersonDto.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/dto/PersonDto.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.atml.mil.integration.dto; +package it.gov.pagopa.atmlayer.service.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/entity/BpmnVersion.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/entity/BpmnVersion.java similarity index 74% rename from src/main/java/it/gov/pagopa/atml/mil/integration/entity/BpmnVersion.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/entity/BpmnVersion.java index 5b10fb7a..e4e78028 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/entity/BpmnVersion.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/entity/BpmnVersion.java @@ -1,13 +1,11 @@ -package it.gov.pagopa.atml.mil.integration.entity; +package it.gov.pagopa.atmlayer.service.model.entity; import io.quarkus.hibernate.reactive.panache.PanacheEntityBase; -import it.gov.pagopa.atml.mil.integration.enumeration.FunctionEnum; -import it.gov.pagopa.atml.mil.integration.enumeration.StatusEnum; +import it.gov.pagopa.atmlayer.service.model.enumeration.FunctionEnum; +import it.gov.pagopa.atmlayer.service.model.enumeration.StatusEnum; import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.IdClass; -import lombok.Data; import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.annotations.CreationTimestamp; @@ -17,16 +15,12 @@ import java.util.UUID; @Entity -@IdClass(BpmnVersionPK.class) @Setter @NoArgsConstructor public class BpmnVersion extends PanacheEntityBase { - @Id - public UUID bpmnId; - - @Id - private Integer modelVersion; + @EmbeddedId + private BpmnVersionPK bpmnVersionPK; private String deployedFileName; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/entity/BpmnVersionPK.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/entity/BpmnVersionPK.java similarity index 62% rename from src/main/java/it/gov/pagopa/atml/mil/integration/entity/BpmnVersionPK.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/entity/BpmnVersionPK.java index 20e288ae..06de019e 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/entity/BpmnVersionPK.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/entity/BpmnVersionPK.java @@ -1,9 +1,16 @@ -package it.gov.pagopa.atml.mil.integration.entity; +package it.gov.pagopa.atmlayer.service.model.entity; + +import jakarta.persistence.Embeddable; +import lombok.Getter; +import lombok.Setter; import java.io.Serial; import java.io.Serializable; import java.util.UUID; +@Embeddable +@Getter +@Setter public class BpmnVersionPK implements Serializable { @Serial diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/entity/Person.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/entity/Person.java similarity index 88% rename from src/main/java/it/gov/pagopa/atml/mil/integration/entity/Person.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/entity/Person.java index 2f211243..3a4530fa 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/entity/Person.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/entity/Person.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.atml.mil.integration.entity; +package it.gov.pagopa.atmlayer.service.model.entity; import io.quarkus.hibernate.reactive.panache.PanacheEntityBase; import jakarta.persistence.Entity; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/enumeration/AppErrorCodeEnum.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/enumeration/AppErrorCodeEnum.java similarity index 88% rename from src/main/java/it/gov/pagopa/atml/mil/integration/enumeration/AppErrorCodeEnum.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/enumeration/AppErrorCodeEnum.java index 93d3fef1..5f8b9fd9 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/enumeration/AppErrorCodeEnum.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/enumeration/AppErrorCodeEnum.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.atml.mil.integration.enumeration; +package it.gov.pagopa.atmlayer.service.model.enumeration; import lombok.Getter; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/enumeration/FunctionEnum.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/enumeration/FunctionEnum.java similarity index 78% rename from src/main/java/it/gov/pagopa/atml/mil/integration/enumeration/FunctionEnum.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/enumeration/FunctionEnum.java index 1deb9a34..7d07e923 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/enumeration/FunctionEnum.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/enumeration/FunctionEnum.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.atml.mil.integration.enumeration; +package it.gov.pagopa.atmlayer.service.model.enumeration; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/enumeration/StatusEnum.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/enumeration/StatusEnum.java similarity index 79% rename from src/main/java/it/gov/pagopa/atml/mil/integration/enumeration/StatusEnum.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/enumeration/StatusEnum.java index c8a6d759..3c10423b 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/enumeration/StatusEnum.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/enumeration/StatusEnum.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.atml.mil.integration.enumeration; +package it.gov.pagopa.atmlayer.service.model.enumeration; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/exception/AtmLayerException.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/exception/AtmLayerException.java similarity index 89% rename from src/main/java/it/gov/pagopa/atml/mil/integration/exception/AtmLayerException.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/exception/AtmLayerException.java index 2790b289..2d1f1f2f 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/exception/AtmLayerException.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/exception/AtmLayerException.java @@ -1,6 +1,6 @@ -package it.gov.pagopa.atml.mil.integration.exception; +package it.gov.pagopa.atmlayer.service.model.exception; -import it.gov.pagopa.atml.mil.integration.enumeration.AppErrorCodeEnum; +import it.gov.pagopa.atmlayer.service.model.enumeration.AppErrorCodeEnum; import lombok.Getter; import java.util.Objects; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/exception/AtmLayerRestException.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/exception/AtmLayerRestException.java similarity index 90% rename from src/main/java/it/gov/pagopa/atml/mil/integration/exception/AtmLayerRestException.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/exception/AtmLayerRestException.java index 50ef9310..0ec03ae3 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/exception/AtmLayerRestException.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/exception/AtmLayerRestException.java @@ -1,6 +1,6 @@ -package it.gov.pagopa.atml.mil.integration.exception; +package it.gov.pagopa.atmlayer.service.model.exception; -import it.gov.pagopa.atml.mil.integration.enumeration.AppErrorCodeEnum; +import it.gov.pagopa.atmlayer.service.model.enumeration.AppErrorCodeEnum; import jakarta.ws.rs.ClientErrorException; import jakarta.ws.rs.core.Response; import lombok.Builder; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/exception/mapper/GlobalExceptionMapperImpl.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/exception/mapper/GlobalExceptionMapperImpl.java similarity index 88% rename from src/main/java/it/gov/pagopa/atml/mil/integration/exception/mapper/GlobalExceptionMapperImpl.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/exception/mapper/GlobalExceptionMapperImpl.java index 9f4e445f..e3198c1f 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/exception/mapper/GlobalExceptionMapperImpl.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/exception/mapper/GlobalExceptionMapperImpl.java @@ -1,11 +1,11 @@ -package it.gov.pagopa.atml.mil.integration.exception.mapper; +package it.gov.pagopa.atmlayer.service.model.exception.mapper; import io.quarkus.arc.properties.IfBuildProperty; -import it.gov.pagopa.atml.mil.integration.enumeration.AppErrorCodeEnum; -import it.gov.pagopa.atml.mil.integration.utils.ConstraintViolationMappingUtils; -import it.gov.pagopa.atml.mil.integration.exception.AtmLayerRestException; -import it.gov.pagopa.atml.mil.integration.model.ATMLayerErrorResponse; -import it.gov.pagopa.atml.mil.integration.model.ATMLayerValidationErrorResponse; +import it.gov.pagopa.atmlayer.service.model.enumeration.AppErrorCodeEnum; +import it.gov.pagopa.atmlayer.service.model.utils.ConstraintViolationMappingUtils; +import it.gov.pagopa.atmlayer.service.model.exception.AtmLayerRestException; +import it.gov.pagopa.atmlayer.service.model.model.ATMLayerErrorResponse; +import it.gov.pagopa.atmlayer.service.model.model.ATMLayerValidationErrorResponse; import jakarta.inject.Inject; import jakarta.inject.Singleton; import jakarta.validation.ConstraintViolation; diff --git a/src/main/java/it/gov/pagopa/atmlayer/service/model/mapper/BpmnVersionMapper.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/mapper/BpmnVersionMapper.java new file mode 100644 index 00000000..f0d611c9 --- /dev/null +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/mapper/BpmnVersionMapper.java @@ -0,0 +1,14 @@ +package it.gov.pagopa.atmlayer.service.model.mapper; + +import it.gov.pagopa.atmlayer.service.model.entity.BpmnVersion; +import it.gov.pagopa.atmlayer.service.model.model.CreationMetadata; +import it.gov.pagopa.atmlayer.service.model.dto.BpmnCreationDto; +import org.mapstruct.Mapper; + +@Mapper +public interface BpmnVersionMapper { + + BpmnCreationDto toDto (BpmnVersion bpmnVersion); + + CreationMetadata toEntity (BpmnCreationDto bpmnCreationDto); +} diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/mapper/PersonMapper.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/mapper/PersonMapper.java similarity index 55% rename from src/main/java/it/gov/pagopa/atml/mil/integration/mapper/PersonMapper.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/mapper/PersonMapper.java index d0a15ac9..6852b477 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/mapper/PersonMapper.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/mapper/PersonMapper.java @@ -1,7 +1,7 @@ -package it.gov.pagopa.atml.mil.integration.mapper; +package it.gov.pagopa.atmlayer.service.model.mapper; -import it.gov.pagopa.atml.mil.integration.dto.PersonDto; -import it.gov.pagopa.atml.mil.integration.entity.Person; +import it.gov.pagopa.atmlayer.service.model.dto.PersonDto; +import it.gov.pagopa.atmlayer.service.model.entity.Person; import org.mapstruct.Mapper; import java.util.List; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/model/ATMLayerErrorResponse.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/model/ATMLayerErrorResponse.java similarity index 84% rename from src/main/java/it/gov/pagopa/atml/mil/integration/model/ATMLayerErrorResponse.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/model/ATMLayerErrorResponse.java index cfd4586a..07f1837a 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/model/ATMLayerErrorResponse.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/model/ATMLayerErrorResponse.java @@ -1,8 +1,8 @@ -package it.gov.pagopa.atml.mil.integration.model; +package it.gov.pagopa.atmlayer.service.model.model; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import io.quarkus.runtime.annotations.RegisterForReflection; -import it.gov.pagopa.atml.mil.integration.enumeration.AppErrorCodeEnum; +import it.gov.pagopa.atmlayer.service.model.enumeration.AppErrorCodeEnum; import lombok.Getter; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/model/ATMLayerValidationErrorResponse.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/model/ATMLayerValidationErrorResponse.java similarity index 92% rename from src/main/java/it/gov/pagopa/atml/mil/integration/model/ATMLayerValidationErrorResponse.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/model/ATMLayerValidationErrorResponse.java index 4a9824c9..b1ec1371 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/model/ATMLayerValidationErrorResponse.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/model/ATMLayerValidationErrorResponse.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.atml.mil.integration.model; +package it.gov.pagopa.atmlayer.service.model.model; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import io.quarkus.runtime.annotations.RegisterForReflection; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/model/AssociationMetadata.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/model/AssociationMetadata.java similarity index 76% rename from src/main/java/it/gov/pagopa/atml/mil/integration/model/AssociationMetadata.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/model/AssociationMetadata.java index 7477fa0e..50a2b381 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/model/AssociationMetadata.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/model/AssociationMetadata.java @@ -1,7 +1,7 @@ -package it.gov.pagopa.atml.mil.integration.model; +package it.gov.pagopa.atmlayer.service.model.model; -import it.gov.pagopa.atml.mil.integration.constraint.BankKeyConstraint; -import it.gov.pagopa.atml.mil.integration.enumeration.FunctionEnum; +import it.gov.pagopa.atmlayer.service.model.constraint.BankKeyConstraint; +import it.gov.pagopa.atmlayer.service.model.enumeration.FunctionEnum; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/model/BankKey.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/model/BankKey.java similarity index 86% rename from src/main/java/it/gov/pagopa/atml/mil/integration/model/BankKey.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/model/BankKey.java index 6ee53e71..0a130299 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/model/BankKey.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/model/BankKey.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.atml.mil.integration.model; +package it.gov.pagopa.atmlayer.service.model.model; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/model/CreationMetadata.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/model/CreationMetadata.java similarity index 84% rename from src/main/java/it/gov/pagopa/atml/mil/integration/model/CreationMetadata.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/model/CreationMetadata.java index 2a5cbee0..2417527d 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/model/CreationMetadata.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/model/CreationMetadata.java @@ -1,6 +1,6 @@ -package it.gov.pagopa.atml.mil.integration.model; +package it.gov.pagopa.atmlayer.service.model.model; -import it.gov.pagopa.atml.mil.integration.enumeration.FunctionEnum; +import it.gov.pagopa.atmlayer.service.model.enumeration.FunctionEnum; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/model/DemoValidation.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/model/DemoValidation.java similarity index 94% rename from src/main/java/it/gov/pagopa/atml/mil/integration/model/DemoValidation.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/model/DemoValidation.java index 9b66501d..230f66cc 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/model/DemoValidation.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/model/DemoValidation.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.atml.mil.integration.model; +package it.gov.pagopa.atmlayer.service.model.model; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/model/ErrorResponse.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/model/ErrorResponse.java similarity index 93% rename from src/main/java/it/gov/pagopa/atml/mil/integration/model/ErrorResponse.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/model/ErrorResponse.java index 8a0ee4a5..f335fabd 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/model/ErrorResponse.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/model/ErrorResponse.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.atml.mil.integration.model; +package it.gov.pagopa.atmlayer.service.model.model; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import io.quarkus.runtime.annotations.RegisterForReflection; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/model/InfoResponse.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/model/InfoResponse.java similarity index 92% rename from src/main/java/it/gov/pagopa/atml/mil/integration/model/InfoResponse.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/model/InfoResponse.java index 43ef316e..c5fd8c61 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/model/InfoResponse.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/model/InfoResponse.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.atml.mil.integration.model; +package it.gov.pagopa.atmlayer.service.model.model; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.Builder; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/model/mil/AuthPayload.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/model/mil/AuthPayload.java similarity index 90% rename from src/main/java/it/gov/pagopa/atml/mil/integration/model/mil/AuthPayload.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/model/mil/AuthPayload.java index 6960ae61..6257160a 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/model/mil/AuthPayload.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/model/mil/AuthPayload.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.atml.mil.integration.model.mil; +package it.gov.pagopa.atmlayer.service.model.model.mil; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/model/mil/MILAccessToken.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/model/mil/MILAccessToken.java similarity index 82% rename from src/main/java/it/gov/pagopa/atml/mil/integration/model/mil/MILAccessToken.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/model/mil/MILAccessToken.java index 883733d0..9404ff74 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/model/mil/MILAccessToken.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/model/mil/MILAccessToken.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.atml.mil.integration.model.mil; +package it.gov.pagopa.atmlayer.service.model.model.mil; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/repository/PersonRepository.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/repository/PersonRepository.java similarity index 76% rename from src/main/java/it/gov/pagopa/atml/mil/integration/repository/PersonRepository.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/repository/PersonRepository.java index 6661de69..799c583c 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/repository/PersonRepository.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/repository/PersonRepository.java @@ -1,8 +1,8 @@ -package it.gov.pagopa.atml.mil.integration.repository; +package it.gov.pagopa.atmlayer.service.model.repository; import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase; import io.smallrye.mutiny.Uni; -import it.gov.pagopa.atml.mil.integration.entity.Person; +import it.gov.pagopa.atmlayer.service.model.entity.Person; import jakarta.enterprise.context.ApplicationScoped; import java.util.UUID; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/resource/AuthResource.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/resource/AuthResource.java similarity index 76% rename from src/main/java/it/gov/pagopa/atml/mil/integration/resource/AuthResource.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/resource/AuthResource.java index d6667ee5..177be4a5 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/resource/AuthResource.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/resource/AuthResource.java @@ -1,9 +1,9 @@ -package it.gov.pagopa.atml.mil.integration.resource; +package it.gov.pagopa.atmlayer.service.model.resource; import io.smallrye.mutiny.Uni; -import it.gov.pagopa.atml.mil.integration.model.mil.AuthPayload; -import it.gov.pagopa.atml.mil.integration.model.mil.MILAccessToken; -import it.gov.pagopa.atml.mil.integration.service.impl.MILAuthService; +import it.gov.pagopa.atmlayer.service.model.model.mil.AuthPayload; +import it.gov.pagopa.atmlayer.service.model.model.mil.MILAccessToken; +import it.gov.pagopa.atmlayer.service.model.service.impl.MILAuthService; import jakarta.inject.Inject; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/resource/InfoResource.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/resource/InfoResource.java similarity index 89% rename from src/main/java/it/gov/pagopa/atml/mil/integration/resource/InfoResource.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/resource/InfoResource.java index 6503916f..020ff320 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/resource/InfoResource.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/resource/InfoResource.java @@ -1,16 +1,14 @@ -package it.gov.pagopa.atml.mil.integration.resource; +package it.gov.pagopa.atmlayer.service.model.resource; import io.smallrye.common.annotation.NonBlocking; -import it.gov.pagopa.atml.mil.integration.model.DemoValidation; -import it.gov.pagopa.atml.mil.integration.model.InfoResponse; -import it.gov.pagopa.atml.mil.integration.repository.PersonRepository; +import it.gov.pagopa.atmlayer.service.model.model.DemoValidation; +import it.gov.pagopa.atmlayer.service.model.model.InfoResponse; +import it.gov.pagopa.atmlayer.service.model.repository.PersonRepository; import jakarta.inject.Inject; import jakarta.validation.Valid; -import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.openapi.annotations.Operation; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/resource/ModelResource.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/resource/ModelResource.java similarity index 80% rename from src/main/java/it/gov/pagopa/atml/mil/integration/resource/ModelResource.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/resource/ModelResource.java index 2a1f2304..da494ca8 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/resource/ModelResource.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/resource/ModelResource.java @@ -1,12 +1,12 @@ -package it.gov.pagopa.atml.mil.integration.resource; +package it.gov.pagopa.atmlayer.service.model.resource; import io.smallrye.mutiny.Uni; -import it.gov.pagopa.atml.mil.integration.entity.BpmnVersion; -import it.gov.pagopa.atml.mil.integration.model.AssociationMetadata; -import it.gov.pagopa.atml.mil.integration.dto.BpmnCreationDto; -import it.gov.pagopa.atml.mil.integration.dto.BpmnAssociationDto; -import it.gov.pagopa.atml.mil.integration.service.impl.ModelServiceImpl; -import it.gov.pagopa.atml.mil.integration.utils.BpmnDtoConverter; +import it.gov.pagopa.atmlayer.service.model.entity.BpmnVersion; +import it.gov.pagopa.atmlayer.service.model.model.AssociationMetadata; +import it.gov.pagopa.atmlayer.service.model.dto.BpmnCreationDto; +import it.gov.pagopa.atmlayer.service.model.dto.BpmnAssociationDto; +import it.gov.pagopa.atmlayer.service.model.service.impl.ModelServiceImpl; +import it.gov.pagopa.atmlayer.service.model.utils.BpmnDtoConverter; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.validation.Valid; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/resource/PersonResourceRead.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/resource/PersonResourceRead.java similarity index 85% rename from src/main/java/it/gov/pagopa/atml/mil/integration/resource/PersonResourceRead.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/resource/PersonResourceRead.java index 46e084c6..7985505a 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/resource/PersonResourceRead.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/resource/PersonResourceRead.java @@ -1,10 +1,10 @@ -package it.gov.pagopa.atml.mil.integration.resource; +package it.gov.pagopa.atmlayer.service.model.resource; import io.quarkus.arc.properties.UnlessBuildProperty; import io.smallrye.mutiny.Uni; -import it.gov.pagopa.atml.mil.integration.dto.PersonDto; -import it.gov.pagopa.atml.mil.integration.mapper.PersonMapper; -import it.gov.pagopa.atml.mil.integration.service.PersonService; +import it.gov.pagopa.atmlayer.service.model.dto.PersonDto; +import it.gov.pagopa.atmlayer.service.model.mapper.PersonMapper; +import it.gov.pagopa.atmlayer.service.model.service.PersonService; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.ws.rs.Consumes; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/resource/PersonResourceWrite.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/resource/PersonResourceWrite.java similarity index 79% rename from src/main/java/it/gov/pagopa/atml/mil/integration/resource/PersonResourceWrite.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/resource/PersonResourceWrite.java index 7522e64a..14fe4727 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/resource/PersonResourceWrite.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/resource/PersonResourceWrite.java @@ -1,11 +1,11 @@ -package it.gov.pagopa.atml.mil.integration.resource; +package it.gov.pagopa.atmlayer.service.model.resource; import io.quarkus.arc.properties.UnlessBuildProperty; import io.smallrye.mutiny.Uni; -import it.gov.pagopa.atml.mil.integration.dto.PersonDto; -import it.gov.pagopa.atml.mil.integration.entity.Person; -import it.gov.pagopa.atml.mil.integration.mapper.PersonMapper; -import it.gov.pagopa.atml.mil.integration.service.PersonService; +import it.gov.pagopa.atmlayer.service.model.dto.PersonDto; +import it.gov.pagopa.atmlayer.service.model.entity.Person; +import it.gov.pagopa.atmlayer.service.model.mapper.PersonMapper; +import it.gov.pagopa.atmlayer.service.model.service.PersonService; import jakarta.inject.Inject; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/service/ModelService.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/service/ModelService.java similarity index 70% rename from src/main/java/it/gov/pagopa/atml/mil/integration/service/ModelService.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/service/ModelService.java index 850bf0a9..1150a8c7 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/service/ModelService.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/service/ModelService.java @@ -1,6 +1,4 @@ -package it.gov.pagopa.atml.mil.integration.service; - -import it.gov.pagopa.atml.mil.integration.utils.ModelUtils; +package it.gov.pagopa.atmlayer.service.model.service; import java.io.File; import java.io.IOException; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/service/PersonService.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/service/PersonService.java similarity index 69% rename from src/main/java/it/gov/pagopa/atml/mil/integration/service/PersonService.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/service/PersonService.java index 93d2d415..646b00f4 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/service/PersonService.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/service/PersonService.java @@ -1,7 +1,7 @@ -package it.gov.pagopa.atml.mil.integration.service; +package it.gov.pagopa.atmlayer.service.model.service; import io.smallrye.mutiny.Uni; -import it.gov.pagopa.atml.mil.integration.entity.Person; +import it.gov.pagopa.atmlayer.service.model.entity.Person; import java.util.List; import java.util.UUID; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/service/impl/MILAuthService.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/service/impl/MILAuthService.java similarity index 68% rename from src/main/java/it/gov/pagopa/atml/mil/integration/service/impl/MILAuthService.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/service/impl/MILAuthService.java index 7f2d57b0..5893ec1f 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/service/impl/MILAuthService.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/service/impl/MILAuthService.java @@ -1,10 +1,10 @@ -package it.gov.pagopa.atml.mil.integration.service.impl; +package it.gov.pagopa.atmlayer.service.model.service.impl; import io.quarkus.rest.client.reactive.NotBody; import io.smallrye.mutiny.Uni; -import it.gov.pagopa.atml.mil.integration.client.MILAuthApi; -import it.gov.pagopa.atml.mil.integration.model.mil.AuthPayload; -import it.gov.pagopa.atml.mil.integration.model.mil.MILAccessToken; +import it.gov.pagopa.atmlayer.service.model.client.MILAuthApi; +import it.gov.pagopa.atmlayer.service.model.model.mil.AuthPayload; +import it.gov.pagopa.atmlayer.service.model.model.mil.MILAccessToken; import jakarta.enterprise.context.ApplicationScoped; import lombok.extern.slf4j.Slf4j; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/service/impl/ModelServiceImpl.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/service/impl/ModelServiceImpl.java similarity index 79% rename from src/main/java/it/gov/pagopa/atml/mil/integration/service/impl/ModelServiceImpl.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/service/impl/ModelServiceImpl.java index 904b3af0..581b6393 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/service/impl/ModelServiceImpl.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/service/impl/ModelServiceImpl.java @@ -1,7 +1,7 @@ -package it.gov.pagopa.atml.mil.integration.service.impl; +package it.gov.pagopa.atmlayer.service.model.service.impl; -import it.gov.pagopa.atml.mil.integration.service.ModelService; -import it.gov.pagopa.atml.mil.integration.utils.ModelUtils; +import it.gov.pagopa.atmlayer.service.model.service.ModelService; +import it.gov.pagopa.atmlayer.service.model.utils.ModelUtils; import jakarta.enterprise.context.ApplicationScoped; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/service/impl/PersonServiceImpl.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/service/impl/PersonServiceImpl.java similarity index 82% rename from src/main/java/it/gov/pagopa/atml/mil/integration/service/impl/PersonServiceImpl.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/service/impl/PersonServiceImpl.java index 48e11e5f..0ec356f0 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/service/impl/PersonServiceImpl.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/service/impl/PersonServiceImpl.java @@ -1,12 +1,12 @@ -package it.gov.pagopa.atml.mil.integration.service.impl; +package it.gov.pagopa.atmlayer.service.model.service.impl; import io.quarkus.hibernate.reactive.panache.common.WithSession; import io.quarkus.hibernate.reactive.panache.common.WithTransaction; import io.smallrye.mutiny.Uni; -import it.gov.pagopa.atml.mil.integration.entity.Person; -import it.gov.pagopa.atml.mil.integration.exception.AtmLayerRestException; -import it.gov.pagopa.atml.mil.integration.repository.PersonRepository; -import it.gov.pagopa.atml.mil.integration.service.PersonService; +import it.gov.pagopa.atmlayer.service.model.entity.Person; +import it.gov.pagopa.atmlayer.service.model.exception.AtmLayerRestException; +import it.gov.pagopa.atmlayer.service.model.repository.PersonRepository; +import it.gov.pagopa.atmlayer.service.model.service.PersonService; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.ws.rs.core.Response; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/utils/BpmnDtoConverter.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/utils/BpmnDtoConverter.java similarity index 65% rename from src/main/java/it/gov/pagopa/atml/mil/integration/utils/BpmnDtoConverter.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/utils/BpmnDtoConverter.java index 11da05c3..ac37aa2e 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/utils/BpmnDtoConverter.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/utils/BpmnDtoConverter.java @@ -1,9 +1,10 @@ -package it.gov.pagopa.atml.mil.integration.utils; +package it.gov.pagopa.atmlayer.service.model.utils; -import it.gov.pagopa.atml.mil.integration.dto.BpmnCreationDto; -import it.gov.pagopa.atml.mil.integration.enumeration.StatusEnum; -import it.gov.pagopa.atml.mil.integration.entity.BpmnVersion; -import it.gov.pagopa.atml.mil.integration.model.CreationMetadata; +import it.gov.pagopa.atmlayer.service.model.dto.BpmnCreationDto; +import it.gov.pagopa.atmlayer.service.model.entity.BpmnVersionPK; +import it.gov.pagopa.atmlayer.service.model.enumeration.StatusEnum; +import it.gov.pagopa.atmlayer.service.model.entity.BpmnVersion; +import it.gov.pagopa.atmlayer.service.model.model.CreationMetadata; import jakarta.enterprise.context.ApplicationScoped; import java.io.File; @@ -15,9 +16,11 @@ public class BpmnDtoConverter { public static BpmnVersion converter(BpmnCreationDto bpmnCreationDto) throws NoSuchAlgorithmException, IOException { BpmnVersion bpmnVersion = new BpmnVersion(); + BpmnVersionPK bpmnVersionPK = new BpmnVersionPK(); CreationMetadata creationMetadata = bpmnCreationDto.getCreationMetadata(); - bpmnVersion.setBpmnId(creationMetadata.getBpmnId()); - bpmnVersion.setModelVersion(creationMetadata.getModelVersion()); + bpmnVersionPK.setBpmnId(creationMetadata.getBpmnId()); + bpmnVersionPK.setModelVersion(creationMetadata.getModelVersion()); + bpmnVersion.setBpmnVersionPK(bpmnVersionPK); bpmnVersion.setDeployedFileName(creationMetadata.getDeployedFileName()); bpmnVersion.setDefinitionKey(creationMetadata.getDefinitionKey()); bpmnVersion.setFunctionType(creationMetadata.getFunctionType()); diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/utils/ConstraintViolationMappingUtils.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/utils/ConstraintViolationMappingUtils.java similarity index 84% rename from src/main/java/it/gov/pagopa/atml/mil/integration/utils/ConstraintViolationMappingUtils.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/utils/ConstraintViolationMappingUtils.java index 94a3a2c4..7b119e41 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/utils/ConstraintViolationMappingUtils.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/utils/ConstraintViolationMappingUtils.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.atml.mil.integration.utils; +package it.gov.pagopa.atmlayer.service.model.utils; import jakarta.validation.ConstraintViolation; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/utils/ConstraintViolationMappingUtilsImpl.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/utils/ConstraintViolationMappingUtilsImpl.java similarity index 94% rename from src/main/java/it/gov/pagopa/atml/mil/integration/utils/ConstraintViolationMappingUtilsImpl.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/utils/ConstraintViolationMappingUtilsImpl.java index 6f23b8b3..61f55993 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/utils/ConstraintViolationMappingUtilsImpl.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/utils/ConstraintViolationMappingUtilsImpl.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.atml.mil.integration.utils; +package it.gov.pagopa.atmlayer.service.model.utils; import jakarta.inject.Singleton; import jakarta.validation.ConstraintViolation; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/utils/ModelUtils.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/utils/ModelUtils.java similarity index 96% rename from src/main/java/it/gov/pagopa/atml/mil/integration/utils/ModelUtils.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/utils/ModelUtils.java index 43584f95..20bf9cc1 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/utils/ModelUtils.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/utils/ModelUtils.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.atml.mil.integration.utils; +package it.gov.pagopa.atmlayer.service.model.utils; import com.google.common.io.Files; import jakarta.enterprise.context.ApplicationScoped; diff --git a/src/main/java/it/gov/pagopa/atml/mil/integration/validator/BankKeyValidator.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/validator/BankKeyValidator.java similarity index 86% rename from src/main/java/it/gov/pagopa/atml/mil/integration/validator/BankKeyValidator.java rename to src/main/java/it/gov/pagopa/atmlayer/service/model/validator/BankKeyValidator.java index f4429bea..fb51854c 100644 --- a/src/main/java/it/gov/pagopa/atml/mil/integration/validator/BankKeyValidator.java +++ b/src/main/java/it/gov/pagopa/atmlayer/service/model/validator/BankKeyValidator.java @@ -1,7 +1,7 @@ -package it.gov.pagopa.atml.mil.integration.validator; +package it.gov.pagopa.atmlayer.service.model.validator; -import it.gov.pagopa.atml.mil.integration.constraint.BankKeyConstraint; -import it.gov.pagopa.atml.mil.integration.model.BankKey; +import it.gov.pagopa.atmlayer.service.model.constraint.BankKeyConstraint; +import it.gov.pagopa.atmlayer.service.model.model.BankKey; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/src/test/java/it/gov/pagopa/atml/mil/integration/resource/InfoResourceTest.java b/src/test/java/it/gov/pagopa/atmlayer/service/model/resource/InfoResourceTest.java similarity index 90% rename from src/test/java/it/gov/pagopa/atml/mil/integration/resource/InfoResourceTest.java rename to src/test/java/it/gov/pagopa/atmlayer/service/model/resource/InfoResourceTest.java index 919d1133..a330cf97 100644 --- a/src/test/java/it/gov/pagopa/atml/mil/integration/resource/InfoResourceTest.java +++ b/src/test/java/it/gov/pagopa/atmlayer/service/model/resource/InfoResourceTest.java @@ -1,8 +1,8 @@ -package it.gov.pagopa.atml.mil.integration.resource; +package it.gov.pagopa.atmlayer.service.model.resource; import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.test.junit.QuarkusTest; -import it.gov.pagopa.atml.mil.integration.model.InfoResponse; +import it.gov.pagopa.atmlayer.service.model.model.InfoResponse; import jakarta.inject.Inject; import lombok.SneakyThrows; import org.junit.jupiter.api.Test;