diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/AbstractReport.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/AbstractReport.java index 27c7072af..c8b56a13e 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/AbstractReport.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/AbstractReport.java @@ -10,6 +10,7 @@ import java.time.format.DateTimeFormatter; /** * Общая шапка (атрибуты) для всех отчетов */ +@Deprecated public abstract class AbstractReport { protected static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yyyy"); protected static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yyyy'T'HH:mm:ss"); diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ReportId.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ReportId.java index 00b21d565..1d66b3ebc 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ReportId.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ReportId.java @@ -5,7 +5,7 @@ import ru.spcex.platform.utils.enumeration.IEnumKey; /** * Идентификаторы отчётов */ -// todo create new ID +@Deprecated public enum ReportId implements IEnumKey { PA_B("REPPA.B"), PA_IV("REPPA.IV"), diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ReportWithClearingStatus.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ReportWithClearingStatus.java index e86e5007c..051362750 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ReportWithClearingStatus.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ReportWithClearingStatus.java @@ -5,6 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import java.time.LocalDate; +@Deprecated public abstract class ReportWithClearingStatus extends ReportWithPeriod { @XStreamAsAttribute @XStreamAlias("clearingStatus") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ReportWithPeriod.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ReportWithPeriod.java index 2895b8b4b..f84070ab7 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ReportWithPeriod.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ReportWithPeriod.java @@ -10,6 +10,7 @@ import java.time.LocalDate; /** * Шапка для отчётов, содержащих startDate и endDate */ +@Deprecated public abstract class ReportWithPeriod extends AbstractReport { @XStreamAsAttribute diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_12_2/ReportPA_B.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_12_2/ReportPA_B.java index b4e020fee..d638fbf44 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_12_2/ReportPA_B.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_12_2/ReportPA_B.java @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.List; @XStreamAlias("netPositionBank") +@Deprecated public class ReportPA_B extends ReportWithPeriod { @XStreamAsAttribute @XStreamAlias("clearingMemberCategory") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_12_2/ReportPA_IV.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_12_2/ReportPA_IV.java index 781602111..a989f5a03 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_12_2/ReportPA_IV.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_12_2/ReportPA_IV.java @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.List; @XStreamAlias("netPositionInitiator") +@Deprecated public class ReportPA_IV extends ReportWithPeriod { @XStreamAsAttribute @XStreamAlias("clearingMemberCategory") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_13/ReportDOCIN.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_13/ReportDOCIN.java index 5205c1155..21034018e 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_13/ReportDOCIN.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_13/ReportDOCIN.java @@ -15,6 +15,7 @@ import java.util.ArrayList; import java.util.List; @XStreamAlias("incomingDocuments") +@Deprecated public class ReportDOCIN extends AbstractReport { /** * Дата в формате: dd.MM.yyyy diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_13/ReportDOCOUT.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_13/ReportDOCOUT.java index dae9330e3..587f78796 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_13/ReportDOCOUT.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_13/ReportDOCOUT.java @@ -15,6 +15,7 @@ import java.util.ArrayList; import java.util.List; @XStreamAlias("incomingDocuments") +@Deprecated public class ReportDOCOUT extends AbstractReport { /** * Дата в формате: dd.MM.yyyy diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_16_5/ReportINACCNT.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_16_5/ReportINACCNT.java index fe67d73f8..f58b05e20 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_16_5/ReportINACCNT.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_16_5/ReportINACCNT.java @@ -15,6 +15,7 @@ import java.util.ArrayList; import java.util.List; @XStreamAlias("accountBalanceInfo") +@Deprecated public class ReportINACCNT extends AbstractReport { @XStreamAsAttribute @XStreamAlias("clearingMemberCategory") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_1/ReportBR_0420315_P1.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_1/ReportBR_0420315_P1.java index ec2c5bb72..bd317a145 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_1/ReportBR_0420315_P1.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_1/ReportBR_0420315_P1.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; @XStreamAlias("clearedLiabilities") +@Deprecated public class ReportBR_0420315_P1 extends ReportWithClearingStatus { @XStreamAsAttribute @XStreamAlias("destination") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_1/ReportBR_0420315_P2.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_1/ReportBR_0420315_P2.java index 33f54524d..dd013a1ff 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_1/ReportBR_0420315_P2.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_1/ReportBR_0420315_P2.java @@ -10,6 +10,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; @XStreamAlias("clearedLiabilitiesTotal") +@Deprecated public class ReportBR_0420315_P2 extends ReportWithPeriod { @XStreamAlias("rows") private Info_0420315_P2 rows; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_2/ReportBR_0420317.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_2/ReportBR_0420317.java index fd6fe1cfb..167b889de 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_2/ReportBR_0420317.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_2/ReportBR_0420317.java @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.List; @XStreamAlias("clearingServiceStatus") +@Deprecated public class ReportBR_0420317 extends ReportWithPeriod { @XStreamAsAttribute @XStreamAlias("destination") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_3/ReportBR_0420318.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_3/ReportBR_0420318.java index 63f5b88e0..0a4d1529c 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_3/ReportBR_0420318.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_3/ReportBR_0420318.java @@ -13,6 +13,7 @@ import java.util.ArrayList; import java.util.List; @XStreamAlias("unfundedLiabilities") +@Deprecated public class ReportBR_0420318 extends ReportWithClearingStatus { @XStreamAsAttribute @XStreamAlias("destination") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_4/ReportBR_0420314_P1.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_4/ReportBR_0420314_P1.java index e50ceef0d..55fede8b5 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_4/ReportBR_0420314_P1.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_4/ReportBR_0420314_P1.java @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.List; @XStreamAlias("accountTransactionLiabilities") +@Deprecated public class ReportBR_0420314_P1 extends ReportWithClearingStatus { @XStreamAsAttribute @XStreamAlias("destination") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_4/ReportBR_0420314_P2.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_4/ReportBR_0420314_P2.java index 368cd90ed..1feed5112 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_4/ReportBR_0420314_P2.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_4/ReportBR_0420314_P2.java @@ -11,6 +11,7 @@ import java.util.ArrayList; import java.util.List; @XStreamAlias("accountTransactionTurnover") +@Deprecated public class ReportBR_0420314_P2 extends ReportWithPeriod { @XStreamAsAttribute @XStreamAlias("destination") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P1.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P1.java index b93fd7cce..3e6492797 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P1.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P1.java @@ -11,6 +11,7 @@ import java.util.ArrayList; import java.util.List; @XStreamAlias("clearingCoverage1") +@Deprecated public class ReportBR_0420312_P1 extends ReportWithPeriod { @XStreamAsAttribute @XStreamAlias("destination") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P10.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P10.java index c2be21c02..32ad2e543 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P10.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P10.java @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.List; @XStreamAlias("clearingCoverage10") +@Deprecated public class ReportBR_0420312_P10 extends ReportWithPeriod { @XStreamAsAttribute @XStreamAlias("destination") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P2.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P2.java index dea3c98f7..6e0043854 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P2.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P2.java @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.List; @XStreamAlias("clearingCoverage2") +@Deprecated public class ReportBR_0420312_P2 extends ReportWithPeriod { @XStreamAsAttribute @XStreamAlias("destination") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P3.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P3.java index 1b856c186..79ec3df44 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P3.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P3.java @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.List; @XStreamAlias("clearingCoverage3") +@Deprecated public class ReportBR_0420312_P3 extends ReportWithPeriod { @XStreamAsAttribute @XStreamAlias("destination") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P4.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P4.java index 45386395e..e8350d3b7 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P4.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P4.java @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.List; @XStreamAlias("clearingCoverage4") +@Deprecated public class ReportBR_0420312_P4 extends ReportWithPeriod { @XStreamAsAttribute @XStreamAlias("destination") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P5.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P5.java index f152b141f..5579eaf22 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P5.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P5.java @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.List; @XStreamAlias("clearingCoverage5") +@Deprecated public class ReportBR_0420312_P5 extends ReportWithPeriod { @XStreamAsAttribute diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P6.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P6.java index d473dc3f6..7f8220da6 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P6.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P6.java @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.List; @XStreamAlias("clearingCoverage6") +@Deprecated public class ReportBR_0420312_P6 extends ReportWithPeriod { @XStreamAsAttribute @XStreamAlias("destination") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P7.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P7.java index f6cedeb16..fa809a07e 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P7.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P7.java @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.List; @XStreamAlias("clearingCoverage7") +@Deprecated public class ReportBR_0420312_P7 extends ReportWithPeriod { @XStreamAsAttribute @XStreamAlias("destination") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P8.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P8.java index 97680fce5..51d6c3345 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P8.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P8.java @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.List; @XStreamAlias("clearingCoverage8") +@Deprecated public class ReportBR_0420312_P8 extends ReportWithPeriod { @XStreamAsAttribute @XStreamAlias("destination") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P9.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P9.java index e8358e88c..24e899539 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P9.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bt/bt_17_5/ReportBR_0420312_P9.java @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.List; @XStreamAlias("clearingCoverage9") +@Deprecated public class ReportBR_0420312_P9 extends ReportWithPeriod { @XStreamAsAttribute @XStreamAlias("destination") diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/builders/FileReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/builders/FileReportBuilder.java index dcde34308..04e9c6e79 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/builders/FileReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/builders/FileReportBuilder.java @@ -5,6 +5,7 @@ import ru.spcex.clearing.reports.reports.AbstractReport; import java.io.File; import java.io.IOException; +@Deprecated public abstract class FileReportBuilder { protected final Class reportClass; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/builders/XMLReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/builders/XMLReportBuilder.java index 2dd5e8546..baafed9b4 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/builders/XMLReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/builders/XMLReportBuilder.java @@ -12,6 +12,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.time.LocalDateTime; +@Deprecated public class XMLReportBuilder extends FileReportBuilder { private final Logger log = LoggerFactory.getLogger(getClass()); protected final XStream xStream; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_12_2/ReportPA_B_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_12_2/ReportPA_B_Collector.java index 5694273ad..89d132aaf 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_12_2/ReportPA_B_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_12_2/ReportPA_B_Collector.java @@ -20,6 +20,7 @@ import java.util.Set; import java.util.stream.Collectors; @Component +@Deprecated public class ReportPA_B_Collector extends ReportWithPeriodCollector { private final Imdg liabilitiesClaimsAssetsImdg; private final Imdg clearingMemberCategoryImdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_12_2/ReportPA_IV_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_12_2/ReportPA_IV_Collector.java index 3a09f9491..b14a4978e 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_12_2/ReportPA_IV_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_12_2/ReportPA_IV_Collector.java @@ -20,6 +20,7 @@ import java.util.Set; import java.util.stream.Collectors; @Component +@Deprecated public class ReportPA_IV_Collector extends ReportWithPeriodCollector { private final Imdg liabilitiesClaimsAssetsImdg; private final Imdg clearingStatusDictionaryImdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_13/ReportDOCIN_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_13/ReportDOCIN_Collector.java index 2766dac66..4376a8adf 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_13/ReportDOCIN_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_13/ReportDOCIN_Collector.java @@ -17,6 +17,7 @@ import java.time.LocalTime; import java.util.Collection; @Component +@Deprecated public class ReportDOCIN_Collector extends SimpleReportCollector { protected final Logger log = LoggerFactory.getLogger(getClass()); diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_13/ReportDOCOUT_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_13/ReportDOCOUT_Collector.java index 539b4931e..3e613a82d 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_13/ReportDOCOUT_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_13/ReportDOCOUT_Collector.java @@ -17,6 +17,7 @@ import java.time.LocalTime; import java.util.Collection; @Component +@Deprecated public class ReportDOCOUT_Collector extends SimpleReportCollector { protected final Logger log = LoggerFactory.getLogger(getClass()); diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_16_5/ReportINACCNT_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_16_5/ReportINACCNT_Collector.java index 8e7297bf8..ef8f26a24 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_16_5/ReportINACCNT_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_16_5/ReportINACCNT_Collector.java @@ -19,6 +19,7 @@ import java.util.Set; import java.util.stream.Collectors; @Component +@Deprecated public class ReportINACCNT_Collector extends ReportForClearingCodeCollector { private final Imdg accountBalanceImdg; private final Imdg companyImdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_1/ReportBR_0420315_P1_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_1/ReportBR_0420315_P1_Collector.java index 9a2cecf52..6acb0fb0b 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_1/ReportBR_0420315_P1_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_1/ReportBR_0420315_P1_Collector.java @@ -23,6 +23,7 @@ import java.time.LocalDate; import java.util.*; @Component +@Deprecated public class ReportBR_0420315_P1_Collector extends ReportWithPeriodCollector { protected static final List ALLOW_CLEARING_MEMBER_CATEGORY = Arrays.asList(ClearingCategory.I.getKey(), ClearingCategory.V.getKey()); diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_1/ReportBR_0420315_P2_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_1/ReportBR_0420315_P2_collector.java index eb199191b..9085d5c76 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_1/ReportBR_0420315_P2_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_1/ReportBR_0420315_P2_collector.java @@ -16,6 +16,7 @@ import java.util.Collection; import java.util.HashSet; @Component +@Deprecated public class ReportBR_0420315_P2_collector extends ReportWithPeriodCollector { private Imdg liabilitiesClaimsAssetsImdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_2/ReportBR_0420317_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_2/ReportBR_0420317_Collector.java index 320a10668..383fe89f4 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_2/ReportBR_0420317_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_2/ReportBR_0420317_Collector.java @@ -20,6 +20,7 @@ import java.util.Collection; import java.util.Map; @Component +@Deprecated public class ReportBR_0420317_Collector extends ReportWithPeriodCollector { private Imdg companyImdg; private Imdg relationImdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_3/ReportBR_0420318_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_3/ReportBR_0420318_Collector.java index b6046bb5b..2ef561446 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_3/ReportBR_0420318_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_3/ReportBR_0420318_Collector.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; @Component +@Deprecated public class ReportBR_0420318_Collector extends ReportWithPeriodCollector { private Imdg liabilitiesClaimsAssetsImdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_4/ReportBR_0420314_P1_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_4/ReportBR_0420314_P1_Collector.java index b7e5c0ab2..bf4022354 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_4/ReportBR_0420314_P1_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_4/ReportBR_0420314_P1_Collector.java @@ -24,6 +24,7 @@ import java.util.Map; * accountTransactionLiabilities */ @Component +@Deprecated public class ReportBR_0420314_P1_Collector extends ReportWithPeriodCollector { private Imdg companyImdg; private Imdg companySymbolsImdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_4/ReportBR_0420314_P2_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_4/ReportBR_0420314_P2_Collector.java index c772ad25d..14ce6e0bf 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_4/ReportBR_0420314_P2_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_4/ReportBR_0420314_P2_Collector.java @@ -30,6 +30,7 @@ import java.util.Objects; * accountTransactionLiabilities */ @Component +@Deprecated public class ReportBR_0420314_P2_Collector extends ReportWithPeriodCollector { private Imdg companyImdg; private Imdg paymentInstructionImdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P10_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P10_Collector.java index 1f65b2cef..c2c39feb3 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P10_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P10_Collector.java @@ -15,6 +15,7 @@ import java.util.Collection; import java.util.Objects; @Component +@Deprecated public class ReportBR_0420312_P10_Collector extends ReportWithPeriodCollector { private Imdg liabilitiesClaimsAssetsImdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P1_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P1_Collector.java index 686abd725..a71ff3df7 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P1_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P1_Collector.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Map; @Component +@Deprecated public class ReportBR_0420312_P1_Collector extends ReportWithPeriodCollector { private final Imdg companyImdg; private final Imdg companySymbolsImdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P2_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P2_Collector.java index a8495f52b..dbae68ea5 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P2_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P2_Collector.java @@ -18,6 +18,7 @@ import java.util.Map; import java.util.Objects; @Component +@Deprecated public class ReportBR_0420312_P2_Collector extends ReportWithPeriodCollector { private Imdg liabilitiesClaimsAssetsImdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P3_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P3_Collector.java index 0cb625184..64a0256c5 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P3_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P3_Collector.java @@ -18,6 +18,7 @@ import java.util.Map; import java.util.Objects; @Component +@Deprecated public class ReportBR_0420312_P3_Collector extends ReportWithPeriodCollector { private Imdg liabilitiesClaimsAssetsImdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P4_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P4_Collector.java index b3bed29c7..9a16262ef 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P4_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P4_Collector.java @@ -15,6 +15,7 @@ import java.util.Collection; import java.util.Objects; @Component +@Deprecated public class ReportBR_0420312_P4_Collector extends ReportWithPeriodCollector { private Imdg liabilitiesClaimsAssetsImdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P5_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P5_Collector.java index e65107aaf..5d247cdce 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P5_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P5_Collector.java @@ -15,6 +15,7 @@ import java.util.Collection; import java.util.Objects; @Component +@Deprecated public class ReportBR_0420312_P5_Collector extends ReportWithPeriodCollector { private Imdg liabilitiesClaimsAssetsImdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P6_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P6_Collector.java index 23522d0d2..0a38c56d8 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P6_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P6_Collector.java @@ -15,6 +15,7 @@ import java.util.Collection; import java.util.Objects; @Component +@Deprecated public class ReportBR_0420312_P6_Collector extends ReportWithPeriodCollector { private Imdg liabilitiesClaimsAssetsImdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P7_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P7_Collector.java index ce5d112d0..b4bea17d7 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P7_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P7_Collector.java @@ -15,6 +15,7 @@ import java.util.Collection; import java.util.Objects; @Component +@Deprecated public class ReportBR_0420312_P7_Collector extends ReportWithPeriodCollector { private Imdg liabilitiesClaimsAssetsImdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P8_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P8_Collector.java index d04fa1156..82fd2e196 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P8_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P8_Collector.java @@ -21,6 +21,7 @@ import java.util.List; import java.util.Map; @Component +@Deprecated public class ReportBR_0420312_P8_Collector extends ReportWithPeriodCollector { private Imdg companyImdg; private Imdg companySymbolsImdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P9_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P9_Collector.java index 9138693bc..a9dcb279d 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P9_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/bt/bt_17_5/ReportBR_0420312_P9_Collector.java @@ -20,6 +20,7 @@ import java.util.Map; import java.util.Objects; @Component +@Deprecated public class ReportBR_0420312_P9_Collector extends ReportWithPeriodCollector { private Imdg companyImdg; private Imdg liabilitiesClaimsAssetsImdg; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/xml_test/ChildElementForWrite.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/xml_test/ChildElementForWrite.java deleted file mode 100644 index 4a6b5c215..000000000 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/xml_test/ChildElementForWrite.java +++ /dev/null @@ -1,80 +0,0 @@ -package ru.spcex.clearing.reports.xml_test; - - -import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import com.thoughtworks.xstream.annotations.XStreamConverter; -import com.thoughtworks.xstream.annotations.XStreamOmitField; -import com.thoughtworks.xstream.converters.basic.BooleanConverter; -import com.thoughtworks.xstream.converters.basic.DateConverter; - -import java.util.Date; - -// without aliases -public class ChildElementForWrite { - @XStreamAlias("childStr") // alias for field name - private String testChildString = "testChildStr"; - - @XStreamAsAttribute - private Integer testAttributeInt = Integer.MIN_VALUE; - - // при использовании настраевомого встроенного конвертора, ему необходимо передать параметры в конструктор - // делается это посредством параметров strings, booleans, nulls. - // т.е. такая запись эквивалентна: - // new DateConverter("MM-yyyy-dd", null) - @XStreamConverter(value = DateConverter.class, strings = {"MM-yyyy-dd"}, nulls = {String[].class}) - private Date testDate = new Date(); - - @XStreamAsAttribute - @XStreamAlias("isBoolean") - @XStreamConverter(value = BooleanConverter.class, booleans = {true}, strings = {"yes", "no"}) - private Boolean testYesAttributeBool = Boolean.TRUE; - - private Integer testChildInt = Integer.MAX_VALUE; - - @XStreamOmitField - private String testIgnoredString = "testIgnore"; - - - - public String getTestChildString() { - return testChildString; - } - - public void setTestChildString(String testChildString) { - this.testChildString = testChildString; - } - - public Integer getTestAttributeInt() { - return testAttributeInt; - } - - public void setTestAttributeInt(Integer testAttributeInt) { - this.testAttributeInt = testAttributeInt; - } - - public Integer getTestChildInt() { - return testChildInt; - } - - public void setTestChildInt(Integer testChildInt) { - this.testChildInt = testChildInt; - } - - public String getTestIgnoredString() { - return testIgnoredString; - } - - public void setTestIgnoredString(String testIgnoredString) { - this.testIgnoredString = testIgnoredString; - } - - public Boolean getTestYesAttributeBool() { - return testYesAttributeBool; - } - - public void setTestYesAttributeBool(Boolean testYesAttributeBool) { - this.testYesAttributeBool = testYesAttributeBool; - } - -} diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/xml_test/ElementWithAttributeOnly.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/xml_test/ElementWithAttributeOnly.java deleted file mode 100644 index aa5d185ed..000000000 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/xml_test/ElementWithAttributeOnly.java +++ /dev/null @@ -1,29 +0,0 @@ -package ru.spcex.clearing.reports.xml_test; - -import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamAsAttribute; - -@XStreamAlias("withAttrsOnly") -public class ElementWithAttributeOnly { - @XStreamAsAttribute - private String attrStr = "attrStr"; - - @XStreamAsAttribute - private Long attrLong = Long.MIN_VALUE; - - public String getAttrStr() { - return attrStr; - } - - public void setAttrStr(String attrStr) { - this.attrStr = attrStr; - } - - public Long getAttrLong() { - return attrLong; - } - - public void setAttrLong(Long attrLong) { - this.attrLong = attrLong; - } -} diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/xml_test/FormattedLocalDateConverter.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/xml_test/FormattedLocalDateConverter.java deleted file mode 100644 index ff4762875..000000000 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/xml_test/FormattedLocalDateConverter.java +++ /dev/null @@ -1,37 +0,0 @@ -package ru.spcex.clearing.reports.xml_test; - -import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter; - -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.Objects; - -public class FormattedLocalDateConverter extends AbstractSingleValueConverter { - private final String DEFAULT_PATTERN = "dd.MM.yyyy"; - private final DateTimeFormatter formatter; - - public FormattedLocalDateConverter() { - formatter = DateTimeFormatter.ofPattern(DEFAULT_PATTERN); - } - - public FormattedLocalDateConverter(String pattern) { - formatter = DateTimeFormatter.ofPattern(Objects.requireNonNullElse(pattern, DEFAULT_PATTERN)); - } - - @Override - public boolean canConvert(Class type) { - return LocalDate.class.isAssignableFrom(type); - } - - @Override - public Object fromString(String str) { - // not implemented (not used) - return null; - } - - @Override - public String toString(Object obj) { - LocalDate date = (LocalDate) obj; - return date != null ? formatter.format(date) : ""; - } -} diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/xml_test/FormattedLocalTimeConverter.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/xml_test/FormattedLocalTimeConverter.java deleted file mode 100644 index 0bcb2a347..000000000 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/xml_test/FormattedLocalTimeConverter.java +++ /dev/null @@ -1,37 +0,0 @@ -package ru.spcex.clearing.reports.xml_test; - -import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter; - -import java.time.LocalTime; -import java.time.format.DateTimeFormatter; -import java.util.Objects; - -public class FormattedLocalTimeConverter extends AbstractSingleValueConverter { - private final String DEFAULT_PATTERN = "HH:mm:ss"; - private final DateTimeFormatter formatter; - - public FormattedLocalTimeConverter() { - formatter = DateTimeFormatter.ofPattern(DEFAULT_PATTERN); - } - - public FormattedLocalTimeConverter(String pattern) { - formatter = DateTimeFormatter.ofPattern(Objects.requireNonNullElse(pattern, DEFAULT_PATTERN)); - } - - @Override - public boolean canConvert(Class type) { - return LocalTime.class.isAssignableFrom(type); - } - - @Override - public Object fromString(String str) { - // not implemented (not used) - return null; - } - - @Override - public String toString(Object obj) { - LocalTime date = (LocalTime) obj; - return date != null ? formatter.format(date) : ""; - } -} diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/xml_test/RootElementForWrite.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/xml_test/RootElementForWrite.java deleted file mode 100644 index e10dd6ddf..000000000 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/xml_test/RootElementForWrite.java +++ /dev/null @@ -1,155 +0,0 @@ -package ru.spcex.clearing.reports.xml_test; - -import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamConverter; -import com.thoughtworks.xstream.annotations.XStreamImplicit; - -import java.math.BigDecimal; -import java.time.Instant; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.OffsetDateTime; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -@XStreamAlias("root") // alias for classname -public class RootElementForWrite { - - @XStreamAlias("string") // alias for field - private String testString = "testString"; - - private BigDecimal testBigDecimal = new BigDecimal("666.666"); - - private Double testDouble = Double.MAX_VALUE; - - private Long testLong = Long.MIN_VALUE; - - private Boolean testBoolean = Boolean.FALSE; - - private LocalDate testLocalDateDefault = LocalDate.now(); - - @XStreamConverter(FormattedLocalDateConverter.class) - private LocalDate testLocalDateCustom = LocalDate.now(); - - private LocalDateTime testLocalDateTime = LocalDateTime.now(); - - private OffsetDateTime testOffsetDateTime = OffsetDateTime.now(); - - private Instant testInstant = Instant.now(); - - @XStreamAlias("namedList") - private List testList = new ArrayList<>(); - - @XStreamImplicit - private List testListTwo = Arrays.asList(new ChildElementForWrite(), new ChildElementForWrite()); - - // can marshal without getter/setter - private ElementWithAttributeOnly elementWithAttributeOnly = new ElementWithAttributeOnly(); - - public String getTestString() { - return testString; - } - - public void setTestString(String testString) { - this.testString = testString; - } - - public BigDecimal getTestBigDecimal() { - return testBigDecimal; - } - - public void setTestBigDecimal(BigDecimal testBigDecimal) { - this.testBigDecimal = testBigDecimal; - } - - public Double getTestDouble() { - return testDouble; - } - - public void setTestDouble(Double testDouble) { - this.testDouble = testDouble; - } - - public Long getTestLong() { - return testLong; - } - - public void setTestLong(Long testLong) { - this.testLong = testLong; - } - - public Boolean getTestBoolean() { - return testBoolean; - } - - public void setTestBoolean(Boolean testBoolean) { - this.testBoolean = testBoolean; - } - - public LocalDate getTestLocalDate() { - return testLocalDateCustom; - } - - public void setTestLocalDate(LocalDate testLocalDate) { - this.testLocalDateCustom = testLocalDate; - } - - public LocalDateTime getTestLocalDateTime() { - return testLocalDateTime; - } - - public void setTestLocalDateTime(LocalDateTime testLocalDateTime) { - this.testLocalDateTime = testLocalDateTime; - } - - public OffsetDateTime getTestOffsetDateTime() { - return testOffsetDateTime; - } - - public void setTestOffsetDateTime(OffsetDateTime testOffsetDateTime) { - this.testOffsetDateTime = testOffsetDateTime; - } - - public Instant getTestInstant() { - return testInstant; - } - - public void setTestInstant(Instant testInstant) { - this.testInstant = testInstant; - } - - public List getTestList() { - return testList; - } - - public void setTestList(List testList) { - this.testList = testList; - } - - public List getTestListTwo() { - return testListTwo; - } - - public void setTestListTwo(List testListTwo) { - this.testListTwo = testListTwo; - } - - public LocalDate getTestLocalDateDefault() { - return testLocalDateDefault; - } - - public void setTestLocalDateDefault(LocalDate testLocalDateDefault) { - this.testLocalDateDefault = testLocalDateDefault; - } - - public LocalDate getTestLocalDateCustom() { - return testLocalDateCustom; - } - - public void setTestLocalDateCustom(LocalDate testLocalDateCustom) { - this.testLocalDateCustom = testLocalDateCustom; - } - -} -