Merge remote-tracking branch 'origin/dev' into dev

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/ReportsServiceApplication.java

@@ -1,9 +1,9 @@
-package ru.spcex.clearing.reports_service;
+package ru.spcex.clearing.reports;
 
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import ru.spcex.clearing.reports_service.services.ReportsService;
+import ru.spcex.clearing.reports.services.ReportsService;
 
 @SpringBootApplication
 public class ReportsServiceApplication {

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/ReportsServiceConfig.java

@@ -1,4 +1,4 @@
-package ru.spcex.clearing.reports_service.config;
+package ru.spcex.clearing.reports.config;
 
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.ComponentScan;
@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration;
 
 @Configuration
 @EnableConfigurationProperties
-@ComponentScan(basePackages = {"ru.spcex.clearing.reports_service"})
+@ComponentScan(basePackages = {"ru.spcex.clearing.reports"})
 public class ReportsServiceConfig {
 
 }

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/controller/DefaultController.java

@@ -1,4 +1,4 @@
-package ru.spcex.clearing.reports_service.controller;
+package ru.spcex.clearing.reports.controller;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/exceptions/ConfigException.java

@@ -1,4 +1,4 @@
-package ru.spcex.clearing.reports_service.exceptions;
+package ru.spcex.clearing.reports.exceptions;
 
 public class ConfigException extends RuntimeException {
     public ConfigException(String msg) { super(msg); }

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/properties/AProperties.java

@@ -1,4 +1,4 @@
-package ru.spcex.clearing.reports_service.properties;
+package ru.spcex.clearing.reports.properties;
 
 import org.springframework.stereotype.Component;
 

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/AbstractReport.java

@@ -0,0 +1,56 @@
+package ru.spcex.clearing.reports.reports;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import com.thoughtworks.xstream.annotations.XStreamConverter;
+import ru.spcex.clearing.reports.xml_test.FormattedLocalDateConverter;
+
+import java.time.LocalDate;
+
+/**
+ * Общая шапка (атрибуты) для всех отчетов
+ */
+public abstract class AbstractReport {
+
+    @XStreamAsAttribute
+    @XStreamAlias("version")
+    protected String version;
+
+    @XStreamAsAttribute
+    @XStreamAlias("code")
+    protected String code;
+
+    @XStreamAsAttribute
+    @XStreamAlias("name")
+    protected String name;
+
+    @XStreamAsAttribute
+    @XStreamAlias("startDate")
+    @XStreamConverter(value = FormattedLocalDateConverter.class, strings = {"dd.MM.yyyy"})
+    protected LocalDate startDate;
+
+    @XStreamAsAttribute
+    @XStreamAlias("endDate")
+    @XStreamConverter(value = FormattedLocalDateConverter.class, strings = {"dd.MM.yyyy"})
+    protected LocalDate endDate;
+
+    @XStreamAsAttribute
+    @XStreamAlias("destination")
+    protected String destination;
+
+
+    public AbstractReport(String version,
+                          String code,
+                          String name,
+                          LocalDate startDate,
+                          LocalDate endDate,
+                          String destination) {
+        this.version = version;
+        this.code = code;
+        this.name = name;
+        this.startDate = startDate;
+        this.endDate = endDate;
+        this.destination = destination;
+    }
+
+}

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ReportWithClearingStatus.java

@@ -0,0 +1,24 @@
+package ru.spcex.clearing.reports.reports;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+
+import java.time.LocalDate;
+
+public abstract class ReportWithClearingStatus extends AbstractReport {
+    @XStreamAsAttribute
+    @XStreamAlias("clearingStatus")
+    protected String clearingStatus;
+
+    public ReportWithClearingStatus(String version,
+                                    String code,
+                                    String name,
+                                    LocalDate startDate,
+                                    LocalDate endDate,
+                                    String destination,
+                                    String clearingStatus) {
+        super(version, code, name, startDate, endDate, destination);
+        this.clearingStatus = clearingStatus;
+    }
+
+}

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/WithCompanyClearingCode.java

@@ -0,0 +1,14 @@
+package ru.spcex.clearing.reports.reports;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+
+public abstract class WithCompanyClearingCode {
+    @XStreamAsAttribute
+    @XStreamAlias("company_clearingCode")
+    protected String companyClearingCode;
+
+    public WithCompanyClearingCode(String companyClearingCode) {
+        this.companyClearingCode = companyClearingCode;
+    }
+}

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P1.java

@@ -1,33 +1,41 @@
-package ru.spcex.clearing.reports_service.reports.bt_17_1;
+package ru.spcex.clearing.reports.reports.bt_17_1;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import ru.spcex.clearing.reports_service.reports.AbstractReport;
+import ru.spcex.clearing.reports.reports.ReportWithClearingStatus;
 
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
-@XStreamAlias("report")
+@XStreamAlias("clearedLiabilities")
-public class ReportBR_0420315_P1 extends AbstractReport {
+public class ReportBR_0420315_P1 extends ReportWithClearingStatus {
+
+    @XStreamAsAttribute
+    @XStreamAlias("clearingMemberCategory")
+    private String clearingMemberCategory;
 
     @XStreamAlias("rows")
     private final List<Info_0420315_P1> rows = new ArrayList<>();
 
     public ReportBR_0420315_P1(LocalDate startDate,
-                               LocalDate endDate) {
+                               LocalDate endDate,
+                               String clearingMemberCategory,
+                               String clearingStatus) {
         super("0.0.1",
                 "0420315",
-                "Сведения об исполненных обязательствах, допущенных к клирингу, за отчетный период",
+                "Сведения об исполненных обязательствах, допущенных к клирингу, за отчетный период, часть 1",
                 startDate,
-                endDate);
+                endDate,
+                "BR",
+                clearingStatus);
+        this.clearingMemberCategory = clearingMemberCategory;
     }
 
     public List<Info_0420315_P1> getRows() {
         return rows;
     }
 
-
     @XStreamAlias("row")
     public static class Info_0420315_P1 {
         @XStreamAlias("company_id")

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_1/ReportBR_0420315_P2.java

@@ -1,12 +1,12 @@
-package ru.spcex.clearing.reports_service.reports.bt_17_1;
+package ru.spcex.clearing.reports.reports.bt_17_1;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import ru.spcex.clearing.reports_service.reports.AbstractReport;
+import ru.spcex.clearing.reports.reports.AbstractReport;
 
 import java.time.LocalDate;
 
-@XStreamAlias("report")
+@XStreamAlias("clearedLiabilitiesTotal")
 public class ReportBR_0420315_P2 extends AbstractReport {
 
     @XStreamAlias("total")
@@ -15,9 +15,10 @@ public class ReportBR_0420315_P2 extends AbstractReport {
     public ReportBR_0420315_P2(LocalDate startDate, LocalDate endDate, String contractQty, String liabilitiesAmount) {
         super("0.0.1",
                 "0420315",
-                "Сведения об исполненных обязательствах, допущенных к клирингу, за отчетный период",
+                "Сведения об исполненных обязательствах, допущенных к клирингу, за отчетный период, часть 2",
                 startDate,
-                endDate);
+                endDate,
+                "BR");
         total = new Info_0420315_P2(contractQty, liabilitiesAmount);
     }
 

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_2/ReportBR_0420317.java

@@ -1,35 +1,35 @@
-package ru.spcex.clearing.reports_service.reports.bt_17_2;
+package ru.spcex.clearing.reports.reports.bt_17_2;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import ru.spcex.clearing.reports_service.reports.AbstractReport;
+import ru.spcex.clearing.reports.reports.AbstractReport;
+import ru.spcex.clearing.reports.reports.WithCompanyClearingCode;
 
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
-@XStreamAlias("report")
+@XStreamAlias("clearingServiceStatus")
 public class ReportBR_0420317 extends AbstractReport {
-
     @XStreamAlias("rows")
     private final List<Info_0420317> rows = new ArrayList<>();
 
-    public ReportBR_0420317(LocalDate startDate, LocalDate endDate) {
+    public ReportBR_0420317(LocalDate startDate,
+                            LocalDate endDate) {
         super("0.0.1",
                 "0420317",
                 "Сведения о предоставлении, прекращении, приостановке," +
                         " возобновлении допуска к клиринговому обслуживанию",
                 startDate,
-                endDate);
+                endDate, "BR");
     }
 
     public List<Info_0420317> getRows() {
         return rows;
     }
 
-
     @XStreamAlias("row")
-    public static class Info_0420317 {
+    public static class Info_0420317 extends WithCompanyClearingCode {
         @XStreamAsAttribute
         @XStreamAlias("relation_supplierId")
         private String relationSupplierId;
@@ -62,7 +62,8 @@ public class ReportBR_0420317 extends AbstractReport {
         @XStreamAlias("relation_comment")
         private String relationComment;
 
-        public Info_0420317(String relationSupplierId,
+        public Info_0420317(String companyClearingCode,
+                            String relationSupplierId,
                             String relationServiceId,
                             String relationServiceStatus,
                             String relationUpdatedAt,
@@ -70,6 +71,7 @@ public class ReportBR_0420317 extends AbstractReport {
                             String companySymbolCode,
                             String companyInfoCountryCode,
                             String relationComment) {
+            super(companyClearingCode);
             this.relationSupplierId = relationSupplierId;
             this.relationServiceId = relationServiceId;
             this.relationServiceStatus = relationServiceStatus;

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_3/ReportBR_0420318.java

@@ -1,25 +1,27 @@
-package ru.spcex.clearing.reports_service.reports.bt_17_3;
+package ru.spcex.clearing.reports.reports.bt_17_3;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import ru.spcex.clearing.reports_service.reports.AbstractReport;
+import ru.spcex.clearing.reports.reports.ReportWithClearingStatus;
 
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
-@XStreamAlias("report")
+@XStreamAlias("unfundedLiabilities")
-public class ReportBR_0420318 extends AbstractReport {
+public class ReportBR_0420318 extends ReportWithClearingStatus {
 
     @XStreamAlias("rows")
     private final List<Info_0420318> rows = new ArrayList<>();
 
-    public ReportBR_0420318(LocalDate startDate, LocalDate endDate) {
+    public ReportBR_0420318(LocalDate startDate, LocalDate endDate, String clearingStatus) {
-        super("0.0.3",
+        super("0.0.1",
                 "0420318",
                 "Сведения о неисполненных обязательствах",
                 startDate,
-                endDate);
+                endDate,
+                "BR",
+                clearingStatus);
     }
 
     public List<Info_0420318> getRows() {

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_4/ReportBR_0420314_P1.java

@@ -1,25 +1,28 @@
-package ru.spcex.clearing.reports_service.reports.bt_17_4;
+package ru.spcex.clearing.reports.reports.bt_17_4;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import ru.spcex.clearing.reports_service.reports.AbstractReport;
+import ru.spcex.clearing.reports.reports.ReportWithClearingStatus;
+import ru.spcex.clearing.reports.reports.WithCompanyClearingCode;
 
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
-@XStreamAlias("report")
+@XStreamAlias("accountTransactionLiabilities")
-public class ReportBR_0420314_P1 extends AbstractReport {
+public class ReportBR_0420314_P1 extends ReportWithClearingStatus {
 
     @XStreamAlias("rows")
     private final List<Info_0420314_P1> rows = new ArrayList<>();
 
-    public ReportBR_0420314_P1(LocalDate startDate, LocalDate endDate) {
+    public ReportBR_0420314_P1(LocalDate startDate, LocalDate endDate, String clearingStatus) {
         super("0.0.1",
                 "0420314",
-                "Сведения об УК и операциях, проведенных по торговым счетам",
+                "Сведения об УК и операциях, проведенных по торговым счетам, часть 1",
                 startDate,
-                endDate);
+                endDate,
+                "BR",
+                clearingStatus);
     }
 
     public List<Info_0420314_P1> getRows() {
@@ -28,7 +31,7 @@ public class ReportBR_0420314_P1 extends AbstractReport {
 
 
     @XStreamAlias("partOne")
-    public static class Info_0420314_P1 {
+    public static class Info_0420314_P1 extends WithCompanyClearingCode {
         @XStreamAsAttribute
         @XStreamAlias("paymentInstruction_senderId")
         private String paymentInstructionSenderId;
@@ -61,7 +64,8 @@ public class ReportBR_0420314_P1 extends AbstractReport {
         @XStreamAlias("liabilitiesClaimsAssets_liabilitiesQuantity")
         private String liabilitiesClaimsAssetsLiabilitiesQuantity;
 
-        public Info_0420314_P1(String paymentInstructionSenderId,
+        public Info_0420314_P1(String companyClearingCode,
+                               String paymentInstructionSenderId,
                                String profileDocumentId,
                                String companyFullName,
                                String companySymbolCode,
@@ -69,6 +73,7 @@ public class ReportBR_0420314_P1 extends AbstractReport {
                                String clearingMemberCategoryClearingMemberCategory,
                                String profileDocumentDocumentTypeAndValidFromDate,
                                String liabilitiesClaimsAssetsLiabilitiesQuantity) {
+            super(companyClearingCode);
             this.paymentInstructionSenderId = paymentInstructionSenderId;
             this.profileDocumentId = profileDocumentId;
             this.companyFullName = companyFullName;

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_4/ReportBR_0420314_P2.java

@@ -1,25 +1,31 @@
-package ru.spcex.clearing.reports_service.reports.bt_17_4;
+package ru.spcex.clearing.reports.reports.bt_17_4;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import ru.spcex.clearing.reports_service.reports.AbstractReport;
+import ru.spcex.clearing.reports.reports.AbstractReport;
+import ru.spcex.clearing.reports.reports.WithCompanyClearingCode;
 
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
-@XStreamAlias("report")
+@XStreamAlias("accountTransactionTurnover")
 public class ReportBR_0420314_P2 extends AbstractReport {
 
+    @XStreamAsAttribute
+    @XStreamAlias("transactionStatus")
+    protected String transactionStatus;
+
     @XStreamAlias("rows")
     private final List<Info_0420314_P2> rows = new ArrayList<>();
 
-    public ReportBR_0420314_P2(LocalDate startDate, LocalDate endDate) {
+    public ReportBR_0420314_P2(LocalDate startDate, LocalDate endDate, String transactionStatus) {
         super("0.0.1",
                 "0420314",
-                "Сведения об УК и операциях, проведенных по торговым счетам",
+                "Сведения об УК и операциях, проведенных по торговым счетам, часть 2",
                 startDate,
-                endDate);
+                endDate, "BR");
+        this.transactionStatus = transactionStatus;
     }
 
     public List<Info_0420314_P2> getRows() {
@@ -28,7 +34,7 @@ public class ReportBR_0420314_P2 extends AbstractReport {
 
 
     @XStreamAlias("partTwo")
-    public static class Info_0420314_P2 {
+    public static class Info_0420314_P2 extends WithCompanyClearingCode {
         @XStreamAsAttribute
         @XStreamAlias("paymentInstruction_senderId")
         private String paymentInstructionSenderId;
@@ -53,12 +59,14 @@ public class ReportBR_0420314_P2 extends AbstractReport {
         @XStreamAlias("accountBalance_closeBalanceAmount")
         private String accountBalanceCloseBalanceAmount;
 
-        public Info_0420314_P2(String paymentInstructionSenderId,
+        public Info_0420314_P2(String companyClearingCode,
+                               String paymentInstructionSenderId,
                                String profileDocumentId,
                                String accountBalanceOpenBalanceAmount,
                                String paymentInstructionCreditLegAmount,
                                String paymentInstructionDebitLegAmount,
                                String accountBalanceCloseBalanceAmount) {
+            super(companyClearingCode);
             this.paymentInstructionSenderId = paymentInstructionSenderId;
             this.profileDocumentId = profileDocumentId;
             this.accountBalanceOpenBalanceAmount = accountBalanceOpenBalanceAmount;

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P1.java

@@ -1,31 +1,34 @@
-package ru.spcex.clearing.reports_service.reports.bt_17_5;
+package ru.spcex.clearing.reports.reports.bt_17_5;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import ru.spcex.clearing.reports_service.reports.AbstractReport;
+import ru.spcex.clearing.reports.reports.AbstractReport;
+import ru.spcex.clearing.reports.reports.WithCompanyClearingCode;
 
 import java.time.LocalDate;
 
-@XStreamAlias("report")
+@XStreamAlias("clearingCoverage1")
 public class ReportBR_0420312_P1 extends AbstractReport {
 
-    @XStreamAlias("partOne")
+    @XStreamAlias("part_1")
-    private final Info_0420312_P1 partOne;
+    private final Info_0420312_P1 part_1;
 
     public ReportBR_0420312_P1(LocalDate startDate,
                                LocalDate endDate,
+                               String companyClearingCode,
                                String liabilitiesClaimsAssetsCompanyId,
                                String liabilitiesClaimsAssetsFullName,
                                String companySymbolCode,
                                String companySymbolValue,
                                String companyInfoCountryCode,
                                String clearingMemberCategoryClearingMemberCategory) {
-        super("0.0.5",
+        super("0.0.1",
                 "0420312",
-                "Сведения о клиринговом обеспечении",
+                "Сведения о клиринговом обеспечении, часть 1",
                 startDate,
-                endDate);
+                endDate, "BR");
-        partOne = new Info_0420312_P1(liabilitiesClaimsAssetsCompanyId,
+        part_1 = new Info_0420312_P1(companyClearingCode,
+                liabilitiesClaimsAssetsCompanyId,
                 liabilitiesClaimsAssetsFullName,
                 companySymbolCode,
                 companySymbolValue,
@@ -33,7 +36,7 @@ public class ReportBR_0420312_P1 extends AbstractReport {
                 clearingMemberCategoryClearingMemberCategory);
     }
 
-    public static class Info_0420312_P1 {
+    public static class Info_0420312_P1 extends WithCompanyClearingCode {
         @XStreamAsAttribute
         @XStreamAlias("liabilitiesClaimsAssets_companyId")
         private String liabilitiesClaimsAssetsCompanyId;
@@ -59,12 +62,14 @@ public class ReportBR_0420312_P1 extends AbstractReport {
         private String clearingMemberCategoryClearingMemberCategory;
 
 
-        public Info_0420312_P1(String liabilitiesClaimsAssetsCompanyId,
+        public Info_0420312_P1(String companyClearingCode,
+                               String liabilitiesClaimsAssetsCompanyId,
                                String liabilitiesClaimsAssetsFullName,
                                String companySymbolCode,
                                String companySymbolValue,
                                String companyInfoCountryCode,
                                String clearingMemberCategoryClearingMemberCategory) {
+            super(companyClearingCode);
             this.liabilitiesClaimsAssetsCompanyId = liabilitiesClaimsAssetsCompanyId;
             this.liabilitiesClaimsAssetsFullName = liabilitiesClaimsAssetsFullName;
             this.companySymbolCode = companySymbolCode;

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P10.java

@@ -0,0 +1,35 @@
+package ru.spcex.clearing.reports.reports.bt_17_5;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import ru.spcex.clearing.reports.reports.AbstractReport;
+
+import java.time.LocalDate;
+
+@XStreamAlias("report")
+public class ReportBR_0420312_P10 extends AbstractReport {
+
+    @XStreamAlias("part_10")
+    private final Info_0420312_P10 part_10;
+
+    public ReportBR_0420312_P10(LocalDate startDate,
+                                LocalDate endDate,
+                                String liabilitiesAmount) {
+        super("0.0.5",
+                "0420312",
+                "Сведения о клиринговом обеспечении, часть 10",
+                startDate,
+                endDate, "BR");
+        part_10 = new Info_0420312_P10(liabilitiesAmount);
+    }
+
+    public static class Info_0420312_P10 {
+        @XStreamAsAttribute
+        @XStreamAlias("liabilities_amount")
+        private String liabilitiesAmount;
+
+        public Info_0420312_P10(String liabilitiesAmount) {
+            this.liabilitiesAmount = liabilitiesAmount;
+        }
+    }
+}

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P11.java

@@ -1,16 +1,16 @@
-package ru.spcex.clearing.reports_service.reports.bt_17_5;
+package ru.spcex.clearing.reports.reports.bt_17_5;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import ru.spcex.clearing.reports_service.reports.AbstractReport;
+import ru.spcex.clearing.reports.reports.AbstractReport;
 
 import java.time.LocalDate;
 
 @XStreamAlias("report")
 public class ReportBR_0420312_P11 extends AbstractReport {
 
-    @XStreamAlias("partEleven")
+    @XStreamAlias("part_11")
-    private final Info_0420312_P11 partEleven;
+    private final Info_0420312_P11 part_11;
 
     public ReportBR_0420312_P11(LocalDate startDate,
                                 LocalDate endDate,
@@ -19,8 +19,8 @@ public class ReportBR_0420312_P11 extends AbstractReport {
                 "0420312",
                 "Сведения о клиринговом обеспечении",
                 startDate,
-                endDate);
+                endDate, "BR");
-        partEleven = new Info_0420312_P11(liabilitiesAmount);
+        part_11 = new Info_0420312_P11(liabilitiesAmount);
     }
 
     public static class Info_0420312_P11 {

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P2.java

@@ -1,27 +1,27 @@
-package ru.spcex.clearing.reports_service.reports.bt_17_5;
+package ru.spcex.clearing.reports.reports.bt_17_5;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import ru.spcex.clearing.reports_service.reports.AbstractReport;
+import ru.spcex.clearing.reports.reports.AbstractReport;
 
 import java.time.LocalDate;
 
-@XStreamAlias("report")
+@XStreamAlias("clearingCoverage2")
 public class ReportBR_0420312_P2 extends AbstractReport {
 
-    @XStreamAlias("partTwo")
+    @XStreamAlias("part_2")
-    private final Info_0420312_P2 partTwo;
+    private final Info_0420312_P2 part_2;
 
     public ReportBR_0420312_P2(LocalDate startDate,
                                LocalDate endDate,
                                String liabilitiesClaimsAssetsCompanyId,
                                String liabilitiesClaimsAssetsLiabilities) {
-        super("0.0.5",
+        super("0.0.1",
                 "0420312",
-                "Сведения о клиринговом обеспечении",
+                "Сведения о клиринговом обеспечении, часть 2",
                 startDate,
-                endDate);
+                endDate, "BR");
-        partTwo = new Info_0420312_P2(liabilitiesClaimsAssetsCompanyId, liabilitiesClaimsAssetsLiabilities);
+        part_2 = new Info_0420312_P2(liabilitiesClaimsAssetsCompanyId, liabilitiesClaimsAssetsLiabilities);
     }
 
     public static class Info_0420312_P2 {

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P3.java

@@ -1,16 +1,16 @@
-package ru.spcex.clearing.reports_service.reports.bt_17_5;
+package ru.spcex.clearing.reports.reports.bt_17_5;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import ru.spcex.clearing.reports_service.reports.AbstractReport;
+import ru.spcex.clearing.reports.reports.AbstractReport;
 
 import java.time.LocalDate;
 
-@XStreamAlias("report")
+@XStreamAlias("clearingCoverage3")
 public class ReportBR_0420312_P3 extends AbstractReport {
 
-    @XStreamAlias("partThree")
+    @XStreamAlias("part_3")
-    private final Info_0420312_P3 partThree;
+    private final Info_0420312_P3 part_3;
 
     public ReportBR_0420312_P3(LocalDate startDate,
                                LocalDate endDate,
@@ -18,10 +18,10 @@ public class ReportBR_0420312_P3 extends AbstractReport {
                                String liabilitiesClaimsAssetsLiabilities) {
         super("0.0.5",
                 "0420312",
-                "Сведения о клиринговом обеспечении",
+                "Сведения о клиринговом обеспечении, часть 3",
                 startDate,
-                endDate);
+                endDate, "BR");
-        partThree = new Info_0420312_P3(liabilitiesClaimsAssetsCompanyId, liabilitiesClaimsAssetsLiabilities);
+        part_3 = new Info_0420312_P3(liabilitiesClaimsAssetsCompanyId, liabilitiesClaimsAssetsLiabilities);
     }
 
     public static class Info_0420312_P3 {

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P4.java

@@ -1,26 +1,26 @@
-package ru.spcex.clearing.reports_service.reports.bt_17_5;
+package ru.spcex.clearing.reports.reports.bt_17_5;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import ru.spcex.clearing.reports_service.reports.AbstractReport;
+import ru.spcex.clearing.reports.reports.AbstractReport;
 
 import java.time.LocalDate;
 
-@XStreamAlias("report")
+@XStreamAlias("clearingCoverage4")
 public class ReportBR_0420312_P4 extends AbstractReport {
 
-    @XStreamAlias("partFour")
+    @XStreamAlias("part_4")
-    private final Info_0420312_P4 partFour;
+    private final Info_0420312_P4 part_4;
 
     public ReportBR_0420312_P4(LocalDate startDate,
                                LocalDate endDate,
                                String liabilitiesAmount) {
         super("0.0.5",
                 "0420312",
-                "Сведения о клиринговом обеспечении",
+                "Сведения о клиринговом обеспечении, часть 4",
                 startDate,
-                endDate);
+                endDate, "BR");
-        partFour = new Info_0420312_P4(liabilitiesAmount);
+        part_4 = new Info_0420312_P4(liabilitiesAmount);
     }
 
     public static class Info_0420312_P4 {

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P5.java

@@ -1,26 +1,26 @@
-package ru.spcex.clearing.reports_service.reports.bt_17_5;
+package ru.spcex.clearing.reports.reports.bt_17_5;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import ru.spcex.clearing.reports_service.reports.AbstractReport;
+import ru.spcex.clearing.reports.reports.AbstractReport;
 
 import java.time.LocalDate;
 
-@XStreamAlias("report")
+@XStreamAlias("clearingCoverage5")
 public class ReportBR_0420312_P5 extends AbstractReport {
 
-    @XStreamAlias("partFive")
+    @XStreamAlias("part_5")
-    private final Info_0420312_P5 partFive;
+    private final Info_0420312_P5 part_5;
 
     public ReportBR_0420312_P5(LocalDate startDate,
                                LocalDate endDate,
                                String liabilitiesAmount) {
         super("0.0.5",
                 "0420312",
-                "Сведения о клиринговом обеспечении",
+                "Сведения о клиринговом обеспечении, часть 5",
                 startDate,
-                endDate);
+                endDate, "BR");
-        partFive = new Info_0420312_P5(liabilitiesAmount);
+        part_5 = new Info_0420312_P5(liabilitiesAmount);
     }
 
     public static class Info_0420312_P5 {

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P6.java

@@ -1,26 +1,26 @@
-package ru.spcex.clearing.reports_service.reports.bt_17_5;
+package ru.spcex.clearing.reports.reports.bt_17_5;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import ru.spcex.clearing.reports_service.reports.AbstractReport;
+import ru.spcex.clearing.reports.reports.AbstractReport;
 
 import java.time.LocalDate;
 
-@XStreamAlias("report")
+@XStreamAlias("clearingCoverage6")
 public class ReportBR_0420312_P6 extends AbstractReport {
 
-    @XStreamAlias("partSix")
+    @XStreamAlias("part_6")
-    private final Info_0420312_P6 partSix;
+    private final Info_0420312_P6 part_6;
 
     public ReportBR_0420312_P6(LocalDate startDate,
                                LocalDate endDate,
                                String liabilitiesAmount) {
         super("0.0.5",
                 "0420312",
-                "Сведения о клиринговом обеспечении",
+                "Сведения о клиринговом обеспечении, часть 6",
                 startDate,
-                endDate);
+                endDate, "BR");
-        partSix = new Info_0420312_P6(liabilitiesAmount);
+        part_6 = new Info_0420312_P6(liabilitiesAmount);
     }
 
     public static class Info_0420312_P6 {

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P7.java

@@ -1,34 +1,34 @@
-package ru.spcex.clearing.reports_service.reports.bt_17_5;
+package ru.spcex.clearing.reports.reports.bt_17_5;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import ru.spcex.clearing.reports_service.reports.AbstractReport;
+import ru.spcex.clearing.reports.reports.AbstractReport;
 
 import java.time.LocalDate;
 
-@XStreamAlias("report")
+@XStreamAlias("clearingCoverage7")
-public class ReportBR_0420312_P8 extends AbstractReport {
+public class ReportBR_0420312_P7 extends AbstractReport {
 
-    @XStreamAlias("partEight")
+    @XStreamAlias("part_7")
-    private final Info_0420312_P8 partEight;
+    private final Info_0420312_P7 part_7;
 
-    public ReportBR_0420312_P8(LocalDate startDate,
+    public ReportBR_0420312_P7(LocalDate startDate,
                                LocalDate endDate,
                                String liabilitiesAmount) {
         super("0.0.5",
                 "0420312",
-                "Сведения о клиринговом обеспечении",
+                "Сведения о клиринговом обеспечении, часть 7",
                 startDate,
-                endDate);
+                endDate, "BR");
-        partEight = new Info_0420312_P8(liabilitiesAmount);
+        part_7 = new Info_0420312_P7(liabilitiesAmount);
     }
 
-    public static class Info_0420312_P8 {
+    public static class Info_0420312_P7 {
         @XStreamAsAttribute
         @XStreamAlias("liabilities_amount")
         private String liabilitiesAmount;
 
-        public Info_0420312_P8(String liabilitiesAmount) {
+        public Info_0420312_P7(String liabilitiesAmount) {
             this.liabilitiesAmount = liabilitiesAmount;
         }
     }

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P8.java

@@ -1,18 +1,18 @@
-package ru.spcex.clearing.reports_service.reports.bt_17_5;
+package ru.spcex.clearing.reports.reports.bt_17_5;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import ru.spcex.clearing.reports_service.reports.AbstractReport;
+import ru.spcex.clearing.reports.reports.AbstractReport;
 
 import java.time.LocalDate;
 
-@XStreamAlias("report")
+@XStreamAlias("clearingCoverage8")
-public class ReportBR_0420312_P9 extends AbstractReport {
+public class ReportBR_0420312_P8 extends AbstractReport {
 
-    @XStreamAlias("partNine")
+    @XStreamAlias("part_8")
-    private final Info_0420312_P9 partNine;
+    private final Info_0420312_P8 part_8;
 
-    public ReportBR_0420312_P9(LocalDate startDate,
+    public ReportBR_0420312_P8(LocalDate startDate,
                                LocalDate endDate,
                                String currencyId,
                                String liabilitiesClaimsAssetsCompanyId,
@@ -23,10 +23,10 @@ public class ReportBR_0420312_P9 extends AbstractReport {
                                String clearingMemberCategoryClearingMemberCategory) {
         super("0.0.5",
                 "0420312",
-                "Сведения о клиринговом обеспечении",
+                "Сведения о клиринговом обеспечении, часть 8",
                 startDate,
-                endDate);
+                endDate, "BR");
-        partNine = new Info_0420312_P9(currencyId,
+        part_8 = new Info_0420312_P8(currencyId,
                 liabilitiesClaimsAssetsCompanyId,
                 liabilitiesClaimsAssetsFullName,
                 companySymbolCode,
@@ -35,7 +35,7 @@ public class ReportBR_0420312_P9 extends AbstractReport {
                 clearingMemberCategoryClearingMemberCategory);
     }
 
-    public static class Info_0420312_P9 {
+    public static class Info_0420312_P8 {
         @XStreamAsAttribute
         @XStreamAlias("currency_id")
         private String currencyId;
@@ -64,8 +64,7 @@ public class ReportBR_0420312_P9 extends AbstractReport {
         @XStreamAlias("clearingMemberCategory_clearingMemberCategory")
         private String clearingMemberCategoryClearingMemberCategory;
 
-
+        public Info_0420312_P8(String currencyId,
-        public Info_0420312_P9(String currencyId,
                                String liabilitiesClaimsAssetsCompanyId,
                                String liabilitiesClaimsAssetsFullName,
                                String companySymbolCode,

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt_17_5/ReportBR_0420312_P9.java

@@ -1,35 +1,36 @@
-package ru.spcex.clearing.reports_service.reports.bt_17_5;
+package ru.spcex.clearing.reports.reports.bt_17_5;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import ru.spcex.clearing.reports_service.reports.AbstractReport;
+import ru.spcex.clearing.reports.reports.AbstractReport;
 
 import java.time.LocalDate;
 
 @XStreamAlias("report")
-public class ReportBR_0420312_P10 extends AbstractReport {
+public class ReportBR_0420312_P9 extends AbstractReport {
 
-    @XStreamAlias("partTen")
+    @XStreamAlias("part_9")
-    private final Info_0420312_P10 partTen;
+    private final Info_0420312_P9 part_9;
 
-    public ReportBR_0420312_P10(LocalDate startDate,
+    public ReportBR_0420312_P9(LocalDate startDate,
-                                LocalDate endDate,
+                               LocalDate endDate,
-                                String currencyId,
+                               String currencyId,
-                                String liabilitiesClaimsAssetsCompanyId,
+                               String liabilitiesClaimsAssetsCompanyId,
-                                String liabilitiesClaimsMoneyCurrencyCode,
+                               String liabilitiesClaimsMoneyCurrencyCode,
-                                String liabilitiesClaimsAssetsLiabilities) {
+                               String liabilitiesClaimsAssetsLiabilities) {
         super("0.0.5",
                 "0420312",
-                "Сведения о клиринговом обеспечении",
+                "Сведения о клиринговом обеспечении, часть 9",
                 startDate,
-                endDate);
+                endDate,
-        partTen = new Info_0420312_P10(currencyId,
+                "BR");
+        part_9 = new Info_0420312_P9(currencyId,
                 liabilitiesClaimsAssetsCompanyId,
                 liabilitiesClaimsMoneyCurrencyCode,
                 liabilitiesClaimsAssetsLiabilities);
     }
 
-    public static class Info_0420312_P10 {
+    public static class Info_0420312_P9 {
         @XStreamAsAttribute
         @XStreamAlias("currency_id")
         private String currencyId;
@@ -46,10 +47,10 @@ public class ReportBR_0420312_P10 extends AbstractReport {
         @XStreamAlias("liabilitiesClaimsAssets_liabilities")
         private String liabilitiesClaimsAssetsLiabilities;
 
-        public Info_0420312_P10(String currencyId,
+        public Info_0420312_P9(String currencyId,
-                                String liabilitiesClaimsAssetsCompanyId,
+                               String liabilitiesClaimsAssetsCompanyId,
-                                String liabilitiesClaimsMoneyCurrencyCode,
+                               String liabilitiesClaimsMoneyCurrencyCode,
-                                String liabilitiesClaimsAssetsLiabilities) {
+                               String liabilitiesClaimsAssetsLiabilities) {
             this.currencyId = currencyId;
             this.liabilitiesClaimsAssetsCompanyId = liabilitiesClaimsAssetsCompanyId;
             this.liabilitiesClaimsMoneyCurrencyCode = liabilitiesClaimsMoneyCurrencyCode;

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsService.java

@@ -1,15 +1,15 @@
-package ru.spcex.clearing.reports_service.services;
+package ru.spcex.clearing.reports.services;
 
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.naming.NoNameCoder;
 import com.thoughtworks.xstream.io.xml.XppDriver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import ru.spcex.clearing.reports_service.reports.bt_17_1.ReportBR_0420315_P1;
+import ru.spcex.clearing.reports.reports.bt_17_1.ReportBR_0420315_P1;
-import ru.spcex.clearing.reports_service.reports.bt_17_1.ReportBR_0420315_P2;
+import ru.spcex.clearing.reports.reports.bt_17_1.ReportBR_0420315_P2;
-import ru.spcex.clearing.reports_service.reports.bt_17_2.ReportBR_0420317;
+import ru.spcex.clearing.reports.reports.bt_17_2.ReportBR_0420317;
-import ru.spcex.clearing.reports_service.reports.bt_17_3.ReportBR_0420318;
+import ru.spcex.clearing.reports.reports.bt_17_3.ReportBR_0420318;
-import ru.spcex.clearing.reports_service.reports.bt_17_4.ReportBR_0420314_P1;
+import ru.spcex.clearing.reports.reports.bt_17_4.ReportBR_0420314_P1;
 
 import java.time.LocalDate;
 
@@ -25,7 +25,10 @@ public class ReportsService {
         xStream.processAnnotations(ReportBR_0420318.class);
         xStream.processAnnotations(ReportBR_0420314_P1.class);
 
-        ReportBR_0420315_P1 reportBR_0420315_p1 = new ReportBR_0420315_P1(LocalDate.now(), LocalDate.now());
+        ReportBR_0420315_P1 reportBR_0420315_p1 = new ReportBR_0420315_P1(LocalDate.now(),
+                LocalDate.now(),
+                "clearingMemberCategory",
+                "clearingStatus");
         ReportBR_0420315_P1.Info_0420315_P1 info_0420315_p1 = new ReportBR_0420315_P1.Info_0420315_P1("companyId",
                 "companyFullName",
                 "listingMarket",
@@ -41,7 +44,8 @@ public class ReportsService {
         log.info("ReportBR_0420315_P2:\n{}\n", xStream.toXML(reportBR_0420315_p2));
 
         ReportBR_0420317 reportBR_0420317 = new ReportBR_0420317(LocalDate.now(), LocalDate.now());
-        ReportBR_0420317.Info_0420317 info_0420317 = new ReportBR_0420317.Info_0420317("relationSupplierId",
+        ReportBR_0420317.Info_0420317 info_0420317 = new ReportBR_0420317.Info_0420317("companyClearingCode",
+                "relationSupplierId",
                 "relationServiceId",
                 "relationServiceStatus",
                 "relationUpdatedAt",
@@ -52,7 +56,7 @@ public class ReportsService {
         reportBR_0420317.getRows().add(info_0420317);
         log.info("ReportBR_0420317:\n{}\n", xStream.toXML(reportBR_0420317));
 
-        ReportBR_0420318 reportBR_0420318 = new ReportBR_0420318(LocalDate.now(), LocalDate.now());
+        ReportBR_0420318 reportBR_0420318 = new ReportBR_0420318(LocalDate.now(), LocalDate.now(), "clearingStatus");
         ReportBR_0420318.Info_0420318 info_0420318 = new ReportBR_0420318.Info_0420318(
                 "liabilitiesClaimsAssetsFullName",
                 "companySymbolsCode",
@@ -70,8 +74,8 @@ public class ReportsService {
         reportBR_0420318.getRows().add(info_0420318);
         log.info("ReportBR_0420318:\n{}\n", xStream.toXML(reportBR_0420318));
 
-        ReportBR_0420314_P1 reportBR_0420314P1 = new ReportBR_0420314_P1(LocalDate.now(), LocalDate.now());
+        ReportBR_0420314_P1 reportBR_0420314P1 = new ReportBR_0420314_P1(LocalDate.now(), LocalDate.now(), "clearingStatus");
-        ReportBR_0420314_P1.Info_0420314_P1 info_0420314P1 = new ReportBR_0420314_P1.Info_0420314_P1(
+        ReportBR_0420314_P1.Info_0420314_P1 info_0420314P1 = new ReportBR_0420314_P1.Info_0420314_P1("companyClearingCode",
                 "paymentInstructionSenderId",
                 "profileDocumentId",
                 "companyFullName",

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/xml_test/ChildElementForWrite.java

@@ -1,4 +1,4 @@
-package ru.spcex.clearing.reports_service.xml_test;
+package ru.spcex.clearing.reports.xml_test;
 
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/xml_test/ElementWithAttributeOnly.java

@@ -1,4 +1,4 @@
-package ru.spcex.clearing.reports_service.xml_test;
+package ru.spcex.clearing.reports.xml_test;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/xml_test/FormattedLocalDateConverter.java

@@ -1,4 +1,4 @@
-package ru.spcex.clearing.reports_service.xml_test;
+package ru.spcex.clearing.reports.xml_test;
 
 import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter;
 

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/xml_test/RootElementForWrite.java

@@ -1,4 +1,4 @@
-package ru.spcex.clearing.reports_service.xml_test;
+package ru.spcex.clearing.reports.xml_test;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports_service/reports/AbstractReport.java

@@ -1,85 +0,0 @@
-package ru.spcex.clearing.reports_service.reports;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import com.thoughtworks.xstream.annotations.XStreamConverter;
-import ru.spcex.clearing.reports_service.xml_test.FormattedLocalDateConverter;
-
-import java.time.LocalDate;
-
-/**
- * Общая шапка (атрибуты) для всех отчетов
- */
-public class AbstractReport {
-
-    @XStreamAsAttribute
-    @XStreamAlias("version")
-    private String version;
-
-    @XStreamAsAttribute
-    @XStreamAlias("code")
-    private String code;
-
-    @XStreamAsAttribute
-    @XStreamAlias("name")
-    private String name;
-
-    @XStreamAsAttribute
-    @XStreamAlias("startDate")
-    @XStreamConverter(value = FormattedLocalDateConverter.class, strings = {"dd.MM.yyyy"})
-    private LocalDate startDate;
-
-    @XStreamAsAttribute
-    @XStreamAlias("endDate")
-    @XStreamConverter(value = FormattedLocalDateConverter.class, strings = {"dd.MM.yyyy"})
-    private LocalDate endDate;
-
-
-    public AbstractReport(String version, String code, String name, LocalDate startDate, LocalDate endDate) {
-        this.version = version;
-        this.code = code;
-        this.name = name;
-        this.startDate = startDate;
-        this.endDate = endDate;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public LocalDate getStartDate() {
-        return startDate;
-    }
-
-    public void setStartDate(LocalDate startDate) {
-        this.startDate = startDate;
-    }
-
-    public LocalDate getEndDate() {
-        return endDate;
-    }
-
-    public void setEndDate(LocalDate endDate) {
-        this.endDate = endDate;
-    }
-}