From d93895655d3f90dbc1035e8e45e14181a12a034a Mon Sep 17 00:00:00 2001 From: etreshenkov Date: Thu, 13 Oct 2022 18:05:44 +0300 Subject: [PATCH] fix localDate --- .../securities/MoneyMarketSecurityNewAction.java | 14 +++++++------- .../MoneyMarketSecurityUpdateAction.java | 8 ++++---- .../request/cud/utilities/KeyRateNewAction.java | 14 +++++++------- .../request/cud/utilities/KeyRateUpdateAction.java | 14 +++++++------- .../schedule/TradingCalendarBackendGetFields.java | 7 ++++--- .../MoneyMarketSecurityBackendGetFields.java | 11 ++++++----- .../entity/utilities/KeyRateBackendGetFields.java | 14 +++++++------- 7 files changed, 42 insertions(+), 40 deletions(-) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityNewAction.java index 66de901c0..1aafda5c5 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityNewAction.java @@ -11,7 +11,7 @@ import ru.spcex.clearing.platform.messaging.domain.cud.securitites.MoneyMarketSe import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; import ru.spcex.platform.utils.enumeration.EnumMessage; -import java.time.Instant; +import java.time.LocalDate; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -21,12 +21,12 @@ public class MoneyMarketSecurityNewAction implements IAction { @ApiModelProperty(hidden = true) @@ -19,7 +19,7 @@ public class MoneyMarketSecurityUpdateAction implements IAction { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow") @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty - public Instant startDate; + public LocalDate startDate; @ApiModelProperty(value = "Дата окончания действия ключевой ставки", example = "2022-04-20") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow") @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty - public Instant endDate; + public LocalDate endDate; @ApiModelProperty(value = "Документ ЦБ", example = "Lorem ipsum") @JsonProperty public String document; @@ -66,19 +66,19 @@ public class KeyRateNewAction implements IAction { this.keyRate = keyRate; } - public Instant getStartDate() { + public LocalDate getStartDate() { return startDate; } - public void setStartDate(Instant startDate) { + public void setStartDate(LocalDate startDate) { this.startDate = startDate; } - public Instant getEndDate() { + public LocalDate getEndDate() { return endDate; } - public void setEndDate(Instant endDate) { + public void setEndDate(LocalDate endDate) { this.endDate = endDate; } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/utilities/KeyRateUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/utilities/KeyRateUpdateAction.java index d6d46fe6f..342875e33 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/utilities/KeyRateUpdateAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/utilities/KeyRateUpdateAction.java @@ -10,7 +10,7 @@ import ru.spcex.clearing.platform.messaging.domain.cud.utilities.KeyRateUpdateRe import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; import java.math.BigDecimal; -import java.time.Instant; +import java.time.LocalDate; public class KeyRateUpdateAction implements IAction { @ApiModelProperty(hidden = true) @@ -23,12 +23,12 @@ public class KeyRateUpdateAction implements IAction { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow") @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty - public Instant startDate; + public LocalDate startDate; @ApiModelProperty(value = "Дата окончания действия ключевой ставки", example = "2022-04-20") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow") @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty - public Instant endDate; + public LocalDate endDate; @ApiModelProperty(value = "Документ ЦБ", example = "Lorem ipsum") @JsonProperty public String document; @@ -58,19 +58,19 @@ public class KeyRateUpdateAction implements IAction { this.keyRate = keyRate; } - public Instant getStartDate() { + public LocalDate getStartDate() { return startDate; } - public void setStartDate(Instant startDate) { + public void setStartDate(LocalDate startDate) { this.startDate = startDate; } - public Instant getEndDate() { + public LocalDate getEndDate() { return endDate; } - public void setEndDate(Instant endDate) { + public void setEndDate(LocalDate endDate) { this.endDate = endDate; } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TradingCalendarBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TradingCalendarBackendGetFields.java index f4418c4de..bc0029218 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TradingCalendarBackendGetFields.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TradingCalendarBackendGetFields.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; import java.time.Instant; +import java.time.LocalDate; public class TradingCalendarBackendGetFields { @JsonProperty @@ -21,7 +22,7 @@ public class TradingCalendarBackendGetFields { private Instant created; @JsonProperty @JsonSerialize(using = InstantSerializer.class) - private Instant updated; + private LocalDate updated; public Long getId() { return id; @@ -31,11 +32,11 @@ public class TradingCalendarBackendGetFields { this.id = id; } - public Instant getClearingDate() { + public LocalDate getClearingDate() { return clearingDate; } - public void setClearingDate(Instant clearingDate) { + public void setClearingDate(LocalDate clearingDate) { this.clearingDate = clearingDate; } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetFields.java index aa8139e07..fe856716a 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetFields.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetFields.java @@ -6,6 +6,7 @@ import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSeriali import java.math.BigDecimal; import java.time.Instant; +import java.time.LocalDate; public class MoneyMarketSecurityBackendGetFields { @JsonProperty @@ -16,10 +17,10 @@ public class MoneyMarketSecurityBackendGetFields { private String description; @JsonSerialize(using = InstantSerializer.class) @JsonProperty - private Instant startDate; + private LocalDate startDate; @JsonSerialize(using = InstantSerializer.class) @JsonProperty - private Instant endDate; + private LocalDate endDate; @JsonProperty private BigDecimal nominalValue; @JsonProperty @@ -59,15 +60,15 @@ public class MoneyMarketSecurityBackendGetFields { return startDate; } - public void setStartDate(Instant startDate) { + public void setStartDate(LocalDate startDate) { this.startDate = startDate; } - public Instant getEndDate() { + public LocalDate getEndDate() { return endDate; } - public void setEndDate(Instant endDate) { + public void setEndDate(LocalDate endDate) { this.endDate = endDate; } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/utilities/KeyRateBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/utilities/KeyRateBackendGetFields.java index 93207aee6..4687db305 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/utilities/KeyRateBackendGetFields.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/utilities/KeyRateBackendGetFields.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; import java.math.BigDecimal; -import java.time.Instant; +import java.time.LocalDate; public class KeyRateBackendGetFields { @JsonProperty @@ -14,10 +14,10 @@ public class KeyRateBackendGetFields { private BigDecimal rate; @JsonSerialize(using = InstantSerializer.class) @JsonProperty - private Instant startDate; + private LocalDate startDate; @JsonSerialize(using = InstantSerializer.class) @JsonProperty - private Instant endDate; + private LocalDate endDate; @JsonProperty private String document; @JsonProperty @@ -39,19 +39,19 @@ public class KeyRateBackendGetFields { this.rate = rate; } - public Instant getStartDate() { + public LocalDate getStartDate() { return startDate; } - public void setStartDate(Instant startDate) { + public void setStartDate(LocalDate startDate) { this.startDate = startDate; } - public Instant getEndDate() { + public LocalDate getEndDate() { return endDate; } - public void setEndDate(Instant endDate) { + public void setEndDate(LocalDate endDate) { this.endDate = endDate; }