From 003024af9afac138659cfa8f448c5e1974e76545 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Tue, 10 Jan 2023 13:23:02 +0300 Subject: [PATCH] reports-service refactoring collector name --- ...0_collector.java => ReportBR_0420312_P10_collector.java} | 4 ++-- ...P1_collector.java => ReportBR_0420312_P1_collector.java} | 4 ++-- ...P2_collector.java => ReportBR_0420312_P2_collector.java} | 4 ++-- ...P3_collector.java => ReportBR_0420312_P3_collector.java} | 4 ++-- ...P4_collector.java => ReportBR_0420312_P4_collector.java} | 5 ++--- ...P5_collector.java => ReportBR_0420312_P5_collector.java} | 4 ++-- ...P6_collector.java => ReportBR_0420312_P6_collector.java} | 4 ++-- ...P7_collector.java => ReportBR_0420312_P7_collector.java} | 6 ++---- ...P8_collector.java => ReportBR_0420312_P8_collector.java} | 4 ++-- ...P9_collector.java => ReportBR_0420312_P9_collector.java} | 4 ++-- ...P2_collector.java => ReportBR_0420315_P2_collector.java} | 4 ++-- ...t17_2_collector.java => ReportBR_0420317_collector.java} | 4 ++-- 12 files changed, 24 insertions(+), 27 deletions(-) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{Bt17_5_P10_collector.java => ReportBR_0420312_P10_collector.java} (92%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{Bt17_5_P1_collector.java => ReportBR_0420312_P1_collector.java} (95%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{Bt17_5_P2_collector.java => ReportBR_0420312_P2_collector.java} (93%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{Bt17_5_P3_collector.java => ReportBR_0420312_P3_collector.java} (93%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{Bt17_5_P4_collector.java => ReportBR_0420312_P4_collector.java} (91%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{Bt17_5_P5_collector.java => ReportBR_0420312_P5_collector.java} (92%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{Bt17_5_P6_collector.java => ReportBR_0420312_P6_collector.java} (92%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{Bt17_5_P7_collector.java => ReportBR_0420312_P7_collector.java} (89%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{Bt17_5_P8_collector.java => ReportBR_0420312_P8_collector.java} (95%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{Bt17_5_P9_collector.java => ReportBR_0420312_P9_collector.java} (95%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{Bt17_1_P2_collector.java => ReportBR_0420315_P2_collector.java} (93%) rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{Bt17_2_collector.java => ReportBR_0420317_collector.java} (94%) diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P10_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P10_collector.java similarity index 92% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P10_collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P10_collector.java index 754f89d70..645704770 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P10_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P10_collector.java @@ -19,11 +19,11 @@ import java.util.Collection; import java.util.Objects; @Component -public class Bt17_5_P10_collector extends ReportDataCollector { +public class ReportBR_0420312_P10_collector extends ReportDataCollector { private Imdg liabilitiesClaimsAssetsImdg; @Autowired - public Bt17_5_P10_collector(ImdgProvider imdgProvider) { + public ReportBR_0420312_P10_collector(ImdgProvider imdgProvider) { liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.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/ReportBR_0420312_P1_collector.java similarity index 95% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P1_collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P1_collector.java index 804ace657..cb06dc5d5 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/ReportBR_0420312_P1_collector.java @@ -22,14 +22,14 @@ import java.util.List; import java.util.Map; @Component -public class Bt17_5_P1_collector extends ReportDataCollector { +public class ReportBR_0420312_P1_collector extends ReportDataCollector { private Imdg companyImdg; private Imdg companySymbolsImdg; private Imdg clearingMemberCategoryImdg; private Imdg liabilitiesClaimsAssetsImdg; @Autowired - public Bt17_5_P1_collector(ImdgProvider imdgProvider) { + public ReportBR_0420312_P1_collector(ImdgProvider imdgProvider) { companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); companySymbolsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P2_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P2_collector.java similarity index 93% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P2_collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P2_collector.java index a06e635ac..37845961d 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P2_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P2_collector.java @@ -21,11 +21,11 @@ import java.util.Map; import java.util.Objects; @Component -public class Bt17_5_P2_collector extends ReportDataCollector { +public class ReportBR_0420312_P2_collector extends ReportDataCollector { private Imdg liabilitiesClaimsAssetsImdg; @Autowired - public Bt17_5_P2_collector(ImdgProvider imdgProvider) { + public ReportBR_0420312_P2_collector(ImdgProvider imdgProvider) { liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P3_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P3_collector.java similarity index 93% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P3_collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P3_collector.java index b688219d3..34ac0eb61 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P3_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P3_collector.java @@ -21,11 +21,11 @@ import java.util.Map; import java.util.Objects; @Component -public class Bt17_5_P3_collector extends ReportDataCollector { +public class ReportBR_0420312_P3_collector extends ReportDataCollector { private Imdg liabilitiesClaimsAssetsImdg; @Autowired - public Bt17_5_P3_collector(ImdgProvider imdgProvider) { + public ReportBR_0420312_P3_collector(ImdgProvider imdgProvider) { liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P4_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P4_collector.java similarity index 91% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P4_collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P4_collector.java index 2d64f0d9b..6144b8cf6 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P4_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P4_collector.java @@ -2,7 +2,6 @@ package ru.spcex.clearing.reports.services.collector; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P4; @@ -19,11 +18,11 @@ import java.util.Collection; import java.util.Objects; @Component -public class Bt17_5_P4_collector extends ReportDataCollector { +public class ReportBR_0420312_P4_collector extends ReportDataCollector { private Imdg liabilitiesClaimsAssetsImdg; @Autowired - public Bt17_5_P4_collector(ImdgProvider imdgProvider) { + public ReportBR_0420312_P4_collector(ImdgProvider imdgProvider) { liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P5_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P5_collector.java similarity index 92% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P5_collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P5_collector.java index 2b6ada458..3b6b14f08 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P5_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P5_collector.java @@ -19,11 +19,11 @@ import java.util.Collection; import java.util.Objects; @Component -public class Bt17_5_P5_collector extends ReportDataCollector { +public class ReportBR_0420312_P5_collector extends ReportDataCollector { private Imdg liabilitiesClaimsAssetsImdg; @Autowired - public Bt17_5_P5_collector(ImdgProvider imdgProvider) { + public ReportBR_0420312_P5_collector(ImdgProvider imdgProvider) { liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P6_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P6_collector.java similarity index 92% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P6_collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P6_collector.java index f6a837457..2a41c0a8a 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P6_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P6_collector.java @@ -19,11 +19,11 @@ import java.util.Collection; import java.util.Objects; @Component -public class Bt17_5_P6_collector extends ReportDataCollector { +public class ReportBR_0420312_P6_collector extends ReportDataCollector { private Imdg liabilitiesClaimsAssetsImdg; @Autowired - public Bt17_5_P6_collector(ImdgProvider imdgProvider) { + public ReportBR_0420312_P6_collector(ImdgProvider imdgProvider) { liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P7_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P7_collector.java similarity index 89% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P7_collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P7_collector.java index 5a53bde8d..76f8eb659 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P7_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P7_collector.java @@ -19,13 +19,11 @@ import java.util.Collection; import java.util.Objects; @Component -public class Bt17_5_P7_collector extends ReportDataCollector { - private Imdg companyImdg; +public class ReportBR_0420312_P7_collector extends ReportDataCollector { private Imdg liabilitiesClaimsAssetsImdg; @Autowired - public Bt17_5_P7_collector(ImdgProvider imdgProvider) { - companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); + public ReportBR_0420312_P7_collector(ImdgProvider imdgProvider) { liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P8_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_collector.java similarity index 95% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P8_collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_collector.java index 55dbd36d1..9193ce097 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P8_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_collector.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; @Component -public class Bt17_5_P8_collector extends ReportDataCollector { +public class ReportBR_0420312_P8_collector extends ReportDataCollector { private Imdg companyImdg; private Imdg companySymbolsImdg; private Imdg clearingMemberCategoryImdg; @@ -32,7 +32,7 @@ public class Bt17_5_P8_collector extends ReportDataCollector currencyCodeDictionaryImdg; @Autowired - public Bt17_5_P8_collector(ImdgProvider imdgProvider) { + public ReportBR_0420312_P8_collector(ImdgProvider imdgProvider) { companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); companySymbolsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P9_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_collector.java similarity index 95% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P9_collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_collector.java index b7763cd0e..84e09b09f 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_5_P9_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P9_collector.java @@ -26,13 +26,13 @@ import java.util.Map; import java.util.Objects; @Component -public class Bt17_5_P9_collector extends ReportDataCollector { +public class ReportBR_0420312_P9_collector extends ReportDataCollector { private Imdg companyImdg; private Imdg liabilitiesClaimsAssetsImdg; private Imdg currencyCodeDictionaryImdg; @Autowired - public Bt17_5_P9_collector(ImdgProvider imdgProvider) { + public ReportBR_0420312_P9_collector(ImdgProvider imdgProvider) { companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); currencyCodeDictionaryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CurrencyCodeDictionary, CurrencyCodeDictionary.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/ReportBR_0420315_P2_collector.java similarity index 93% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P2_collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P2_collector.java index 82ff969fb..bfd6f19fd 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/ReportBR_0420315_P2_collector.java @@ -17,11 +17,11 @@ import java.time.LocalDate; import java.util.*; @Component -public class Bt17_1_P2_collector extends ReportDataCollector { +public class ReportBR_0420315_P2_collector extends ReportDataCollector { private Imdg liabilitiesClaimsAssetsImdg; @Autowired - public Bt17_1_P2_collector(ImdgProvider imdgProvider) { + public ReportBR_0420315_P2_collector(ImdgProvider imdgProvider) { liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.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/ReportBR_0420317_collector.java similarity index 94% rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_2_collector.java rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420317_collector.java index 272becd5d..afda6229e 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/ReportBR_0420317_collector.java @@ -19,13 +19,13 @@ import java.time.LocalDate; import java.util.*; @Component -public class Bt17_2_collector extends ReportDataCollector { +public class ReportBR_0420317_collector extends ReportDataCollector { private Imdg companyImdg; private Imdg relationImdg; private Imdg companySymbolsImdg; @Autowired - public Bt17_2_collector(ImdgProvider imdgProvider) { + public ReportBR_0420317_collector(ImdgProvider imdgProvider) { companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); relationImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Relation, Relation.class); companySymbolsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class);