fix: transferIndex as integer

pagopa · Jan 29, 2025 · b214636 · b214636
1 parent 7debaee
commit b214636
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/openapi/p4pa-pagopa-payments.openapi.yaml b/openapi/p4pa-pagopa-payments.openapi.yaml
@@ -296,7 +296,7 @@ components:
           type: string
         transferIndex:
           type: integer
-          format: int64
+          format: int32
     ReceiptDTO:
       type: object
       required:

diff --git a/src/main/java/it/gov/pagopa/pu/pagopapayments/service/JAXBTransformService.java b/src/main/java/it/gov/pagopa/pu/pagopapayments/service/JAXBTransformService.java
@@ -7,6 +7,7 @@
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.stereotype.Service;
 import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
@@ -107,8 +108,8 @@ public <T> T unmarshalling(byte[] bytes, Class<T> clazz, String xsdFile, boolean
       JAXBElement<T> element = unmarshaller.unmarshal(source, clazz);
       return element.getValue();
     } catch (SAXException | IOException | JAXBException e ) {
-      if(tryStrippingNonValidChars && e instanceof UnmarshalException unmarshalException && unmarshalException.getLinkedException()!=null &&
-      StringUtils.containsIgnoreCase(unmarshalException.getLinkedException().getMessage(), "invalid XML character")) {
+      if(tryStrippingNonValidChars && e instanceof UnmarshalException unmarshalException &&
+        unmarshalException.getLinkedException() instanceof SAXParseException) {
         log.warn("detected 'invalid XML character' error unmarshalling XML.. trying to strip invalid characters", e);
         String string = new String(bytes, StandardCharsets.UTF_8);
         string = stripNonValidXMLCharacters(string);

diff --git a/src/test/java/it/gov/pagopa/pu/pagopapayments/mapper/PaGetPaymentMapperTest.java b/src/test/java/it/gov/pagopa/pu/pagopapayments/mapper/PaGetPaymentMapperTest.java
@@ -57,7 +57,7 @@ void givenValidInstallmentDTOWhenInstallmentDtoPagoPa2PaGetPaymentV2ResponseThen
 
     installmentDTO.getDebtor().setEntityType(PersonDTO.EntityTypeEnum.F);
     for(int idx = 0; idx<installmentDTO.getTransfers().size(); idx++){
-      installmentDTO.getTransfers().get(idx).setTransferIndex(idx+1L);
+      installmentDTO.getTransfers().get(idx).setTransferIndex(idx+1);
     }
     //when
     PaGetPaymentV2Response responseV2 = PaGetPaymentMapper.installmentDto2PaGetPaymentV2Response(installmentDTO, organization, StTransferType.PAGOPA);
@@ -114,7 +114,7 @@ void givenValidInstallmentDTOPostalWhenInstallmentDto2PaGetPaymentV2ResponseThen
 
     installmentDTO.getDebtor().setEntityType(PersonDTO.EntityTypeEnum.F);
     for(int idx = 0; idx<installmentDTO.getTransfers().size(); idx++){
-      installmentDTO.getTransfers().get(idx).setTransferIndex(idx+1L);
+      installmentDTO.getTransfers().get(idx).setTransferIndex(idx+1);
     }
     //when
     PaGetPaymentV2Response responseV2 = PaGetPaymentMapper.installmentDto2PaGetPaymentV2Response(installmentDTO, organization, StTransferType.POSTAL);

diff --git a/src/test/java/it/gov/pagopa/pu/pagopapayments/mapper/PaVerifyPaymentNoticeMapperTest.java b/src/test/java/it/gov/pagopa/pu/pagopapayments/mapper/PaVerifyPaymentNoticeMapperTest.java
@@ -58,7 +58,7 @@ void givenValidInstallmentDTOWhenInstallmentDto2PaVerifyPaymentNoticeResThenOk()
 
     installmentDTO.getDebtor().setEntityType(PersonDTO.EntityTypeEnum.F);
     for(int idx = 0; idx<installmentDTO.getTransfers().size(); idx++){
-      installmentDTO.getTransfers().get(idx).setTransferIndex(idx+1L);
+      installmentDTO.getTransfers().get(idx).setTransferIndex(idx+1);
     }
     //when
     PaVerifyPaymentNoticeRes response = PaVerifyPaymentNoticeMapper.installmentDto2PaVerifyPaymentNoticeRes(installmentDTO, organization);