From b2028f5c8c94941fef1f77485d01dfe0a55d2568 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Wed, 11 Jan 2023 12:11:26 +0300
Subject: [PATCH] .

---
 ...1_collector.java => ReportBR_0420314_P1_Collector.java} | 7 ++-----
 ...2_collector.java => ReportBR_0420314_P2_Collector.java} | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)
 rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ReportBR_0420314_P1_collector.java => ReportBR_0420314_P1_Collector.java} (93%)
 rename clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/{ReportBR_0420314_P2_collector.java => ReportBR_0420314_P2_Collector.java} (95%)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_Collector.java
similarity index 93%
rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_collector.java
rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_Collector.java
index dc42e8d5d..bb90398c2 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_collector.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_Collector.java
@@ -14,10 +14,7 @@ import ru.spcex.platform.enumeration.ClearingStatus;
 import ru.spcex.platform.enumeration.DocumentTypes;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 
-import java.time.Instant;
 import java.time.LocalDate;
 import java.util.Collection;
 import java.util.Map;
@@ -26,7 +23,7 @@ import java.util.Map;
  * accountTransactionLiabilities
  */
 @Component
-public class ReportBR_0420314_P1_collector extends ReportWithPeriodCollector<ReportBR_0420314_P1> {
+public class ReportBR_0420314_P1_Collector extends ReportWithPeriodCollector<ReportBR_0420314_P1> {
     private Imdg<Company> companyImdg;
     private Imdg<CompanySymbols> companySymbolsImdg;
     private Imdg<ClearingMemberCategory> clearingMemberCategoryImdg;
@@ -36,7 +33,7 @@ public class ReportBR_0420314_P1_collector extends ReportWithPeriodCollector<Rep
     protected static final String ALLOW_CLEARING_STATUS = ClearingStatus.OK.getKey();
 
     @Autowired
-    public ReportBR_0420314_P1_collector(ImdgProvider imdgProvider) {
+    public ReportBR_0420314_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/ReportBR_0420314_P2_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P2_Collector.java
similarity index 95%
rename from clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P2_collector.java
rename to clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P2_Collector.java
index 5a058d0bd..027135ddc 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P2_collector.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P2_Collector.java
@@ -28,14 +28,14 @@ import java.util.Objects;
  * accountTransactionLiabilities
  */
 @Component
-public class ReportBR_0420314_P2_collector extends ReportWithPeriodCollector<ReportBR_0420314_P2> {
+public class ReportBR_0420314_P2_Collector extends ReportWithPeriodCollector<ReportBR_0420314_P2> {
     private Imdg<Company> companyImdg;
     private Imdg<PaymentInstruction> paymentInstructionImdg;
     private Imdg<AccountBalance> accountBalanceImdg;
     private Imdg<ProfileDocument> profileDocumentImdg;
 
     @Autowired
-    public ReportBR_0420314_P2_collector(ImdgProvider imdgProvider) {
+    public ReportBR_0420314_P2_Collector(ImdgProvider imdgProvider) {
         companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
         paymentInstructionImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_PaymentInstruction, PaymentInstruction.class);
         accountBalanceImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_AccountBalance, AccountBalance.class);