From 2cb81087b7da55d2467359d011ddec9e86909c4a Mon Sep 17 00:00:00 2001 From: Alessio Cialini Date: Wed, 5 Aug 2020 19:19:54 +0200 Subject: [PATCH] [rtd-ms-transaction-filter/master] Minor fixes. Updated version to RC3 --- api/batch/pom.xml | 4 ++-- .../step/listener/TransactionItemProcessListener.java | 2 +- api/pom.xml | 6 +++--- app/pom.xml | 6 +++--- core/pom.xml | 10 +++++----- integration/jpa/pom.xml | 4 ++-- integration/pom.xml | 4 ++-- integration/rest/pom.xml | 4 ++-- .../connector/HpanRestClientImpl.java | 6 ++++++ integration/sftp/pom.xml | 4 ++-- pom.xml | 6 +++--- 11 files changed, 31 insertions(+), 25 deletions(-) diff --git a/api/batch/pom.xml b/api/batch/pom.xml index 43360088..addbbab4 100644 --- a/api/batch/pom.xml +++ b/api/batch/pom.xml @@ -4,12 +4,12 @@ rtd-ms-transaction-filter-api it.gov.pagopa.rtd.ms.transaction_filter.api - 1.0.1-RC2 + 1.0.0-RC3 it.gov.pagopa.rtd.ms.transaction_filter.api rtd-ms-transaction-filter-api-batch - 1.0.1-RC2 + 1.0.0-RC3 diff --git a/api/batch/src/main/java/it/gov/pagopa/rtd/transaction_filter/batch/step/listener/TransactionItemProcessListener.java b/api/batch/src/main/java/it/gov/pagopa/rtd/transaction_filter/batch/step/listener/TransactionItemProcessListener.java index 4d6bb9db..a08c5363 100644 --- a/api/batch/src/main/java/it/gov/pagopa/rtd/transaction_filter/batch/step/listener/TransactionItemProcessListener.java +++ b/api/batch/src/main/java/it/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 index 79f2cd71..a256b8c0 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,13 +4,13 @@ rtd-ms-transaction-filter it.gov.pagopa.rtd.ms - 1.0.1-RC2 + 1.0.0-RC3 it.gov.pagopa.rtd.ms.transaction_filter.api rtd-ms-transaction-filter-api - 1.0.1-RC2 + 1.0.0-RC3 pom @@ -18,7 +18,7 @@ it.gov.pagopa.rtd.ms.transaction_filter rtd-ms-transaction-filter-core - 1.0.1-RC2 + 1.0.0-RC3 diff --git a/app/pom.xml b/app/pom.xml index 65377558..0cde2865 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -4,20 +4,20 @@ rtd-ms-transaction-filter it.gov.pagopa.rtd.ms - 1.0.1-RC2 + 1.0.0-RC3 it.gov.pagopa.rtd.ms.transaction_filter transaction-filter-app - 1.0.1-RC2 + 1.0.0-RC3 it.gov.pagopa.rtd.ms.transaction_filter.api rtd-ms-transaction-filter-api-batch - 1.0.1-RC2 + 1.0.0-RC3 org.springframework diff --git a/core/pom.xml b/core/pom.xml index 020e6a85..63328fe7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,32 +4,32 @@ rtd-ms-transaction-filter it.gov.pagopa.rtd.ms - 1.0.1-RC2 + 1.0.0-RC3 it.gov.pagopa.rtd.ms.transaction_filter rtd-ms-transaction-filter-core - 1.0.1-RC2 + 1.0.0-RC3 it.gov.pagopa.rtd.ms.transaction_filter.integration rtd-ms-transaction_filter-integration-sftp - 1.0.1-RC2 + 1.0.0-RC3 it.gov.pagopa.rtd.ms.transaction_filter.integration rtd-ms-transaction-filter-integration-jpa - 1.0.1-RC2 + 1.0.0-RC3 it.gov.pagopa.rtd.ms.transaction_filter.integration rtd-ms-transaction_filter-integration-rest - 1.0.1-RC2 + 1.0.0-RC3 diff --git a/integration/jpa/pom.xml b/integration/jpa/pom.xml index eca12ff6..b0b95895 100644 --- a/integration/jpa/pom.xml +++ b/integration/jpa/pom.xml @@ -4,13 +4,13 @@ rtd-ms-transaction-filter-integration it.gov.pagopa.rtd.ms.transaction_filter - 1.0.1-RC2 + 1.0.0-RC3 it.gov.pagopa.rtd.ms.transaction_filter.integration rtd-ms-transaction-filter-integration-jpa - 1.0.1-RC2 + 1.0.0-RC3 diff --git a/integration/pom.xml b/integration/pom.xml index fa5ca4e6..bbf39150 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -4,13 +4,13 @@ rtd-ms-transaction-filter it.gov.pagopa.rtd.ms - 1.0.1-RC2 + 1.0.0-RC3 it.gov.pagopa.rtd.ms.transaction_filter rtd-ms-transaction-filter-integration - 1.0.1-RC2 + 1.0.0-RC3 pom diff --git a/integration/rest/pom.xml b/integration/rest/pom.xml index d316cf04..27c37480 100644 --- a/integration/rest/pom.xml +++ b/integration/rest/pom.xml @@ -4,13 +4,13 @@ it.gov.pagopa.rtd.ms.transaction_filter rtd-ms-transaction-filter-integration - 1.0.1-RC2 + 1.0.0-RC3 it.gov.pagopa.rtd.ms.transaction_filter.integration rtd-ms-transaction_filter-integration-rest - 1.0.1-RC2 + 1.0.0-RC3 diff --git a/integration/rest/src/main/java/it/gov/pagopa/rtd/transaction_filter/connector/HpanRestClientImpl.java b/integration/rest/src/main/java/it/gov/pagopa/rtd/transaction_filter/connector/HpanRestClientImpl.java index d492251e..7a0f4519 100644 --- a/integration/rest/src/main/java/it/gov/pagopa/rtd/transaction_filter/connector/HpanRestClientImpl.java +++ b/integration/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 index f303e40e..1fa35bd6 100644 --- a/integration/sftp/pom.xml +++ b/integration/sftp/pom.xml @@ -4,12 +4,12 @@ it.gov.pagopa.rtd.ms.transaction_filter rtd-ms-transaction-filter-integration - 1.0.1-RC2 + 1.0.0-RC3 it.gov.pagopa.rtd.ms.transaction_filter.integration rtd-ms-transaction_filter-integration-sftp - 1.0.1-RC2 + 1.0.0-RC3 diff --git a/pom.xml b/pom.xml index f1247b2e..ba9b68d0 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ it.gov.pagopa.rtd.ms rtd-ms-transaction-filter - 1.0.1-RC2 + 1.0.0-RC3 pom @@ -64,13 +64,13 @@ it.gov.pagopa.rtd.ms.transaction_filter.integration rtd-ms-transaction_filter-integration-rest - 1.0.1-RC2 + 1.0.0-RC3 it.gov.pagopa.rtd.ms.transaction_filter.integration rtd-ms-transaction_filter-integration-sftp - 1.0.1-RC2 + 1.0.0-RC3