From c10e41b29eea4ff6e11eeeafc4eebdcde11485b8 Mon Sep 17 00:00:00 2001 From: akulikov Date: Wed, 4 Oct 2023 17:04:56 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-497 rename package --- .../{reports => builders}/CSVReportBuilder.java | 2 +- .../reports/{reports => builders}/EmptyParams.java | 2 +- .../{reports => builders}/PairRegistry3Id.java | 2 +- .../{reports => builders}/PairRegistryId.java | 2 +- .../reports/{reports => builders}/ReportInfo.java | 2 +- .../{reports => builders}/SessionIdParam.java | 2 +- .../bean/ExecutedDealReport.java | 2 +- .../bean/KSCommissionTradesReport.java | 2 +- .../bean/KSRepCashNettoReport.java | 2 +- .../bean/KSRepCashRegisterSumsReport.java | 2 +- .../bean/KSRepCashRegistersReport.java | 2 +- .../bean/KSRepDepoNettoReport.java | 2 +- .../bean/KSRepDepoRegisterQuantitiesReport.java | 2 +- .../bean/KSRepDepoRegistersReport.java | 2 +- .../bean/KSRepFirmDetailsReport.java | 2 +- .../bean/KSRepTradesReport.java | 2 +- .../bean/KSSessionListReport.java | 2 +- .../bean/UnfulfilledDealReport.java | 2 +- .../bp/ExecutedDealReportBuilderCommon.java | 6 +++--- .../bp/ExecutedDealReportBuilder_INFTYPE_1.java | 4 ++-- .../bp/ExecutedDealReportBuilder_INFTYPE_2.java | 4 ++-- .../bp/ExecutedDealReportBuilder_INFTYPE_3.java | 4 ++-- .../bp/ExecutedDealReportBuilder_INFTYPE_4.java | 4 ++-- .../bp/UnfulfilledDealReportBuilder.java | 8 ++++---- .../ks/KSCommissionTradesReportBuilder.java | 8 ++++---- .../ks/KSRepCashNettoReportBuilder.java | 10 +++++----- .../ks/KSRepCashRegisterSumsReportBuilder.java | 8 ++++---- .../ks/KSRepCashRegistersReportBuilder.java | 8 ++++---- .../ks/KSRepDepoNettoReportBuilder.java | 10 +++++----- .../ks/KSRepDepoRegisterQuantitiesReportBuilder.java | 8 ++++---- .../ks/KSRepDepoRegistersReportBuilder.java | 8 ++++---- .../ks/KSRepFirmDetailsReportBuilder.java | 8 ++++---- .../ks/KSRepTradesReportBuilder.java | 8 ++++---- .../ks/KSSessionListReportBuilder.java | 8 ++++---- .../reports/config/ReportBuildersConfig.java | 12 ++++++------ .../clearing/reports/services/ReportService.java | 8 ++++---- 36 files changed, 85 insertions(+), 85 deletions(-) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/CSVReportBuilder.java (99%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/EmptyParams.java (73%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/PairRegistry3Id.java (97%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/PairRegistryId.java (96%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/ReportInfo.java (85%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/SessionIdParam.java (88%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/bean/ExecutedDealReport.java (98%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/bean/KSCommissionTradesReport.java (98%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/bean/KSRepCashNettoReport.java (97%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/bean/KSRepCashRegisterSumsReport.java (98%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/bean/KSRepCashRegistersReport.java (98%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/bean/KSRepDepoNettoReport.java (97%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/bean/KSRepDepoRegisterQuantitiesReport.java (98%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/bean/KSRepDepoRegistersReport.java (98%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/bean/KSRepFirmDetailsReport.java (97%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/bean/KSRepTradesReport.java (98%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/bean/KSSessionListReport.java (97%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/bean/UnfulfilledDealReport.java (96%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/bp/ExecutedDealReportBuilderCommon.java (96%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/bp/ExecutedDealReportBuilder_INFTYPE_1.java (94%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/bp/ExecutedDealReportBuilder_INFTYPE_2.java (94%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/bp/ExecutedDealReportBuilder_INFTYPE_3.java (93%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/bp/ExecutedDealReportBuilder_INFTYPE_4.java (93%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/bp/UnfulfilledDealReportBuilder.java (94%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/ks/KSCommissionTradesReportBuilder.java (97%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/ks/KSRepCashNettoReportBuilder.java (96%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/ks/KSRepCashRegisterSumsReportBuilder.java (95%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/ks/KSRepCashRegistersReportBuilder.java (96%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/ks/KSRepDepoNettoReportBuilder.java (96%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/ks/KSRepDepoRegisterQuantitiesReportBuilder.java (95%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/ks/KSRepDepoRegistersReportBuilder.java (96%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/ks/KSRepFirmDetailsReportBuilder.java (94%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/ks/KSRepTradesReportBuilder.java (98%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/{reports => builders}/ks/KSSessionListReportBuilder.java (92%) diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/CSVReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/CSVReportBuilder.java similarity index 99% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/CSVReportBuilder.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/CSVReportBuilder.java index a43d3b8c3..6f07fde90 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/CSVReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/CSVReportBuilder.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports; +package ru.spcex.clearing.reports.builders; import com.opencsv.CSVWriterBuilder; import com.opencsv.ICSVWriter; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/EmptyParams.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/EmptyParams.java similarity index 73% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/EmptyParams.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/EmptyParams.java index c344fc1d2..6cb5490b4 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/EmptyParams.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/EmptyParams.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports; +package ru.spcex.clearing.reports.builders; /** * Класс для формирования отчета без параметров diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/PairRegistry3Id.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/PairRegistry3Id.java similarity index 97% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/PairRegistry3Id.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/PairRegistry3Id.java index 6a49cfb55..b1050588d 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/PairRegistry3Id.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/PairRegistry3Id.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports; +package ru.spcex.clearing.reports.builders; import ru.clearing.classes.statics.data.registry.Registry; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/PairRegistryId.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/PairRegistryId.java similarity index 96% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/PairRegistryId.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/PairRegistryId.java index 5a4a4012f..22137cd4e 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/PairRegistryId.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/PairRegistryId.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports; +package ru.spcex.clearing.reports.builders; import ru.clearing.classes.statics.data.registry.Registry; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ReportInfo.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ReportInfo.java similarity index 85% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ReportInfo.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ReportInfo.java index 7ed5d6b5f..2a9e5aa44 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ReportInfo.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ReportInfo.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports; +package ru.spcex.clearing.reports.builders; public record ReportInfo(String reportKey, String section) { @Override diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/SessionIdParam.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/SessionIdParam.java similarity index 88% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/SessionIdParam.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/SessionIdParam.java index 716071a2e..1e5657052 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/SessionIdParam.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/SessionIdParam.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports; +package ru.spcex.clearing.reports.builders; import java.util.List; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/ExecutedDealReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/ExecutedDealReport.java similarity index 98% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/ExecutedDealReport.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/ExecutedDealReport.java index 8d7936322..2a250751c 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/ExecutedDealReport.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/ExecutedDealReport.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bean; +package ru.spcex.clearing.reports.builders.bean; import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByPosition; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSCommissionTradesReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSCommissionTradesReport.java similarity index 98% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSCommissionTradesReport.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSCommissionTradesReport.java index d0b1baf87..cfb621903 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSCommissionTradesReport.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSCommissionTradesReport.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bean; +package ru.spcex.clearing.reports.builders.bean; import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByPosition; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepCashNettoReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepCashNettoReport.java similarity index 97% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepCashNettoReport.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepCashNettoReport.java index 386d06a4f..110461b8e 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepCashNettoReport.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepCashNettoReport.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bean; +package ru.spcex.clearing.reports.builders.bean; import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByPosition; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepCashRegisterSumsReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepCashRegisterSumsReport.java similarity index 98% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepCashRegisterSumsReport.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepCashRegisterSumsReport.java index 879f1c549..7cee42565 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepCashRegisterSumsReport.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepCashRegisterSumsReport.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bean; +package ru.spcex.clearing.reports.builders.bean; import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByPosition; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepCashRegistersReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepCashRegistersReport.java similarity index 98% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepCashRegistersReport.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepCashRegistersReport.java index 834a972e0..98520f9ca 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepCashRegistersReport.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepCashRegistersReport.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bean; +package ru.spcex.clearing.reports.builders.bean; import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByPosition; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepDepoNettoReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepDepoNettoReport.java similarity index 97% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepDepoNettoReport.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepDepoNettoReport.java index e0cd96de8..6c96f25ef 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepDepoNettoReport.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepDepoNettoReport.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bean; +package ru.spcex.clearing.reports.builders.bean; import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByPosition; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepDepoRegisterQuantitiesReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepDepoRegisterQuantitiesReport.java similarity index 98% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepDepoRegisterQuantitiesReport.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepDepoRegisterQuantitiesReport.java index c17a1c698..792b55100 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepDepoRegisterQuantitiesReport.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepDepoRegisterQuantitiesReport.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bean; +package ru.spcex.clearing.reports.builders.bean; import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByPosition; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepDepoRegistersReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepDepoRegistersReport.java similarity index 98% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepDepoRegistersReport.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepDepoRegistersReport.java index 389c2757f..308b8b821 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepDepoRegistersReport.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepDepoRegistersReport.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bean; +package ru.spcex.clearing.reports.builders.bean; import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByPosition; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepFirmDetailsReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepFirmDetailsReport.java similarity index 97% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepFirmDetailsReport.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepFirmDetailsReport.java index cfaeddd2a..9a9d098b0 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepFirmDetailsReport.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepFirmDetailsReport.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bean; +package ru.spcex.clearing.reports.builders.bean; import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByPosition; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepTradesReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepTradesReport.java similarity index 98% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepTradesReport.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepTradesReport.java index d01a851eb..5f96f51c6 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSRepTradesReport.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepTradesReport.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bean; +package ru.spcex.clearing.reports.builders.bean; import com.opencsv.bean.CsvBindByName; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSSessionListReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSSessionListReport.java similarity index 97% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSSessionListReport.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSSessionListReport.java index e79c1bdd4..cda29eff1 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/KSSessionListReport.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSSessionListReport.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bean; +package ru.spcex.clearing.reports.builders.bean; import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByPosition; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/UnfulfilledDealReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/UnfulfilledDealReport.java similarity index 96% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/UnfulfilledDealReport.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/UnfulfilledDealReport.java index 418331bcd..009ccbc27 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bean/UnfulfilledDealReport.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/UnfulfilledDealReport.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bean; +package ru.spcex.clearing.reports.builders.bean; import com.opencsv.bean.CsvBindByName; import com.opencsv.bean.CsvBindByPosition; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilderCommon.java similarity index 96% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilderCommon.java index d7d7650cb..7ad6e47a5 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilderCommon.java @@ -1,12 +1,12 @@ -package ru.spcex.clearing.reports.reports.bp; +package ru.spcex.clearing.reports.builders.bp; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.execution.ExecutionFond; import ru.clearing.classes.statics.data.misc.STrades; import ru.clearing.classes.statics.data.misc.Session; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.CSVReportBuilder; -import ru.spcex.clearing.reports.reports.bean.ExecutedDealReport; +import ru.spcex.clearing.reports.builders.CSVReportBuilder; +import ru.spcex.clearing.reports.builders.bean.ExecutedDealReport; import ru.spcex.platform.enumeration.ReportBuilderType; import ru.spcex.platform.enumeration.WorkflowStatus; import ru.spcex.platform.imdg.api.Imdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_1.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_1.java similarity index 94% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_1.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_1.java index e1b45f4e9..7f434dd7a 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_1.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_1.java @@ -1,8 +1,8 @@ -package ru.spcex.clearing.reports.reports.bp; +package ru.spcex.clearing.reports.builders.bp; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.execution.ExecutionFond; -import ru.spcex.clearing.reports.reports.SessionIdParam; +import ru.spcex.clearing.reports.builders.SessionIdParam; import ru.spcex.platform.enumeration.CoverageStatus; import ru.spcex.platform.enumeration.MoneyFlowSide; import ru.spcex.platform.enumeration.ReportKeys; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_2.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_2.java similarity index 94% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_2.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_2.java index f75818369..cfafe2469 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_2.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_2.java @@ -1,8 +1,8 @@ -package ru.spcex.clearing.reports.reports.bp; +package ru.spcex.clearing.reports.builders.bp; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.execution.ExecutionFond; -import ru.spcex.clearing.reports.reports.SessionIdParam; +import ru.spcex.clearing.reports.builders.SessionIdParam; import ru.spcex.platform.enumeration.CoverageStatus; import ru.spcex.platform.enumeration.MoneyFlowSide; import ru.spcex.platform.enumeration.ReportKeys; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_3.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_3.java similarity index 93% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_3.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_3.java index 0aaa6b7cd..6fea5fd00 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_3.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_3.java @@ -1,8 +1,8 @@ -package ru.spcex.clearing.reports.reports.bp; +package ru.spcex.clearing.reports.builders.bp; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.execution.ExecutionFond; -import ru.spcex.clearing.reports.reports.SessionIdParam; +import ru.spcex.clearing.reports.builders.SessionIdParam; import ru.spcex.platform.enumeration.MoneyFlowSide; import ru.spcex.platform.enumeration.ReportKeys; import ru.spcex.platform.enumeration.Side; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_4.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_4.java similarity index 93% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_4.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_4.java index ca00f76b1..236f33ab9 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_4.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_4.java @@ -1,8 +1,8 @@ -package ru.spcex.clearing.reports.reports.bp; +package ru.spcex.clearing.reports.builders.bp; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.execution.ExecutionFond; -import ru.spcex.clearing.reports.reports.SessionIdParam; +import ru.spcex.clearing.reports.builders.SessionIdParam; import ru.spcex.platform.enumeration.Allowed; import ru.spcex.platform.enumeration.MoneyFlowSide; import ru.spcex.platform.enumeration.ReportKeys; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/UnfulfilledDealReportBuilder.java similarity index 94% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/UnfulfilledDealReportBuilder.java index 0e3ac7758..5a358fad3 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/UnfulfilledDealReportBuilder.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.bp; +package ru.spcex.clearing.reports.builders.bp; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.Company; @@ -6,9 +6,9 @@ import ru.clearing.classes.statics.data.execution.ExecutionFond; import ru.clearing.classes.statics.data.misc.STrades; import ru.clearing.classes.statics.data.misc.Session; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.CSVReportBuilder; -import ru.spcex.clearing.reports.reports.SessionIdParam; -import ru.spcex.clearing.reports.reports.bean.UnfulfilledDealReport; +import ru.spcex.clearing.reports.builders.CSVReportBuilder; +import ru.spcex.clearing.reports.builders.SessionIdParam; +import ru.spcex.clearing.reports.builders.bean.UnfulfilledDealReport; import ru.spcex.platform.enumeration.*; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSCommissionTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java similarity index 97% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSCommissionTradesReportBuilder.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java index ba8a692bb..d1e5fa40a 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSCommissionTradesReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.ks; +package ru.spcex.clearing.reports.builders.ks; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.Company; @@ -6,9 +6,9 @@ import ru.clearing.classes.statics.data.company.CompanySymbols; import ru.clearing.classes.statics.data.execution.ExecutionDeposit; import ru.clearing.classes.statics.data.registry.Registry; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.CSVReportBuilder; -import ru.spcex.clearing.reports.reports.EmptyParams; -import ru.spcex.clearing.reports.reports.bean.KSCommissionTradesReport; +import ru.spcex.clearing.reports.builders.CSVReportBuilder; +import ru.spcex.clearing.reports.builders.EmptyParams; +import ru.spcex.clearing.reports.builders.bean.KSCommissionTradesReport; import ru.spcex.platform.enumeration.*; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashNettoReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java similarity index 96% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashNettoReportBuilder.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java index 1bdf7b79e..704deae32 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashNettoReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java @@ -1,13 +1,13 @@ -package ru.spcex.clearing.reports.reports.ks; +package ru.spcex.clearing.reports.builders.ks; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.misc.Session; import ru.clearing.classes.statics.data.registry.Registry; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.CSVReportBuilder; -import ru.spcex.clearing.reports.reports.PairRegistryId; -import ru.spcex.clearing.reports.reports.SessionIdParam; -import ru.spcex.clearing.reports.reports.bean.KSRepCashNettoReport; +import ru.spcex.clearing.reports.builders.CSVReportBuilder; +import ru.spcex.clearing.reports.builders.PairRegistryId; +import ru.spcex.clearing.reports.builders.SessionIdParam; +import ru.spcex.clearing.reports.builders.bean.KSRepCashNettoReport; import ru.spcex.platform.enumeration.*; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegisterSumsReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegisterSumsReportBuilder.java similarity index 95% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegisterSumsReportBuilder.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegisterSumsReportBuilder.java index bd4e78a2f..63683fa3b 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegisterSumsReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegisterSumsReportBuilder.java @@ -1,12 +1,12 @@ -package ru.spcex.clearing.reports.reports.ks; +package ru.spcex.clearing.reports.builders.ks; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.registry.Registry; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.CSVReportBuilder; -import ru.spcex.clearing.reports.reports.EmptyParams; -import ru.spcex.clearing.reports.reports.bean.KSRepCashRegisterSumsReport; +import ru.spcex.clearing.reports.builders.CSVReportBuilder; +import ru.spcex.clearing.reports.builders.EmptyParams; +import ru.spcex.clearing.reports.builders.bean.KSRepCashRegisterSumsReport; import ru.spcex.platform.enumeration.*; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegistersReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegistersReportBuilder.java similarity index 96% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegistersReportBuilder.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegistersReportBuilder.java index 680571cfa..16a6446e4 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegistersReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegistersReportBuilder.java @@ -1,13 +1,13 @@ -package ru.spcex.clearing.reports.reports.ks; +package ru.spcex.clearing.reports.builders.ks; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.platform.dictionary.RegistryCodeDictionary; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.CSVReportBuilder; -import ru.spcex.clearing.reports.reports.EmptyParams; -import ru.spcex.clearing.reports.reports.bean.KSRepCashRegistersReport; +import ru.spcex.clearing.reports.builders.CSVReportBuilder; +import ru.spcex.clearing.reports.builders.EmptyParams; +import ru.spcex.clearing.reports.builders.bean.KSRepCashRegistersReport; import ru.spcex.platform.enumeration.*; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoNettoReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoNettoReportBuilder.java similarity index 96% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoNettoReportBuilder.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoNettoReportBuilder.java index c0f6ada38..581b55bdb 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoNettoReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoNettoReportBuilder.java @@ -1,13 +1,13 @@ -package ru.spcex.clearing.reports.reports.ks; +package ru.spcex.clearing.reports.builders.ks; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.misc.Session; import ru.clearing.classes.statics.data.registry.Registry; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.CSVReportBuilder; -import ru.spcex.clearing.reports.reports.PairRegistry3Id; -import ru.spcex.clearing.reports.reports.SessionIdParam; -import ru.spcex.clearing.reports.reports.bean.KSRepDepoNettoReport; +import ru.spcex.clearing.reports.builders.CSVReportBuilder; +import ru.spcex.clearing.reports.builders.PairRegistry3Id; +import ru.spcex.clearing.reports.builders.SessionIdParam; +import ru.spcex.clearing.reports.builders.bean.KSRepDepoNettoReport; import ru.spcex.platform.enumeration.*; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegisterQuantitiesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoRegisterQuantitiesReportBuilder.java similarity index 95% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegisterQuantitiesReportBuilder.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoRegisterQuantitiesReportBuilder.java index 3dc0011d6..1874048fb 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegisterQuantitiesReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoRegisterQuantitiesReportBuilder.java @@ -1,12 +1,12 @@ -package ru.spcex.clearing.reports.reports.ks; +package ru.spcex.clearing.reports.builders.ks; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.registry.Registry; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.CSVReportBuilder; -import ru.spcex.clearing.reports.reports.EmptyParams; -import ru.spcex.clearing.reports.reports.bean.KSRepDepoRegisterQuantitiesReport; +import ru.spcex.clearing.reports.builders.CSVReportBuilder; +import ru.spcex.clearing.reports.builders.EmptyParams; +import ru.spcex.clearing.reports.builders.bean.KSRepDepoRegisterQuantitiesReport; import ru.spcex.platform.enumeration.*; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegistersReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoRegistersReportBuilder.java similarity index 96% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegistersReportBuilder.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoRegistersReportBuilder.java index d844a70e6..2a6b1478e 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegistersReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoRegistersReportBuilder.java @@ -1,13 +1,13 @@ -package ru.spcex.clearing.reports.reports.ks; +package ru.spcex.clearing.reports.builders.ks; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.platform.dictionary.RegistryCodeDictionary; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.CSVReportBuilder; -import ru.spcex.clearing.reports.reports.EmptyParams; -import ru.spcex.clearing.reports.reports.bean.KSRepDepoRegistersReport; +import ru.spcex.clearing.reports.builders.CSVReportBuilder; +import ru.spcex.clearing.reports.builders.EmptyParams; +import ru.spcex.clearing.reports.builders.bean.KSRepDepoRegistersReport; import ru.spcex.platform.enumeration.*; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepFirmDetailsReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepFirmDetailsReportBuilder.java similarity index 94% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepFirmDetailsReportBuilder.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepFirmDetailsReportBuilder.java index e55f5ea36..14509a920 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepFirmDetailsReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepFirmDetailsReportBuilder.java @@ -1,13 +1,13 @@ -package ru.spcex.clearing.reports.reports.ks; +package ru.spcex.clearing.reports.builders.ks; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.CompanySymbols; import ru.clearing.classes.statics.data.profile.ProfileDocument; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.CSVReportBuilder; -import ru.spcex.clearing.reports.reports.EmptyParams; -import ru.spcex.clearing.reports.reports.bean.KSRepFirmDetailsReport; +import ru.spcex.clearing.reports.builders.CSVReportBuilder; +import ru.spcex.clearing.reports.builders.EmptyParams; +import ru.spcex.clearing.reports.builders.bean.KSRepFirmDetailsReport; import ru.spcex.platform.enumeration.*; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java similarity index 98% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepTradesReportBuilder.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java index e4102cf2a..15dc49eac 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepTradesReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.reports.reports.ks; +package ru.spcex.clearing.reports.builders.ks; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.Company; @@ -10,9 +10,9 @@ import ru.clearing.classes.statics.data.misc.Session; import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.classes.statics.data.registry.TradingClearingRegistry; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.CSVReportBuilder; -import ru.spcex.clearing.reports.reports.EmptyParams; -import ru.spcex.clearing.reports.reports.bean.KSRepTradesReport; +import ru.spcex.clearing.reports.builders.CSVReportBuilder; +import ru.spcex.clearing.reports.builders.EmptyParams; +import ru.spcex.clearing.reports.builders.bean.KSRepTradesReport; import ru.spcex.platform.enumeration.*; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSSessionListReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSSessionListReportBuilder.java similarity index 92% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSSessionListReportBuilder.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSSessionListReportBuilder.java index 06aa3613f..ebbef586b 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSSessionListReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSSessionListReportBuilder.java @@ -1,11 +1,11 @@ -package ru.spcex.clearing.reports.reports.ks; +package ru.spcex.clearing.reports.builders.ks; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.misc.Session; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.reports.reports.CSVReportBuilder; -import ru.spcex.clearing.reports.reports.EmptyParams; -import ru.spcex.clearing.reports.reports.bean.KSSessionListReport; +import ru.spcex.clearing.reports.builders.CSVReportBuilder; +import ru.spcex.clearing.reports.builders.EmptyParams; +import ru.spcex.clearing.reports.builders.bean.KSSessionListReport; import ru.spcex.platform.enumeration.ReportBuilderType; import ru.spcex.platform.enumeration.ReportKeys; import ru.spcex.platform.imdg.api.Imdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/ReportBuildersConfig.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/ReportBuildersConfig.java index 320aa95cb..0de9211c2 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/ReportBuildersConfig.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/ReportBuildersConfig.java @@ -3,11 +3,11 @@ package ru.spcex.clearing.reports.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import ru.spcex.clearing.reports.reports.CSVReportBuilder; -import ru.spcex.clearing.reports.reports.EmptyParams; -import ru.spcex.clearing.reports.reports.SessionIdParam; -import ru.spcex.clearing.reports.reports.bp.*; -import ru.spcex.clearing.reports.reports.ks.*; +import ru.spcex.clearing.reports.builders.CSVReportBuilder; +import ru.spcex.clearing.reports.builders.EmptyParams; +import ru.spcex.clearing.reports.builders.SessionIdParam; +import ru.spcex.clearing.reports.builders.bp.*; +import ru.spcex.clearing.reports.builders.ks.*; import ru.spcex.platform.enumeration.ReportBuilderType; import java.util.HashMap; @@ -15,7 +15,7 @@ import java.util.List; import java.util.Map; @Configuration -@ComponentScan(basePackages = "ru.spcex.clearing.reports.reports") +@ComponentScan(basePackages = "ru.spcex.clearing.reports.builders") public class ReportBuildersConfig { @Bean("reportBuildersWithoutParams") public Map>> reportBuildersWithoutParams( diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java index 380683ee5..a391e7b57 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java @@ -19,12 +19,12 @@ import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandR import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate; import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; +import ru.spcex.clearing.reports.builders.CSVReportBuilder; +import ru.spcex.clearing.reports.builders.EmptyParams; +import ru.spcex.clearing.reports.builders.ReportInfo; +import ru.spcex.clearing.reports.builders.SessionIdParam; import ru.spcex.clearing.reports.config.SFTPReportsConfig; import ru.spcex.clearing.reports.config.settings.ReportsServiceSettings; -import ru.spcex.clearing.reports.reports.CSVReportBuilder; -import ru.spcex.clearing.reports.reports.EmptyParams; -import ru.spcex.clearing.reports.reports.ReportInfo; -import ru.spcex.clearing.reports.reports.SessionIdParam; import ru.spcex.clearing.util.security.UserRoleVerification; import ru.spcex.clearing.validation.common.ValidationHelper; import ru.spcex.platform.enumeration.ReportBuilderType;