From af8ff434ec37895fcb8ef01e43f746c5bcbbee5f Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 26 Dec 2022 19:36:34 +0300 Subject: [PATCH] reports-service refactoring --- .../reports/services/ReportDataCollector.java | 12 ---------- .../services/builders/FileReportBuilder.java | 4 ++++ .../services/builders/XMLReportBuilder.java | 4 +--- .../collector/Bt17_1_P1_collector.java | 7 ------ .../collector/Bt17_1_P2_collector.java | 6 ----- .../services/collector/Bt17_2_collector.java | 7 ------ .../collector/Bt17_5_P1_collector.java | 6 ----- .../services/ReportDataCollectorTest.java | 5 ---- .../services/impl/Bt17_1_collectorTest.java | 24 ------------------- 9 files changed, 5 insertions(+), 70 deletions(-) delete mode 100644 clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/impl/Bt17_1_collectorTest.java diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportDataCollector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportDataCollector.java index 739c83759..f7dc466ba 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportDataCollector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportDataCollector.java @@ -32,18 +32,6 @@ public abstract class ReportDataCollector { // */ // abstract public List collectReportWithClearingStatus(LocalDate startDate, LocalDate endDate, String clearingStatus); - /** - * todo убрать метод, он уже лишний - * @param startDate - * @param endDate - * @param dateTimeNow LocalDateTime.now() - * @return - */ - @Deprecated - public String getFileName(LocalDate startDate, LocalDate endDate, LocalDateTime dateTimeNow) { - throw new IllegalArgumentException("deprecated"); - } - abstract public Class getReportClass(); protected String toString(Long val) { diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/builders/FileReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/builders/FileReportBuilder.java index ee7db9533..d22e38111 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/builders/FileReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/builders/FileReportBuilder.java @@ -9,4 +9,8 @@ public abstract class FileReportBuilder { this.reportClass = reportClass; } + protected String makeFileName(String reportName, String extension) { + if (System.getProperty("os.name").toLowerCase().contains("windows")) reportName = reportName.replace(":", "_"); + return reportName + extension; + } } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/builders/XMLReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/builders/XMLReportBuilder.java index ed8ac24bf..0d25b8cf6 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/builders/XMLReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/builders/XMLReportBuilder.java @@ -31,10 +31,8 @@ public class XMLReportBuilder extends FileReportBuilde public File createReport(LocalDate startDate, LocalDate endDate) throws IOException { R report = collector.collectReportWithPeriod(startDate, endDate); String reportName = report.getReportName(LocalDateTime.now()); + String reportFileName = makeFileName(reportName, ".xml"); - if (System.getProperty("os.name").toLowerCase().contains("windows")) reportName = reportName.replace(":", "_"); - - String reportFileName = reportName + ".xml"; File reportFile = new File(reportFileName); if (reportFile.exists()) { if (reportFile.isFile()) { diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P1_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P1_collector.java index 229eb2a8a..d11b7e256 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P1_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P1_collector.java @@ -129,13 +129,6 @@ public class Bt17_1_P1_collector extends ReportDataCollector getReportClass() { return ReportBR_0420315_P1.class; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P2_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P2_collector.java index 8bc56a177..3c18e6922 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P2_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P2_collector.java @@ -53,12 +53,6 @@ public class Bt17_1_P2_collector extends ReportDataCollector getReportClass() { return ReportBR_0420315_P2.class; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_2_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_2_collector.java index 6081329ea..4d9b8ddae 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_2_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_2_collector.java @@ -68,13 +68,6 @@ public class Bt17_2_collector extends ReportDataCollector { return reportBR_0420317; } - - @Override - public String getFileName(LocalDate startDate, LocalDate endDate, LocalDateTime dateTimeNow) { - return String.format("REPBR.0420317.%s-%s.%s", DATE_FORMATTER.format(startDate), DATE_FORMATTER.format(endDate), - DATE_TIME_FORMATTER.format(dateTimeNow)); - } - @Override public Class getReportClass() { return ReportBR_0420317.class; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P1_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P1_collector.java index 463f6ba36..23e4b2d38 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P1_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P1_collector.java @@ -56,12 +56,6 @@ public class Bt17_5_P1_collector extends ReportDataCollector getReportClass() { return ReportBR_0420312_P1.class; diff --git a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportDataCollectorTest.java b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportDataCollectorTest.java index 7341332e7..0e730578b 100644 --- a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportDataCollectorTest.java +++ b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportDataCollectorTest.java @@ -33,11 +33,6 @@ class ReportDataCollectorTest extends ReportDataCollector { throw new IllegalStateException("test"); } - @Override - public String getFileName(LocalDate startDate, LocalDate endDate, LocalDateTime dateTimeNow) { - throw new IllegalStateException("test"); - } - @Override public Class getReportClass() { return AbstractReport.class; diff --git a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/impl/Bt17_1_collectorTest.java b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/impl/Bt17_1_collectorTest.java deleted file mode 100644 index cef49c50c..000000000 --- a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/impl/Bt17_1_collectorTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package ru.spcex.clearing.reports.services.impl; - -import org.junit.jupiter.api.Test; -import org.mockito.Mockito; -import ru.spcex.clearing.reports.services.collector.Bt17_1_P1_collector; - -import java.time.LocalDate; -import java.time.LocalDateTime; - -import static org.junit.jupiter.api.Assertions.*; - -class Bt17_1_collectorTest { - - @Test - void getFileName() { - Bt17_1_P1_collector collector = Mockito.mock(Bt17_1_P1_collector.class); - Mockito.when(collector.getFileName(Mockito.any(),Mockito.any(),Mockito.any())).thenCallRealMethod(); - - String str = collector.getFileName(LocalDate.of(2020,1,1), - LocalDate.of(2020,1,31), - LocalDateTime.of(2021,4,20,12,20,44)); - assertEquals("REPBR.0420315.P1.01.01.2020-31.01.2020.20.04.2021T12:20:44", str); - } -} \ No newline at end of file