Merge remote-tracking branch 'origin/develop'

pagopa · Aug 5, 2020 · 4f7d554 · 4f7d554
2 parents 77cd0d6 + 2cb8108
commit 4f7d554
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 25 deletions.
diff --git a/api/batch/pom.xml b/api/batch/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <artifactId>rtd-ms-transaction-filter-api</artifactId>
         <groupId>it.gov.pagopa.rtd.ms.transaction_filter.api</groupId>
-        <version>1.0.1-RC2</version>
+        <version>1.0.0-RC3</version>
     </parent>
 
     <groupId>it.gov.pagopa.rtd.ms.transaction_filter.api</groupId>
     <artifactId>rtd-ms-transaction-filter-api-batch</artifactId>
-    <version>1.0.1-RC2</version>
+    <version>1.0.0-RC3</version>
 
     <dependencies>
         <dependency>

diff --git a/...gov/pagopa/rtd/transaction_filter/batch/step/listener/TransactionItemProcessListener.java b/...gov/pagopa/rtd/transaction_filter/batch/step/listener/TransactionItemProcessListener.java
@@ -41,7 +41,7 @@ public void afterProcess(InboundTransaction item, @Nullable InboundTransaction r
                 File file = new File(
                         resolver.getResource(errorTransactionsLogsPath).getFile().getAbsolutePath()
                                 .concat("/".concat(executionDate)) + "_transactionsFilteredRecords.csv");
-                FileUtils.writeStringToFile(file, buildCsv(item), Charset.defaultCharset());
+                FileUtils.writeStringToFile(file, buildCsv(item), Charset.defaultCharset(), true);
             } catch (Exception e) {
                 if (log.isErrorEnabled()) {
                     log.error(e.getMessage(), e);

diff --git a/api/pom.xml b/api/pom.xml
@@ -4,21 +4,21 @@
     <parent>
         <artifactId>rtd-ms-transaction-filter</artifactId>
         <groupId>it.gov.pagopa.rtd.ms</groupId>
-        <version>1.0.1-RC2</version>
+        <version>1.0.0-RC3</version>
 
     </parent>
 
     <groupId>it.gov.pagopa.rtd.ms.transaction_filter.api</groupId>
     <artifactId>rtd-ms-transaction-filter-api</artifactId>
-    <version>1.0.1-RC2</version>
+    <version>1.0.0-RC3</version>
 
     <packaging>pom</packaging>
 
     <dependencies>
         <dependency>
             <groupId>it.gov.pagopa.rtd.ms.transaction_filter</groupId>
             <artifactId>rtd-ms-transaction-filter-core</artifactId>
-            <version>1.0.1-RC2</version>
+            <version>1.0.0-RC3</version>
 
         </dependency>
     </dependencies>

diff --git a/app/pom.xml b/app/pom.xml
@@ -4,20 +4,20 @@
     <parent>
         <artifactId>rtd-ms-transaction-filter</artifactId>
         <groupId>it.gov.pagopa.rtd.ms</groupId>
-        <version>1.0.1-RC2</version>
+        <version>1.0.0-RC3</version>
 
     </parent>
 
     <groupId>it.gov.pagopa.rtd.ms.transaction_filter</groupId>
     <artifactId>transaction-filter-app</artifactId>
-    <version>1.0.1-RC2</version>
+    <version>1.0.0-RC3</version>
 
 
     <dependencies>
         <dependency>
             <groupId>it.gov.pagopa.rtd.ms.transaction_filter.api</groupId>
             <artifactId>rtd-ms-transaction-filter-api-batch</artifactId>
-            <version>1.0.1-RC2</version>
+            <version>1.0.0-RC3</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -4,32 +4,32 @@
     <parent>
         <artifactId>rtd-ms-transaction-filter</artifactId>
         <groupId>it.gov.pagopa.rtd.ms</groupId>
-        <version>1.0.1-RC2</version>
+        <version>1.0.0-RC3</version>
 
      </parent>
 
     <groupId>it.gov.pagopa.rtd.ms.transaction_filter</groupId>
     <artifactId>rtd-ms-transaction-filter-core</artifactId>
-    <version>1.0.1-RC2</version>
+    <version>1.0.0-RC3</version>
 
 
     <dependencies>
         <dependency>
             <groupId>it.gov.pagopa.rtd.ms.transaction_filter.integration</groupId>
             <artifactId>rtd-ms-transaction_filter-integration-sftp</artifactId>
-            <version>1.0.1-RC2</version>
+            <version>1.0.0-RC3</version>
 
         </dependency>
         <dependency>
             <groupId>it.gov.pagopa.rtd.ms.transaction_filter.integration</groupId>
             <artifactId>rtd-ms-transaction-filter-integration-jpa</artifactId>
-            <version>1.0.1-RC2</version>
+            <version>1.0.0-RC3</version>
 
         </dependency>
         <dependency>
             <groupId>it.gov.pagopa.rtd.ms.transaction_filter.integration</groupId>
             <artifactId>rtd-ms-transaction_filter-integration-rest</artifactId>
-            <version>1.0.1-RC2</version>
+            <version>1.0.0-RC3</version>
 
         </dependency>
         <dependency>

diff --git a/integration/jpa/pom.xml b/integration/jpa/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <artifactId>rtd-ms-transaction-filter-integration</artifactId>
         <groupId>it.gov.pagopa.rtd.ms.transaction_filter</groupId>
-        <version>1.0.1-RC2</version>
+        <version>1.0.0-RC3</version>
 
     </parent>
 
     <groupId>it.gov.pagopa.rtd.ms.transaction_filter.integration</groupId>
     <artifactId>rtd-ms-transaction-filter-integration-jpa</artifactId>
-    <version>1.0.1-RC2</version>
+    <version>1.0.0-RC3</version>
 
 
     <dependencies>

diff --git a/integration/pom.xml b/integration/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <artifactId>rtd-ms-transaction-filter</artifactId>
         <groupId>it.gov.pagopa.rtd.ms</groupId>
-        <version>1.0.1-RC2</version>
+        <version>1.0.0-RC3</version>
 
     </parent>
 
     <groupId>it.gov.pagopa.rtd.ms.transaction_filter</groupId>
     <artifactId>rtd-ms-transaction-filter-integration</artifactId>
-    <version>1.0.1-RC2</version>
+    <version>1.0.0-RC3</version>
 
     <packaging>pom</packaging>
 

diff --git a/integration/rest/pom.xml b/integration/rest/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>it.gov.pagopa.rtd.ms.transaction_filter</groupId>
         <artifactId>rtd-ms-transaction-filter-integration</artifactId>
-        <version>1.0.1-RC2</version>
+        <version>1.0.0-RC3</version>
 
     </parent>
 
     <groupId>it.gov.pagopa.rtd.ms.transaction_filter.integration</groupId>
     <artifactId>rtd-ms-transaction_filter-integration-rest</artifactId>
-    <version>1.0.1-RC2</version>
+    <version>1.0.0-RC3</version>
 
 
     <dependencies>

diff --git a/...rest/src/main/java/it/gov/pagopa/rtd/transaction_filter/connector/HpanRestClientImpl.java b/...rest/src/main/java/it/gov/pagopa/rtd/transaction_filter/connector/HpanRestClientImpl.java
@@ -2,6 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -21,6 +22,7 @@
 
 @Service
 @RequiredArgsConstructor
+@Slf4j
 class HpanRestClientImpl implements HpanRestClient {
 
     @Value("${rest-client.hpan.base-url}")
@@ -89,6 +91,10 @@ public File getList() {
                     tempFileFOS = new FileOutputStream(newFile);
                     IOUtils.copy(zipEntryIS, tempFileFOS);
 
+                    if (log.isDebugEnabled()) {
+                        log.debug("Matching " + zipEntry.getName() + " with " + listFilePattern);
+                    }
+
                     if (zipEntry.getName().matches(listFilePattern)) {
                         tempFile = newFile;
                     }

diff --git a/integration/sftp/pom.xml b/integration/sftp/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <groupId>it.gov.pagopa.rtd.ms.transaction_filter</groupId>
         <artifactId>rtd-ms-transaction-filter-integration</artifactId>
-        <version>1.0.1-RC2</version>
+        <version>1.0.0-RC3</version>
     </parent>
 
     <groupId>it.gov.pagopa.rtd.ms.transaction_filter.integration</groupId>
     <artifactId>rtd-ms-transaction_filter-integration-sftp</artifactId>
-    <version>1.0.1-RC2</version>
+    <version>1.0.0-RC3</version>
 
 
     <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>it.gov.pagopa.rtd.ms</groupId>
     <artifactId>rtd-ms-transaction-filter</artifactId>
-    <version>1.0.1-RC2</version>
+    <version>1.0.0-RC3</version>
 
     <packaging>pom</packaging>
 
@@ -64,13 +64,13 @@
             <dependency>
                 <groupId>it.gov.pagopa.rtd.ms.transaction_filter.integration</groupId>
                 <artifactId>rtd-ms-transaction_filter-integration-rest</artifactId>
-                <version>1.0.1-RC2</version>
+                <version>1.0.0-RC3</version>
 
             </dependency>
             <dependency>
                 <groupId>it.gov.pagopa.rtd.ms.transaction_filter.integration</groupId>
                 <artifactId>rtd-ms-transaction_filter-integration-sftp</artifactId>
-                <version>1.0.1-RC2</version>
+                <version>1.0.0-RC3</version>
 
             </dependency>
             <dependency>