[NOD-781] feat: major code and structure refactoring

pom.xml

@@ -101,7 +101,6 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
-            <version>${openfeign-version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.retry</groupId>

src/main/java/it/gov/pagopa/wispconverter/client/DecouplerCachingClient.java → src/main/java/it/gov/pagopa/wispconverter/client/decoupler/DecouplerCachingClient.java

@@ -1,4 +1,4 @@
-package it.gov.pagopa.wispconverter.client;
+package it.gov.pagopa.wispconverter.client.decoupler;
 
 import feign.FeignException;
 import it.gov.pagopa.wispconverter.config.client.DecouplerCachingFeignConfig;

src/main/java/it/gov/pagopa/wispconverter/client/GPDClient.java → src/main/java/it/gov/pagopa/wispconverter/client/gpd/GPDClient.java

@@ -1,8 +1,8 @@
-package it.gov.pagopa.wispconverter.client;
+package it.gov.pagopa.wispconverter.client.gpd;
 
 import feign.FeignException;
+import it.gov.pagopa.wispconverter.client.gpd.model.MultiplePaymentPosition;
 import it.gov.pagopa.wispconverter.config.client.GPDFeignConfig;
-import it.gov.pagopa.wispconverter.model.client.gpd.MultiplePaymentPosition;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.retry.annotation.Backoff;

src/main/java/it/gov/pagopa/wispconverter/model/client/gpd/DebtPositionStatus.java → src/main/java/it/gov/pagopa/wispconverter/client/gpd/model/DebtPositionStatus.java

@@ -1,4 +1,4 @@
-package it.gov.pagopa.wispconverter.model.client.gpd;
+package it.gov.pagopa.wispconverter.client.gpd.model;
 
 import java.util.EnumSet;
 import java.util.Set;

src/main/java/it/gov/pagopa/wispconverter/model/client/gpd/MultiplePaymentPosition.java → src/main/java/it/gov/pagopa/wispconverter/client/gpd/model/MultiplePaymentPosition.java

@@ -1,4 +1,4 @@
-package it.gov.pagopa.wispconverter.model.client.gpd;
+package it.gov.pagopa.wispconverter.client.gpd.model;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;

src/main/java/it/gov/pagopa/wispconverter/client/gpd/model/PaymentOption.java

@@ -0,0 +1,36 @@
+package it.gov.pagopa.wispconverter.client.gpd.model;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+public class PaymentOption implements Serializable {
+
+    private String nav;
+
+    private String iuv;
+
+    private Long amount;
+
+    private String description;
+
+    private Boolean isPartialPayment;
+
+    private LocalDateTime dueDate;
+
+    private LocalDateTime retentionDate;
+
+    private long fee;
+
+    private long notificationFee;
+
+    private List<Transfer> transfer = new ArrayList<>();
+
+    private List<PaymentOptionMetadata> paymentOptionMetadata = new ArrayList<>();
+}

src/main/java/it/gov/pagopa/wispconverter/model/client/gpd/PaymentOptionMetadata.java → src/main/java/it/gov/pagopa/wispconverter/client/gpd/model/PaymentOptionMetadata.java

@@ -1,4 +1,4 @@
-package it.gov.pagopa.wispconverter.model.client.gpd;
+package it.gov.pagopa.wispconverter.client.gpd.model;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;

src/main/java/it/gov/pagopa/wispconverter/client/gpd/model/PaymentPosition.java

@@ -0,0 +1,54 @@
+package it.gov.pagopa.wispconverter.client.gpd.model;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+public class PaymentPosition implements Serializable {
+
+    private String iupd;
+
+    private Type type;
+
+    private String fiscalCode;
+
+    private String fullName;
+
+    private String streetName;
+
+    private String civicNumber;
+
+    private String postalCode;
+
+    private String city;
+
+    private String province;
+
+    private String region;
+
+    private String country;
+
+    private String email;
+
+    private String phone;
+
+    private Boolean switchToExpired;
+
+    private String companyName;
+
+    private String officeName;
+
+    private LocalDateTime validityDate;
+
+    private LocalDateTime paymentDate;
+
+    private DebtPositionStatus status;
+
+    private List<PaymentOption> paymentOption = new ArrayList<>();
+}

src/main/java/it/gov/pagopa/wispconverter/model/client/gpd/Stamp.java → src/main/java/it/gov/pagopa/wispconverter/client/gpd/model/Stamp.java

@@ -1,4 +1,4 @@
-package it.gov.pagopa.wispconverter.model.client.gpd;
+package it.gov.pagopa.wispconverter.client.gpd.model;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

src/main/java/it/gov/pagopa/wispconverter/model/client/gpd/Transfer.java → src/main/java/it/gov/pagopa/wispconverter/client/gpd/model/Transfer.java

@@ -1,4 +1,4 @@
-package it.gov.pagopa.wispconverter.model.client.gpd;
+package it.gov.pagopa.wispconverter.client.gpd.model;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;

src/main/java/it/gov/pagopa/wispconverter/model/client/gpd/TransferMetadata.java → src/main/java/it/gov/pagopa/wispconverter/client/gpd/model/TransferMetadata.java

@@ -1,4 +1,4 @@
-package it.gov.pagopa.wispconverter.model.client.gpd;
+package it.gov.pagopa.wispconverter.client.gpd.model;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;

src/main/java/it/gov/pagopa/wispconverter/client/gpd/model/Type.java

@@ -0,0 +1,5 @@
+package it.gov.pagopa.wispconverter.client.gpd.model;
+
+public enum Type {
+    F, G
+}

src/main/java/it/gov/pagopa/wispconverter/client/IUVGeneratorClient.java → src/main/java/it/gov/pagopa/wispconverter/client/iuvgenerator/IUVGeneratorClient.java

@@ -1,9 +1,9 @@
-package it.gov.pagopa.wispconverter.client;
+package it.gov.pagopa.wispconverter.client.iuvgenerator;
 
 import feign.FeignException;
+import it.gov.pagopa.wispconverter.client.iuvgenerator.model.IUVGeneratorRequest;
+import it.gov.pagopa.wispconverter.client.iuvgenerator.model.IUVGeneratorResponse;
 import it.gov.pagopa.wispconverter.config.client.IUVGeneratorFeignConfig;
-import it.gov.pagopa.wispconverter.model.client.iuvgenerator.IUVGeneratorRequest;
-import it.gov.pagopa.wispconverter.model.client.iuvgenerator.IUVGeneratorResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.retry.annotation.Backoff;

src/main/java/it/gov/pagopa/wispconverter/model/client/iuvgenerator/IUVGeneratorRequest.java → src/main/java/it/gov/pagopa/wispconverter/client/iuvgenerator/model/IUVGeneratorRequest.java

@@ -1,4 +1,4 @@
-package it.gov.pagopa.wispconverter.model.client.iuvgenerator;
+package it.gov.pagopa.wispconverter.client.iuvgenerator.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.*;

src/main/java/it/gov/pagopa/wispconverter/model/client/iuvgenerator/IUVGeneratorResponse.java → src/main/java/it/gov/pagopa/wispconverter/client/iuvgenerator/model/IUVGeneratorResponse.java

@@ -1,4 +1,4 @@
-package it.gov.pagopa.wispconverter.model.client.iuvgenerator;
+package it.gov.pagopa.wispconverter.client.iuvgenerator.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.*;

src/main/java/it/gov/pagopa/wispconverter/config/CosmosDBConfig.java

@@ -8,6 +8,7 @@
 import com.azure.spring.data.cosmos.config.CosmosConfig;
 import com.azure.spring.data.cosmos.core.ResponseDiagnostics;
 import com.azure.spring.data.cosmos.core.ResponseDiagnosticsProcessor;
+import com.azure.spring.data.cosmos.core.mapping.EnableCosmosAuditing;
 import com.azure.spring.data.cosmos.repository.config.EnableCosmosRepositories;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -20,7 +21,7 @@
 @Configuration
 @EnableCosmosRepositories("it.gov.pagopa.wispconverter.repository")
 @EnableConfigurationProperties
-//@EnableCosmosAuditing
+@EnableCosmosAuditing
 @ConditionalOnExpression("'${properties.environment}'!='test'")
 @Slf4j
 public class CosmosDBConfig extends AbstractCosmosConfiguration {

src/main/java/it/gov/pagopa/wispconverter/config/UnmarshallerConfig.java

@@ -5,7 +5,6 @@
 import org.springframework.context.annotation.Scope;
 
 import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
@@ -23,9 +22,4 @@ public DocumentBuilderFactory documentBuilderFactory() throws ParserConfiguratio
         dbf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
         return dbf;
     }
-
-    @Bean
-    public DocumentBuilder documentBuilder(DocumentBuilderFactory documentBuilderFactory) throws ParserConfigurationException {
-        return documentBuilderFactory.newDocumentBuilder();
-    }
 }

src/main/java/it/gov/pagopa/wispconverter/config/WebMvcConfiguration.java → src/main/java/it/gov/pagopa/wispconverter/config/WebMvcConfig.java

@@ -1,7 +1,7 @@
 package it.gov.pagopa.wispconverter.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import it.gov.pagopa.wispconverter.model.AppCorsConfiguration;
+import it.gov.pagopa.wispconverter.config.model.AppCors;
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
@@ -10,7 +10,7 @@
 
 
 @Configuration
-public class WebMvcConfiguration implements WebMvcConfigurer {
+public class WebMvcConfig implements WebMvcConfigurer {
 
     @Value("${cors.configuration}")
     private String corsConfiguration;
@@ -19,11 +19,11 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
     @SneakyThrows
     @Override
     public void addCorsMappings(CorsRegistry registry) {
-        AppCorsConfiguration appCorsConfiguration = new ObjectMapper().readValue(corsConfiguration,
-                AppCorsConfiguration.class);
+        AppCors appCors = new ObjectMapper().readValue(corsConfiguration,
+                AppCors.class);
         registry.addMapping("/**")
-                .allowedOrigins(appCorsConfiguration.getOrigins())
-                .allowedMethods(appCorsConfiguration.getMethods());
+                .allowedOrigins(appCors.getOrigins())
+                .allowedMethods(appCors.getMethods());
     }
 }
 

src/main/java/it/gov/pagopa/wispconverter/config/client/AuthFeignConfig.java

@@ -8,12 +8,13 @@ public abstract class AuthFeignConfig {
 
     static final String HEADER_REQUEST_ID = "X-Request-Id";
     static final String HEADER_SUBSCRIPTION_KEY = "Ocp-Apim-Subscription-Key";
-    protected String subscriptionKey;
 
     @Bean
     public RequestInterceptor requestIdInterceptor() {
         return requestTemplate -> requestTemplate
                 .header(HEADER_REQUEST_ID, MDC.get("requestId"))
-                .header(HEADER_SUBSCRIPTION_KEY, subscriptionKey);
+                .header(HEADER_SUBSCRIPTION_KEY, getSubscriptionKey());
     }
+
+    public abstract String getSubscriptionKey();
 }

src/main/java/it/gov/pagopa/wispconverter/config/client/DecouplerCachingFeignConfig.java

@@ -1,16 +1,18 @@
 package it.gov.pagopa.wispconverter.config.client;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 @Component
+@RequiredArgsConstructor
 public class DecouplerCachingFeignConfig extends AuthFeignConfig {
 
-    private static final String DECOUPLER_CACHING_SUBSCRIPTION_KEY = "${client.decoupler-caching.subscription-key}";
+    @Value("${client.decoupler-caching.subscription-key}")
+    private String subscriptionKey;
 
-    @Autowired
-    public DecouplerCachingFeignConfig(@Value(DECOUPLER_CACHING_SUBSCRIPTION_KEY) String subscriptionKey) {
-        this.subscriptionKey = subscriptionKey;
+    @Override
+    public String getSubscriptionKey() {
+        return this.subscriptionKey;
     }
 }

src/main/java/it/gov/pagopa/wispconverter/config/client/GPDFeignConfig.java

@@ -1,16 +1,18 @@
 package it.gov.pagopa.wispconverter.config.client;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 @Component
+@RequiredArgsConstructor
 public class GPDFeignConfig extends AuthFeignConfig {
 
-    private static final String GPD_SUBKEY_PLACEHOLDER = "${client.gpd.subscription-key}";
+    @Value("${client.gpd.subscription-key}")
+    private String subscriptionKey;
 
-    @Autowired
-    public GPDFeignConfig(@Value(GPD_SUBKEY_PLACEHOLDER) String subscriptionKey) {
-        this.subscriptionKey = subscriptionKey;
+    @Override
+    public String getSubscriptionKey() {
+        return this.subscriptionKey;
     }
 }

src/main/java/it/gov/pagopa/wispconverter/config/client/IUVGeneratorFeignConfig.java

@@ -1,16 +1,18 @@
 package it.gov.pagopa.wispconverter.config.client;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 @Component
+@RequiredArgsConstructor
 public class IUVGeneratorFeignConfig extends AuthFeignConfig {
 
-    private static final String IUVGENERATOR_SUBKEY_PLACEHOLDER = "${client.iuv-generator.subscription-key}";
+    @Value("${client.iuv-generator.subscription-key}")
+    private String subscriptionKey;
 
-    @Autowired
-    public IUVGeneratorFeignConfig(@Value(IUVGENERATOR_SUBKEY_PLACEHOLDER) String subscriptionKey) {
-        this.subscriptionKey = subscriptionKey;
+    @Override
+    public String getSubscriptionKey() {
+        return this.subscriptionKey;
     }
 }

src/main/java/it/gov/pagopa/wispconverter/model/AppCorsConfiguration.java → src/main/java/it/gov/pagopa/wispconverter/config/model/AppCors.java

@@ -1,13 +1,8 @@
-package it.gov.pagopa.wispconverter.model;
+package it.gov.pagopa.wispconverter.config.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 
 @Data
 @Builder(toBuilder = true)
@@ -16,7 +11,7 @@
 @ToString
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class AppCorsConfiguration {
+public class AppCors {
 
     private String[] origins;
     private String[] methods;