[PAGOPA-2178] revert(sensitive annotation): remove the annotation bec…

…ause we need to define an common area strategy
pagopa · Sep 30, 2024 · 3621a9a · 3621a9a
1 parent f1a3484
commit 3621a9a
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 31 deletions.
diff --git a/src/main/java/it/gov/pagopa/payments/config/LoggingAspect.java b/src/main/java/it/gov/pagopa/payments/config/LoggingAspect.java
@@ -6,7 +6,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import it.gov.pagopa.payments.exception.AppError;
 import it.gov.pagopa.payments.model.ProblemJson;
-import it.gov.pagopa.payments.utils.Sensitive;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
@@ -91,7 +90,6 @@ private static Map<String, String> getParams(ProceedingJoinPoint joinPoint) {
     int i = 0;
     for (var parameter : method.getParameters()) {
       var paramName = parameter.getName();
-      boolean isSensitive = parameter.isAnnotationPresent(Sensitive.class);
       var arg = joinPoint.getArgs()[i++];
       if (arg instanceof JAXBElement<?>) {
         try {
@@ -100,9 +98,6 @@ private static Map<String, String> getParams(ProceedingJoinPoint joinPoint) {
           arg = "unreadable!";
         }
       }
-      if (isSensitive && arg != null) {
-        arg = "obfuscated-" + arg.hashCode();
-      }
       params.put(paramName, deNull(arg));
     }
     return params;

diff --git a/src/main/java/it/gov/pagopa/payments/controller/receipt/IPaymentsController.java b/src/main/java/it/gov/pagopa/payments/controller/receipt/IPaymentsController.java
@@ -11,7 +11,6 @@
 import it.gov.pagopa.payments.model.PaymentsResult;
 import it.gov.pagopa.payments.model.ProblemJson;
 import it.gov.pagopa.payments.model.ReceiptModelResponse;
-import it.gov.pagopa.payments.utils.Sensitive;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -82,7 +81,6 @@ ResponseEntity<String> getReceiptByIUV(
                                     + " and identifies three key elements of a payment: reason, payer, amount",
                     required = true, example = "ABC123")
             @PathVariable("iuv")
-                    @Sensitive
             String iuv,
             @Valid @Parameter(description = "Segregation codes for which broker is authorized") @Pattern(regexp = "\\d{2}(,\\d{2})*")
             @RequestParam(required = false) String segregationCodes);

diff --git a/src/main/java/it/gov/pagopa/payments/endpoints/PartnerEndpoint.java b/src/main/java/it/gov/pagopa/payments/endpoints/PartnerEndpoint.java
@@ -21,7 +21,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.stream.XMLStreamException;
 
-import it.gov.pagopa.payments.utils.Sensitive;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ws.server.endpoint.annotation.Endpoint;
@@ -43,7 +42,7 @@ public class PartnerEndpoint {
   @PayloadRoot(localPart = "paVerifyPaymentNoticeReq")
   @ResponsePayload
   public JAXBElement<PaVerifyPaymentNoticeRes> paVerifyPaymentNotice(
-      @RequestPayload @Sensitive JAXBElement<PaVerifyPaymentNoticeReq> request)
+      @RequestPayload JAXBElement<PaVerifyPaymentNoticeReq> request)
       throws DatatypeConfigurationException, PartnerValidationException {
 
     log.debug(" paVerifyPaymentNotice START ");
@@ -66,7 +65,7 @@ public JAXBElement<PaGetPaymentRes> paGetPayment(
   @PayloadRoot(localPart = "paGetPaymentV2Request")
   @ResponsePayload
   public JAXBElement<PaGetPaymentV2Response> paGetPaymentV2(
-      @RequestPayload @Sensitive JAXBElement<PaGetPaymentV2Request> request)
+      @RequestPayload JAXBElement<PaGetPaymentV2Request> request)
       throws PartnerValidationException, DatatypeConfigurationException {
 
     log.debug(" paGetPaymentV2 START ");

diff --git a/src/main/java/it/gov/pagopa/payments/entity/ReceiptEntity.java b/src/main/java/it/gov/pagopa/payments/entity/ReceiptEntity.java
@@ -1,6 +1,5 @@
 package it.gov.pagopa.payments.entity;
 
-import it.gov.pagopa.payments.utils.Sensitive;
 import lombok.*;
 
 @Data
@@ -11,7 +10,6 @@ public class ReceiptEntity {
 
     private String organizationFiscalCode;
     private String iuv;
-    @Sensitive
     private String debtor;
     private String paymentDateTime;
     private String status = Status.PAID.name();

diff --git a/src/main/java/it/gov/pagopa/payments/model/PaymentsModelResponse.java b/src/main/java/it/gov/pagopa/payments/model/PaymentsModelResponse.java
@@ -4,7 +4,6 @@
 import java.time.LocalDateTime;
 import java.util.List;
 
-import it.gov.pagopa.payments.utils.Sensitive;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
@@ -34,7 +33,6 @@ public class PaymentsModelResponse implements Serializable {
   private String idFlowReporting;
   private PaymentOptionStatus status;
   private Type type;
-  @Sensitive
   private String fiscalCode;
   @ToString.Exclude
   private String fullName;

diff --git a/src/main/java/it/gov/pagopa/payments/model/ReceiptModelResponse.java b/src/main/java/it/gov/pagopa/payments/model/ReceiptModelResponse.java
@@ -1,6 +1,5 @@
 package it.gov.pagopa.payments.model;
 
-import it.gov.pagopa.payments.utils.Sensitive;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -15,7 +14,6 @@ public class ReceiptModelResponse {
 
   private String organizationFiscalCode;
   private String iuv;
-  @Sensitive
   private String debtor;
   private String paymentDateTime;
   private String status;

diff --git a/src/main/java/it/gov/pagopa/payments/model/spontaneous/DebtorModel.java b/src/main/java/it/gov/pagopa/payments/model/spontaneous/DebtorModel.java
@@ -6,7 +6,6 @@
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
-import it.gov.pagopa.payments.utils.Sensitive;
 import lombok.*;
 
 @Data
@@ -19,7 +18,6 @@ public class DebtorModel implements Serializable {
   private Type type;
 
   @NotBlank(message = "fiscal code is required")
-  @Sensitive
   private String fiscalCode;
 
   @NotBlank(message = "full name is required")

diff --git a/src/main/java/it/gov/pagopa/payments/model/spontaneous/PaymentPositionModel.java b/src/main/java/it/gov/pagopa/payments/model/spontaneous/PaymentPositionModel.java
@@ -12,7 +12,6 @@
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
-import it.gov.pagopa.payments.utils.Sensitive;
 import lombok.*;
 
 @Builder
@@ -28,7 +27,6 @@ public class PaymentPositionModel implements Serializable {
   private Type type;
 
   @NotBlank(message = "fiscal code is required")
-  @Sensitive
   private String fiscalCode;
 
   @NotBlank(message = "full name is required")

diff --git a/src/main/java/it/gov/pagopa/payments/utils/Sensitive.java b/src/main/java/it/gov/pagopa/payments/utils/Sensitive.java