From c94bf2a57a872ec96e882dbb53f773cb3976f1dd Mon Sep 17 00:00:00 2001 From: Ivan Nikolaev-Axenov Date: Wed, 18 Dec 2024 10:41:18 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-806 add null as empty on serialization --- .../data/tags/objects/DF02ObjectTag.java | 15 +++++++++ .../data/tags/objects/DF03ObjectTag.java | 15 +++++++++ .../data/tags/objects/DF05ObjectTag.java | 6 ++++ .../data/tags/objects/DF07ObjectTag.java | 16 +++++++++ .../data/tags/objects/DF51ObjectTag.java | 5 +++ .../data/tags/objects/DF53ObjectTag.java | 9 +++++ .../data/tags/objects/DF54ObjectTag.java | 33 +++++++++++++++++++ .../data/tags/objects/DF56ObjectTag.java | 9 +++++ 8 files changed, 108 insertions(+) diff --git a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF02ObjectTag.java b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF02ObjectTag.java index ccb59a158..5b303458a 100644 --- a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF02ObjectTag.java +++ b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF02ObjectTag.java @@ -1,6 +1,8 @@ package ru.spcex.clearing.xml.exporter.logic.data.tags.objects; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -9,43 +11,56 @@ import ru.clearing.classes.statics.data.sdf.SDf02; public class DF02ObjectTag extends ObjectTag { @JacksonXmlProperty(isAttribute = true, localName = "CURR_CODE") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String currCode; @JacksonXmlProperty(isAttribute = true, localName = "ACCOUNT") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String account; @JacksonXmlProperty(isAttribute = true, localName = "REMAINDER") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String remainder; @JacksonXmlProperty(isAttribute = true, localName = "DEAL") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String deal; @JacksonXmlProperty(isAttribute = true, localName = "ACC_CODE") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String accCode; @JacksonXmlProperty(isAttribute = true, localName = "DAT") + @JsonSetter(nulls = Nulls.AS_EMPTY) @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate dat; @JacksonXmlProperty(isAttribute = true, localName = "MARKET") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String market; @JacksonXmlProperty(isAttribute = true, localName = "ACC_NAME") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String accName; @JacksonXmlProperty(isAttribute = true, localName = "ACC_TYPE") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String accType; @JacksonXmlProperty(isAttribute = true, localName = "SUMENGAGE") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String sumengage; @JacksonXmlProperty(isAttribute = true, localName = "SUMUNBLOK") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String sumunblock; @JacksonXmlProperty(isAttribute = true, localName = "FILE_TYPE") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String fileType; @JacksonXmlProperty(isAttribute = true, localName = "RESULT") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String result; public DF02ObjectTag() { diff --git a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF03ObjectTag.java b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF03ObjectTag.java index 2901e19c8..157fe2557 100644 --- a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF03ObjectTag.java +++ b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF03ObjectTag.java @@ -2,6 +2,8 @@ package ru.spcex.clearing.xml.exporter.logic.data.tags.objects; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -10,21 +12,27 @@ import ru.clearing.classes.statics.data.sdf.SDf03; public class DF03ObjectTag extends ObjectTag { @JacksonXmlProperty(isAttribute = true, localName = "SEG_TYPE") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String segType; @JacksonXmlProperty(isAttribute = true, localName = "DOC_TYPE") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String docType; @JacksonXmlProperty(isAttribute = true, localName = "DOCNM_REF") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String docnmRef; @JacksonXmlProperty(isAttribute = true, localName = "DOCNMPREV") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String docnmprev; @JacksonXmlProperty(isAttribute = true, localName = "C_ACC_DEB") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String cAccDeb; @JacksonXmlProperty(isAttribute = true, localName = "SBANKNAM") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String sbanknam1; @JsonIgnore private String sbanknam2; @@ -36,9 +44,11 @@ public class DF03ObjectTag extends ObjectTag { private String sbanknam5; @JacksonXmlProperty(isAttribute = true, localName = "C_ACC_CRED") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String cAccCred; @JacksonXmlProperty(isAttribute = true, localName = "RBANKNAM") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String rbanknam1; @JsonIgnore private String rbanknam2; @@ -50,19 +60,24 @@ public class DF03ObjectTag extends ObjectTag { private String rbanknam5; @JacksonXmlProperty(isAttribute = true, localName = "PAY_DATE") + @JsonSetter(nulls = Nulls.AS_EMPTY) @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate payDate; @JacksonXmlProperty(isAttribute = true, localName = "PAY_VAL") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String payVal; @JacksonXmlProperty(isAttribute = true, localName = "SUM_DEB") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String sumDeb; @JacksonXmlProperty(isAttribute = true, localName = "SPECIF_1") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String specif1; @JacksonXmlProperty(isAttribute = true, localName = "IMP_RESULT") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String impResult; diff --git a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF05ObjectTag.java b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF05ObjectTag.java index ded7ece25..b7cb00c82 100644 --- a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF05ObjectTag.java +++ b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF05ObjectTag.java @@ -1,6 +1,8 @@ package ru.spcex.clearing.xml.exporter.logic.data.tags.objects; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import java.math.BigDecimal; import java.time.LocalDate; @@ -11,17 +13,21 @@ import ru.clearing.classes.statics.data.sdf.SDf05; public class DF05ObjectTag extends ObjectTag { @JacksonXmlProperty(isAttribute = true, localName = "TP") + @JsonSetter(nulls = Nulls.AS_EMPTY) private BigDecimal tp; @JacksonXmlProperty(isAttribute = true, localName = "DT") + @JsonSetter(nulls = Nulls.AS_EMPTY) @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate dt; @JacksonXmlProperty(isAttribute = true, localName = "TM") + @JsonSetter(nulls = Nulls.AS_EMPTY) @JsonFormat(pattern = "hh:mm:ss") private LocalTime tm; @JacksonXmlProperty(isAttribute = true, localName = "PR") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String pr; public DF05ObjectTag() { diff --git a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF07ObjectTag.java b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF07ObjectTag.java index e6f5b1394..1137ba91b 100644 --- a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF07ObjectTag.java +++ b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF07ObjectTag.java @@ -1,6 +1,8 @@ package ru.spcex.clearing.xml.exporter.logic.data.tags.objects; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import java.math.BigDecimal; import java.time.LocalDate; @@ -10,46 +12,60 @@ import ru.clearing.classes.statics.data.sdf.SDf07; public class DF07ObjectTag extends ObjectTag { @JacksonXmlProperty(isAttribute = true, localName = "ACCOUNT") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String account; @JacksonXmlProperty(isAttribute = true, localName = "SUM") + @JsonSetter(nulls = Nulls.AS_EMPTY) private BigDecimal sum; @JacksonXmlProperty(isAttribute = true, localName = "MARKET") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String market; @JacksonXmlProperty(isAttribute = true, localName = "TYPE") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String type; @JacksonXmlProperty(isAttribute = true, localName = "DEAL") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String deal; @JacksonXmlProperty(isAttribute = true, localName = "CLIENTN") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String clientN; @JacksonXmlProperty(isAttribute = true, localName = "INN") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String inn; @JacksonXmlProperty(isAttribute = true, localName = "BIC") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String bic; @JacksonXmlProperty(isAttribute = true, localName = "SPEC") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String spec; @JacksonXmlProperty(isAttribute = true, localName = "NUMBER") + @JsonSetter(nulls = Nulls.AS_EMPTY) private BigDecimal number; @JacksonXmlProperty(isAttribute = true, localName = "DOC_NUM") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String docNum; @JacksonXmlProperty(isAttribute = true, localName = "DOC_DATE") + @JsonSetter(nulls = Nulls.AS_EMPTY) @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate docDate; @JacksonXmlProperty(isAttribute = true, localName = "PAY_VAL") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String payVal; @JacksonXmlProperty(isAttribute = true, localName = "RESULT") + @JsonSetter(nulls = Nulls.AS_EMPTY) private BigDecimal result; diff --git a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF51ObjectTag.java b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF51ObjectTag.java index fc028ad32..7dd6d891c 100644 --- a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF51ObjectTag.java +++ b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF51ObjectTag.java @@ -2,6 +2,8 @@ package ru.spcex.clearing.xml.exporter.logic.data.tags.objects; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import java.time.Instant; import java.time.LocalDateTime; @@ -12,12 +14,15 @@ import ru.clearing.classes.statics.data.sdf.SDf51; public class DF51ObjectTag extends ObjectTag { @JacksonXmlProperty(isAttribute = true, localName = "NUMBER") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String number; @JacksonXmlProperty(isAttribute = true, localName = "UNIXTIME") + @JsonSetter(nulls = Nulls.AS_EMPTY) private Long unixtime; @JacksonXmlProperty(isAttribute = true, localName = "DATETIME") + @JsonSetter(nulls = Nulls.AS_EMPTY) @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") private LocalDateTime datetime; diff --git a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF53ObjectTag.java b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF53ObjectTag.java index b43f22f9f..0230ab567 100644 --- a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF53ObjectTag.java +++ b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF53ObjectTag.java @@ -1,6 +1,8 @@ package ru.spcex.clearing.xml.exporter.logic.data.tags.objects; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -9,25 +11,32 @@ import ru.clearing.classes.statics.data.sdf.SDf53; public class DF53ObjectTag extends ObjectTag { @JacksonXmlProperty(isAttribute = true, localName = "ACCOUNT") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String account; @JacksonXmlProperty(isAttribute = true, localName = "ACC_NAME") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String accName; @JacksonXmlProperty(isAttribute = true, localName = "DEAL") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String deal; @JacksonXmlProperty(isAttribute = true, localName = "DATE") + @JsonSetter(nulls = Nulls.AS_EMPTY) @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate date; @JacksonXmlProperty(isAttribute = true, localName = "STATUS") + @JsonSetter(nulls = Nulls.AS_EMPTY) private Long status; @JacksonXmlProperty(isAttribute = true, localName = "ACC_TYPE") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String accType; @JacksonXmlProperty(isAttribute = true, localName = "RESULT") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String result; diff --git a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF54ObjectTag.java b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF54ObjectTag.java index 7be93cd4c..c8b994fa4 100644 --- a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF54ObjectTag.java +++ b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF54ObjectTag.java @@ -2,6 +2,8 @@ package ru.spcex.clearing.xml.exporter.logic.data.tags.objects; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -10,24 +12,31 @@ import ru.clearing.classes.statics.data.sdf.SDf54; public class DF54ObjectTag extends ObjectTag { @JacksonXmlProperty(isAttribute = true, localName = "SEG_TYPE") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String segType; @JacksonXmlProperty(isAttribute = true, localName = "DOC_TYPE") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String docType; @JacksonXmlProperty(isAttribute = true, localName = "DOCNM_REF") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String docnmRef; @JacksonXmlProperty(isAttribute = true, localName = "DOCNMPREV") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String docnmprev; @JacksonXmlProperty(isAttribute = true, localName = "SBANKCODE") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String sbankcode; @JacksonXmlProperty(isAttribute = true, localName = "C_ACC_DEB") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String cAccDeb; @JacksonXmlProperty(isAttribute = true, localName = "SBANKNAM") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String sbanknam1; @JsonIgnore private String sbanknam2; @@ -39,12 +48,15 @@ public class DF54ObjectTag extends ObjectTag { private String sbanknam5; @JacksonXmlProperty(isAttribute = true, localName = "RBANKCODE") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String rbankcode; @JacksonXmlProperty(isAttribute = true, localName = "C_ACC_CRED") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String cAccCred; @JacksonXmlProperty(isAttribute = true, localName = "RBANKNAM") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String rbanknam1; @JsonIgnore private String rbanknam2; @@ -56,22 +68,28 @@ public class DF54ObjectTag extends ObjectTag { private String rbanknam5; @JacksonXmlProperty(isAttribute = true, localName = "OP_TYPE") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String opType; @JacksonXmlProperty(isAttribute = true, localName = "OP_ORDER") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String opOrder; @JacksonXmlProperty(isAttribute = true, localName = "PAY_DATE") + @JsonSetter(nulls = Nulls.AS_EMPTY) @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate payDate; @JacksonXmlProperty(isAttribute = true, localName = "PAY_VAL") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String payVal; @JacksonXmlProperty(isAttribute = true, localName = "SUM_DEB") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String sumDeb; @JacksonXmlProperty(isAttribute = true, localName = "SCLIENTN") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String sclientn1; @JsonIgnore private String sclientn2; @@ -81,15 +99,19 @@ public class DF54ObjectTag extends ObjectTag { private String sclientn4; @JacksonXmlProperty(isAttribute = true, localName = "INN_DEB") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String innDeb; @JacksonXmlProperty(isAttribute = true, localName = "KPP_DEB") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String kppDeb; @JacksonXmlProperty(isAttribute = true, localName = "ACC_DEB") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String accDeb; @JacksonXmlProperty(isAttribute = true, localName = "RCLIENTN") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String rclientn1; @JsonIgnore private String rclientn2; @@ -99,38 +121,49 @@ public class DF54ObjectTag extends ObjectTag { private String rclientn4; @JacksonXmlProperty(isAttribute = true, localName = "INN_CRED") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String innCred; @JacksonXmlProperty(isAttribute = true, localName = "KPP_CRED") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String kppCred; @JacksonXmlProperty(isAttribute = true, localName = "ACC_KR_1") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String accKr1; @JacksonXmlProperty(isAttribute = true, localName = "SPECIF_1") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String specif1; @JacksonXmlProperty(isAttribute = true, localName = "SEND_TYPE") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String sendType; @JacksonXmlProperty(isAttribute = true, localName = "DOC_RESULT") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String docResult; @JacksonXmlProperty(isAttribute = true, localName = "DOC_NUM") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String docNum; @JacksonXmlProperty(isAttribute = true, localName = "DOC_DATE") + @JsonSetter(nulls = Nulls.AS_EMPTY) @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate docDate; @JacksonXmlProperty(isAttribute = true, localName = "VALUE_DATE") + @JsonSetter(nulls = Nulls.AS_EMPTY) @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate valueDate; @JacksonXmlProperty(isAttribute = true, localName = "SWIFT_BEN") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String swiftBen; @JacksonXmlProperty(isAttribute = true, localName = "SWIFT_INT") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String swiftInt; diff --git a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF56ObjectTag.java b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF56ObjectTag.java index 3d930d78f..8932df084 100644 --- a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF56ObjectTag.java +++ b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF56ObjectTag.java @@ -1,6 +1,8 @@ package ru.spcex.clearing.xml.exporter.logic.data.tags.objects; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import java.time.Instant; import java.time.LocalDateTime; @@ -11,28 +13,35 @@ import ru.clearing.classes.statics.data.sdf.SDf56; public class DF56ObjectTag extends ObjectTag { @JacksonXmlProperty(isAttribute = true, localName = "NUMBER") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String number; @JacksonXmlProperty(isAttribute = true, localName = "SUNIXTIME") + @JsonSetter(nulls = Nulls.AS_EMPTY) private Long startUnixtime; @JacksonXmlProperty(isAttribute = true, localName = "SDATETIME") + @JsonSetter(nulls = Nulls.AS_EMPTY) @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") private LocalDateTime startDatetime; @JacksonXmlProperty(isAttribute = true, localName = "EUNIXTIME") + @JsonSetter(nulls = Nulls.AS_EMPTY) private Long endUnixtime; @JacksonXmlProperty(isAttribute = true, localName = "EDATETIME") + @JsonSetter(nulls = Nulls.AS_EMPTY) @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") private LocalDateTime endDatetime; @JacksonXmlProperty(isAttribute = true, localName = "ACCOUNT") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String account; @JacksonXmlProperty(isAttribute = true, localName = "DEAL") + @JsonSetter(nulls = Nulls.AS_EMPTY) private String deal;