reports-service refactoring collector name

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<ReportBR_0420312_P10> {
+public class ReportBR_0420312_P10_collector extends ReportDataCollector<ReportBR_0420312_P10> {
     private Imdg<LiabilitiesClaimsAssets> liabilitiesClaimsAssetsImdg;
 
     @Autowired
-    public Bt17_5_P10_collector(ImdgProvider imdgProvider) {
+    public ReportBR_0420312_P10_collector(ImdgProvider imdgProvider) {
         liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class);
     }
 

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<ReportBR_0420312_P1> {
+public class ReportBR_0420312_P1_collector extends ReportDataCollector<ReportBR_0420312_P1> {
     private Imdg<Company> companyImdg;
     private Imdg<CompanySymbols> companySymbolsImdg;
     private Imdg<ClearingMemberCategory> clearingMemberCategoryImdg;
     private Imdg<LiabilitiesClaimsAssets> 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);

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<ReportBR_0420312_P2> {
+public class ReportBR_0420312_P2_collector extends ReportDataCollector<ReportBR_0420312_P2> {
     private Imdg<LiabilitiesClaimsAssets> liabilitiesClaimsAssetsImdg;
 
     @Autowired
-    public Bt17_5_P2_collector(ImdgProvider imdgProvider) {
+    public ReportBR_0420312_P2_collector(ImdgProvider imdgProvider) {
         liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class);
     }
 

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<ReportBR_0420312_P3> {
+public class ReportBR_0420312_P3_collector extends ReportDataCollector<ReportBR_0420312_P3> {
     private Imdg<LiabilitiesClaimsAssets> liabilitiesClaimsAssetsImdg;
 
     @Autowired
-    public Bt17_5_P3_collector(ImdgProvider imdgProvider) {
+    public ReportBR_0420312_P3_collector(ImdgProvider imdgProvider) {
         liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class);
     }
 

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<ReportBR_0420312_P4> {
+public class ReportBR_0420312_P4_collector extends ReportDataCollector<ReportBR_0420312_P4> {
     private Imdg<LiabilitiesClaimsAssets> liabilitiesClaimsAssetsImdg;
 
     @Autowired
-    public Bt17_5_P4_collector(ImdgProvider imdgProvider) {
+    public ReportBR_0420312_P4_collector(ImdgProvider imdgProvider) {
         liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class);
     }
 

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<ReportBR_0420312_P5> {
+public class ReportBR_0420312_P5_collector extends ReportDataCollector<ReportBR_0420312_P5> {
     private Imdg<LiabilitiesClaimsAssets> liabilitiesClaimsAssetsImdg;
 
     @Autowired
-    public Bt17_5_P5_collector(ImdgProvider imdgProvider) {
+    public ReportBR_0420312_P5_collector(ImdgProvider imdgProvider) {
         liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class);
     }
 

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<ReportBR_0420312_P6> {
+public class ReportBR_0420312_P6_collector extends ReportDataCollector<ReportBR_0420312_P6> {
     private Imdg<LiabilitiesClaimsAssets> liabilitiesClaimsAssetsImdg;
 
     @Autowired
-    public Bt17_5_P6_collector(ImdgProvider imdgProvider) {
+    public ReportBR_0420312_P6_collector(ImdgProvider imdgProvider) {
         liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class);
     }
 

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<ReportBR_0420312_P7> {
+public class ReportBR_0420312_P7_collector extends ReportDataCollector<ReportBR_0420312_P7> {
-    private Imdg<Company> companyImdg;
     private Imdg<LiabilitiesClaimsAssets> liabilitiesClaimsAssetsImdg;
 
     @Autowired
-    public Bt17_5_P7_collector(ImdgProvider imdgProvider) {
+    public ReportBR_0420312_P7_collector(ImdgProvider imdgProvider) {
-        companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
         liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class);
     }
 

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<ReportBR_0420312_P8> {
+public class ReportBR_0420312_P8_collector extends ReportDataCollector<ReportBR_0420312_P8> {
     private Imdg<Company> companyImdg;
     private Imdg<CompanySymbols> companySymbolsImdg;
     private Imdg<ClearingMemberCategory> clearingMemberCategoryImdg;
@@ -32,7 +32,7 @@ public class Bt17_5_P8_collector extends ReportDataCollector<ReportBR_0420312_P8
     private Imdg<CurrencyCodeDictionary> 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);

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<ReportBR_0420312_P9> {
+public class ReportBR_0420312_P9_collector extends ReportDataCollector<ReportBR_0420312_P9> {
     private Imdg<Company> companyImdg;
     private Imdg<LiabilitiesClaimsAssets> liabilitiesClaimsAssetsImdg;
     private Imdg<CurrencyCodeDictionary> 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);

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<ReportBR_0420315_P2> {
+public class ReportBR_0420315_P2_collector extends ReportDataCollector<ReportBR_0420315_P2> {
     private Imdg<LiabilitiesClaimsAssets> liabilitiesClaimsAssetsImdg;
 
     @Autowired
-    public Bt17_1_P2_collector(ImdgProvider imdgProvider) {
+    public ReportBR_0420315_P2_collector(ImdgProvider imdgProvider) {
         liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class);
     }
 

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<ReportBR_0420317> {
+public class ReportBR_0420317_collector extends ReportDataCollector<ReportBR_0420317> {
     private Imdg<Company> companyImdg;
     private Imdg<Relation> relationImdg;
     private Imdg<CompanySymbols> 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);