From 8437b1fd6e1c5fdfacb8a9b987e5382840d45082 Mon Sep 17 00:00:00 2001 From: Gerversmann Tim Date: Mon, 19 Oct 2020 18:19:56 +0200 Subject: [PATCH] TSK-1416: Truncation of Instant Membervariables --- .../internal/models/ClassificationImpl.java | 9 ++++--- .../pro/taskana/common/api/ScheduledJob.java | 15 +++++------ .../ClassificationHistoryEvent.java | 5 ++-- .../api/events/task/TaskHistoryEvent.java | 5 ++-- .../workbasket/WorkbasketHistoryEvent.java | 5 ++-- .../models/AttachmentSummaryImpl.java | 13 +++++----- .../internal/models/MinimalTaskSummary.java | 13 +++++----- .../task/internal/models/TaskCommentImpl.java | 9 ++++--- .../task/internal/models/TaskSummaryImpl.java | 25 ++++++++++--------- .../internal/models/WorkbasketImpl.java | 9 ++++--- 10 files changed, 59 insertions(+), 49 deletions(-) diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/models/ClassificationImpl.java b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/models/ClassificationImpl.java index 5c0480d67..69ed9426c 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/models/ClassificationImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/models/ClassificationImpl.java @@ -1,6 +1,7 @@ package pro.taskana.classification.internal.models; import java.time.Instant; +import java.time.temporal.ChronoUnit; import java.util.Objects; import pro.taskana.classification.api.ClassificationCustomField; @@ -54,20 +55,20 @@ public class ClassificationImpl extends ClassificationSummaryImpl implements Cla @Override public Instant getCreated() { - return created; + return created != null ? created.truncatedTo(ChronoUnit.MILLIS) : null; } public void setCreated(Instant created) { - this.created = created; + this.created = created != null ? created.truncatedTo(ChronoUnit.MILLIS) : null; } @Override public Instant getModified() { - return modified; + return modified != null ? modified.truncatedTo(ChronoUnit.MILLIS) : null; } public void setModified(Instant modified) { - this.modified = modified; + this.modified = modified != null ? modified.truncatedTo(ChronoUnit.MILLIS) : null; } @Override diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/api/ScheduledJob.java b/lib/taskana-core/src/main/java/pro/taskana/common/api/ScheduledJob.java index 4c15b17af..c0e872529 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/api/ScheduledJob.java +++ b/lib/taskana-core/src/main/java/pro/taskana/common/api/ScheduledJob.java @@ -1,6 +1,7 @@ package pro.taskana.common.api; import java.time.Instant; +import java.time.temporal.ChronoUnit; import java.util.Map; import java.util.Objects; @@ -28,7 +29,7 @@ public class ScheduledJob { private int retryCount; public ScheduledJob() { - created = Instant.now(); + created = Instant.now().truncatedTo(ChronoUnit.MILLIS); state = State.READY; retryCount = 0; } @@ -50,19 +51,19 @@ public class ScheduledJob { } public Instant getCreated() { - return created; + return created != null ? created.truncatedTo(ChronoUnit.MILLIS) : null; } public void setCreated(Instant created) { - this.created = created; + this.created = created != null ? created.truncatedTo(ChronoUnit.MILLIS) : null; } public Instant getDue() { - return due; + return due != null ? due.truncatedTo(ChronoUnit.MILLIS) : null; } public void setDue(Instant due) { - this.due = due; + this.due = due != null ? due.truncatedTo(ChronoUnit.MILLIS) : null; } public State getState() { @@ -82,11 +83,11 @@ public class ScheduledJob { } public Instant getLockExpires() { - return lockExpires; + return lockExpires != null ? lockExpires.truncatedTo(ChronoUnit.MILLIS) : null; } public void setLockExpires(Instant lockExpires) { - this.lockExpires = lockExpires; + this.lockExpires = lockExpires != null ? lockExpires.truncatedTo(ChronoUnit.MILLIS) : null; } public Map getArguments() { diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/classification/ClassificationHistoryEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/classification/ClassificationHistoryEvent.java index a8a8ef92a..5b3b869f1 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/classification/ClassificationHistoryEvent.java +++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/classification/ClassificationHistoryEvent.java @@ -1,6 +1,7 @@ package pro.taskana.spi.history.api.events.classification; import java.time.Instant; +import java.time.temporal.ChronoUnit; import java.util.Objects; import pro.taskana.classification.api.ClassificationCustomField; @@ -134,11 +135,11 @@ public class ClassificationHistoryEvent { } public Instant getCreated() { - return created; + return created != null ? created.truncatedTo(ChronoUnit.MILLIS) : null; } public void setCreated(Instant created) { - this.created = created; + this.created = created != null ? created.truncatedTo(ChronoUnit.MILLIS) : null; } public String getUserId() { diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskHistoryEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskHistoryEvent.java index ddfd3a498..9935fcb7d 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskHistoryEvent.java +++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskHistoryEvent.java @@ -1,6 +1,7 @@ package pro.taskana.spi.history.api.events.task; import java.time.Instant; +import java.time.temporal.ChronoUnit; import java.util.Objects; import pro.taskana.common.api.exceptions.SystemException; @@ -217,11 +218,11 @@ public class TaskHistoryEvent { } public Instant getCreated() { - return created; + return created != null ? created.truncatedTo(ChronoUnit.MILLIS) : null; } public void setCreated(Instant created) { - this.created = created; + this.created = created != null ? created.truncatedTo(ChronoUnit.MILLIS) : null; } public String getUserId() { diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketHistoryEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketHistoryEvent.java index 23324d46c..85b443ce2 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketHistoryEvent.java +++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketHistoryEvent.java @@ -1,6 +1,7 @@ package pro.taskana.spi.history.api.events.workbasket; import java.time.Instant; +import java.time.temporal.ChronoUnit; import java.util.Objects; import pro.taskana.common.api.exceptions.SystemException; @@ -102,11 +103,11 @@ public class WorkbasketHistoryEvent { } public Instant getCreated() { - return created; + return created != null ? created.truncatedTo(ChronoUnit.MILLIS) : null; } public void setCreated(Instant created) { - this.created = created; + this.created = created != null ? created.truncatedTo(ChronoUnit.MILLIS) : null; } public String getUserId() { diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/AttachmentSummaryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/AttachmentSummaryImpl.java index b3ccfb5bf..5cb899a08 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/AttachmentSummaryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/AttachmentSummaryImpl.java @@ -1,6 +1,7 @@ package pro.taskana.task.internal.models; import java.time.Instant; +import java.time.temporal.ChronoUnit; import java.util.Objects; import pro.taskana.classification.api.models.ClassificationSummary; @@ -51,20 +52,20 @@ public class AttachmentSummaryImpl implements AttachmentSummary { @Override public Instant getCreated() { - return created; + return created != null ? created.truncatedTo(ChronoUnit.MILLIS) : null; } public void setCreated(Instant created) { - this.created = created; + this.created = created != null ? created.truncatedTo(ChronoUnit.MILLIS) : null; } @Override public Instant getModified() { - return modified; + return modified != null ? modified.truncatedTo(ChronoUnit.MILLIS) : null; } public void setModified(Instant modified) { - this.modified = modified; + this.modified = modified != null ? modified.truncatedTo(ChronoUnit.MILLIS) : null; } @Override @@ -96,11 +97,11 @@ public class AttachmentSummaryImpl implements AttachmentSummary { @Override public Instant getReceived() { - return received; + return received != null ? received.truncatedTo(ChronoUnit.MILLIS) : null; } public void setReceived(Instant received) { - this.received = received; + this.received = received != null ? received.truncatedTo(ChronoUnit.MILLIS) : null; } @Override diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/MinimalTaskSummary.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/MinimalTaskSummary.java index 9c75097b4..f7ae92f84 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/MinimalTaskSummary.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/MinimalTaskSummary.java @@ -1,6 +1,7 @@ package pro.taskana.task.internal.models; import java.time.Instant; +import java.time.temporal.ChronoUnit; import java.util.Objects; import pro.taskana.task.api.CallbackState; @@ -23,27 +24,27 @@ public class MinimalTaskSummary { MinimalTaskSummary() {} public Instant getPlanned() { - return planned; + return planned != null ? planned.truncatedTo(ChronoUnit.MILLIS) : null; } public void setPlanned(Instant planned) { - this.planned = planned; + this.planned = planned != null ? planned.truncatedTo(ChronoUnit.MILLIS) : null; } public Instant getDue() { - return due; + return due != null ? due.truncatedTo(ChronoUnit.MILLIS) : null; } public void setDue(Instant due) { - this.due = due; + this.due = due != null ? due.truncatedTo(ChronoUnit.MILLIS) : null; } public Instant getModified() { - return modified; + return modified != null ? modified.truncatedTo(ChronoUnit.MILLIS) : null; } public void setModified(Instant modified) { - this.modified = modified; + this.modified = modified != null ? modified.truncatedTo(ChronoUnit.MILLIS) : null; } public String getTaskId() { diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskCommentImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskCommentImpl.java index 6623cbcac..69fcc1f08 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskCommentImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskCommentImpl.java @@ -1,6 +1,7 @@ package pro.taskana.task.internal.models; import java.time.Instant; +import java.time.temporal.ChronoUnit; import java.util.Objects; import pro.taskana.task.api.models.TaskComment; @@ -61,20 +62,20 @@ public class TaskCommentImpl implements TaskComment { @Override public Instant getCreated() { - return created; + return created != null ? created.truncatedTo(ChronoUnit.MILLIS) : null; } public void setCreated(Instant created) { - this.created = created; + this.created = created != null ? created.truncatedTo(ChronoUnit.MILLIS) : null; } @Override public Instant getModified() { - return modified; + return modified != null ? modified.truncatedTo(ChronoUnit.MILLIS) : null; } public void setModified(Instant modified) { - this.modified = modified; + this.modified = modified != null ? modified.truncatedTo(ChronoUnit.MILLIS) : null; } @Override diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskSummaryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskSummaryImpl.java index bf27d50ab..0700c752c 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskSummaryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskSummaryImpl.java @@ -1,6 +1,7 @@ package pro.taskana.task.internal.models; import java.time.Instant; +import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -131,56 +132,56 @@ public class TaskSummaryImpl implements TaskSummary { @Override public Instant getCreated() { - return created; + return created != null ? created.truncatedTo(ChronoUnit.MILLIS) : null; } public void setCreated(Instant created) { - this.created = created; + this.created = created != null ? created.truncatedTo(ChronoUnit.MILLIS) : null; } @Override public Instant getClaimed() { - return claimed; + return claimed != null ? claimed.truncatedTo(ChronoUnit.MILLIS) : null; } public void setClaimed(Instant claimed) { - this.claimed = claimed; + this.claimed = claimed != null ? claimed.truncatedTo(ChronoUnit.MILLIS) : null; } @Override public Instant getCompleted() { - return completed; + return completed != null ? completed.truncatedTo(ChronoUnit.MILLIS) : null; } public void setCompleted(Instant completed) { - this.completed = completed; + this.completed = completed != null ? completed.truncatedTo(ChronoUnit.MILLIS) : null; } @Override public Instant getModified() { - return modified; + return modified != null ? modified.truncatedTo(ChronoUnit.MILLIS) : null; } public void setModified(Instant modified) { - this.modified = modified; + this.modified = modified != null ? modified.truncatedTo(ChronoUnit.MILLIS) : null; } @Override public Instant getPlanned() { - return planned; + return planned != null ? planned.truncatedTo(ChronoUnit.MILLIS) : null; } public void setPlanned(Instant planned) { - this.planned = planned; + this.planned = planned != null ? planned.truncatedTo(ChronoUnit.MILLIS) : null; } @Override public Instant getDue() { - return due; + return due != null ? due.truncatedTo(ChronoUnit.MILLIS) : null; } public void setDue(Instant due) { - this.due = due; + this.due = due != null ? due.truncatedTo(ChronoUnit.MILLIS) : null; } @Override diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/models/WorkbasketImpl.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/models/WorkbasketImpl.java index a7ad5c995..5d68ba44c 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/models/WorkbasketImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/models/WorkbasketImpl.java @@ -1,6 +1,7 @@ package pro.taskana.workbasket.internal.models; import java.time.Instant; +import java.time.temporal.ChronoUnit; import java.util.Objects; import pro.taskana.common.api.exceptions.SystemException; @@ -50,20 +51,20 @@ public class WorkbasketImpl extends WorkbasketSummaryImpl implements Workbasket @Override public Instant getCreated() { - return created; + return created != null ? created.truncatedTo(ChronoUnit.MILLIS) : null; } public void setCreated(Instant created) { - this.created = created; + this.created = created != null ? created.truncatedTo(ChronoUnit.MILLIS) : null; } @Override public Instant getModified() { - return modified; + return modified != null ? modified.truncatedTo(ChronoUnit.MILLIS) : null; } public void setModified(Instant modified) { - this.modified = modified; + this.modified = modified != null ? modified.truncatedTo(ChronoUnit.MILLIS) : null; } @Override