From b7cbcbbe5496fc2f6d7724eab017e7f9a32adbf8 Mon Sep 17 00:00:00 2001 From: ialbert Date: Fri, 14 Oct 2022 14:45:54 +0300 Subject: [PATCH] fix dates --- .../ProfileDocumentBackendGetFields.java | 28 +++++++++---------- .../SchedulerAllTodayBackendGetFields.java | 22 ++++++++------- .../schedule/SchedulerBackendGetFields.java | 20 +++++++------ .../schedule/TimetableBackendGetFields.java | 10 ++++--- .../TradingCalendarBackendGetFields.java | 7 +++-- .../MoneyMarketSecurityBackendGetFields.java | 3 +- .../json/serialize/LocalDateSerializer.java | 20 +++++++++++++ .../json/serialize/LocalTimeSerializer.java | 20 +++++++++++++ 8 files changed, 89 insertions(+), 41 deletions(-) create mode 100644 platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/json/serialize/LocalDateSerializer.java create mode 100644 platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/json/serialize/LocalTimeSerializer.java diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/ProfileDocumentBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/ProfileDocumentBackendGetFields.java index 5b6c51d49..27cd18d89 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/ProfileDocumentBackendGetFields.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/ProfileDocumentBackendGetFields.java @@ -2,9 +2,9 @@ package ru.spcex.clearing.backendapi.controller.response.entity.company; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; -import java.time.Instant; +import java.time.LocalDate; public class ProfileDocumentBackendGetFields { @JsonProperty @@ -14,8 +14,8 @@ public class ProfileDocumentBackendGetFields { @JsonProperty private String documentType; @JsonProperty - @JsonSerialize(using = InstantSerializer.class) - private Instant issueDate; + @JsonSerialize(using = LocalDateSerializer.class) + private LocalDate issueDate; @JsonProperty private String issuePlace; @JsonProperty @@ -29,11 +29,11 @@ public class ProfileDocumentBackendGetFields { @JsonProperty private String place; @JsonProperty - @JsonSerialize(using = InstantSerializer.class) - private Instant validFromDate; + @JsonSerialize(using = LocalDateSerializer.class) + private LocalDate validFromDate; @JsonProperty - @JsonSerialize(using = InstantSerializer.class) - private Instant validToDate; + @JsonSerialize(using = LocalDateSerializer.class) + private LocalDate validToDate; @JsonProperty private String link; @@ -61,11 +61,11 @@ public class ProfileDocumentBackendGetFields { this.documentType = documentType; } - public Instant getIssueDate() { + public LocalDate getIssueDate() { return issueDate; } - public void setIssueDate(Instant issueDate) { + public void setIssueDate(LocalDate issueDate) { this.issueDate = issueDate; } @@ -117,19 +117,19 @@ public class ProfileDocumentBackendGetFields { this.place = place; } - public Instant getValidFromDate() { + public LocalDate getValidFromDate() { return validFromDate; } - public void setValidFromDate(Instant validFromDate) { + public void setValidFromDate(LocalDate validFromDate) { this.validFromDate = validFromDate; } - public Instant getValidToDate() { + public LocalDate getValidToDate() { return validToDate; } - public void setValidToDate(Instant validToDate) { + public void setValidToDate(LocalDate validToDate) { this.validToDate = validToDate; } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerAllTodayBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerAllTodayBackendGetFields.java index 941b8b404..ae70af9f1 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerAllTodayBackendGetFields.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerAllTodayBackendGetFields.java @@ -2,9 +2,11 @@ package ru.spcex.clearing.backendapi.controller.response.entity.schedule; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalTimeSerializer; -import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalTime; public class SchedulerAllTodayBackendGetFields { @JsonProperty @@ -12,11 +14,11 @@ public class SchedulerAllTodayBackendGetFields { @JsonProperty private String task; @JsonProperty - @JsonSerialize(using = InstantSerializer.class) - private Instant taskTime; + @JsonSerialize(using = LocalTimeSerializer.class) + private LocalTime taskTime; @JsonProperty - @JsonSerialize(using = InstantSerializer.class) - private Instant clearingDate; + @JsonSerialize(using = LocalDateSerializer.class) + private LocalDate clearingDate; @JsonProperty private String market; @JsonProperty @@ -44,19 +46,19 @@ public class SchedulerAllTodayBackendGetFields { this.task = task; } - public Instant getTaskTime() { + public LocalTime getTaskTime() { return taskTime; } - public void setTaskTime(Instant taskTime) { + public void setTaskTime(LocalTime taskTime) { this.taskTime = taskTime; } - 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/schedule/SchedulerBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerBackendGetFields.java index 7220f301f..71561a8d1 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerBackendGetFields.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerBackendGetFields.java @@ -3,8 +3,12 @@ package ru.spcex.clearing.backendapi.controller.response.entity.schedule; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalTimeSerializer; import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalTime; public class SchedulerBackendGetFields { @JsonProperty @@ -12,11 +16,11 @@ public class SchedulerBackendGetFields { @JsonProperty private String task; @JsonProperty - @JsonSerialize(using = InstantSerializer.class) - private Instant taskTime; + @JsonSerialize(using = LocalTimeSerializer.class) + private LocalTime taskTime; @JsonProperty - @JsonSerialize(using = InstantSerializer.class) - private Instant clearingDate; + @JsonSerialize(using = LocalDateSerializer.class) + private LocalDate clearingDate; @JsonProperty private String market; @JsonProperty @@ -46,19 +50,19 @@ public class SchedulerBackendGetFields { this.task = task; } - public Instant getTaskTime() { + public LocalTime getTaskTime() { return taskTime; } - public void setTaskTime(Instant taskTime) { + public void setTaskTime(LocalTime taskTime) { this.taskTime = taskTime; } - 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/schedule/TimetableBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TimetableBackendGetFields.java index c3a53ba86..a348b0799 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TimetableBackendGetFields.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TimetableBackendGetFields.java @@ -3,8 +3,10 @@ package ru.spcex.clearing.backendapi.controller.response.entity.schedule; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalTimeSerializer; import java.time.Instant; +import java.time.LocalTime; public class TimetableBackendGetFields { @JsonProperty @@ -12,8 +14,8 @@ public class TimetableBackendGetFields { @JsonProperty private String task; @JsonProperty - @JsonSerialize(using = InstantSerializer.class) - private Instant taskTime; + @JsonSerialize(using = LocalTimeSerializer.class) + private LocalTime taskTime; @JsonProperty private String taskStatus; @JsonProperty @@ -39,11 +41,11 @@ public class TimetableBackendGetFields { this.task = task; } - public Instant getTaskTime() { + public LocalTime getTaskTime() { return taskTime; } - public void setTaskTime(Instant taskTime) { + public void setTaskTime(LocalTime taskTime) { this.taskTime = taskTime; } 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 bc0029218..121ee7b59 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 @@ -3,6 +3,7 @@ package ru.spcex.clearing.backendapi.controller.response.entity.schedule; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; import java.time.Instant; import java.time.LocalDate; @@ -11,8 +12,8 @@ public class TradingCalendarBackendGetFields { @JsonProperty private Long id; @JsonProperty - @JsonSerialize(using = InstantSerializer.class) - private Instant clearingDate; + @JsonSerialize(using = LocalDateSerializer.class) + private LocalDate clearingDate; @JsonProperty private Long companyId; @JsonProperty @@ -22,7 +23,7 @@ public class TradingCalendarBackendGetFields { private Instant created; @JsonProperty @JsonSerialize(using = InstantSerializer.class) - private LocalDate updated; + private Instant updated; public Long getId() { return id; 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 fe856716a..339eb6daf 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 @@ -5,7 +5,6 @@ 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 MoneyMarketSecurityBackendGetFields { @@ -56,7 +55,7 @@ public class MoneyMarketSecurityBackendGetFields { this.description = description; } - public Instant getStartDate() { + public LocalDate getStartDate() { return startDate; } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/json/serialize/LocalDateSerializer.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/json/serialize/LocalDateSerializer.java new file mode 100644 index 000000000..44d9ccf70 --- /dev/null +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/json/serialize/LocalDateSerializer.java @@ -0,0 +1,20 @@ +package ru.spcex.clearing.platform.messaging.domain.json.serialize; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; + +import java.io.IOException; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +public class LocalDateSerializer extends JsonSerializer { + private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + + + @Override + public void serialize(LocalDate value, JsonGenerator gen, SerializerProvider serializers) throws IOException { + if (value == null) return; + gen.writeString(value.format(formatter)); + } +} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/json/serialize/LocalTimeSerializer.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/json/serialize/LocalTimeSerializer.java new file mode 100644 index 000000000..0a615458b --- /dev/null +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/json/serialize/LocalTimeSerializer.java @@ -0,0 +1,20 @@ +package ru.spcex.clearing.platform.messaging.domain.json.serialize; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; + +import java.io.IOException; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; + +public class LocalTimeSerializer extends JsonSerializer { + private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss"); + + + @Override + public void serialize(LocalTime value, JsonGenerator gen, SerializerProvider serializers) throws IOException { + if (value == null) return; + gen.writeString(value.format(formatter)); + } +}