From 9858c50c99b6c150f5f356b00d838bfbebbedc65 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Tue, 4 Feb 2020 09:44:10 +0100 Subject: [PATCH] Fixing Model --- .../gcube/informationsystem/base/reference/Element.java | 5 +++++ .../informationsystem/base/reference/ISConstants.java | 7 ------- .../model/reference/properties/Header.java | 6 +++--- 3 files changed, 8 insertions(+), 10 deletions(-) delete mode 100644 src/main/java/org/gcube/informationsystem/base/reference/ISConstants.java diff --git a/src/main/java/org/gcube/informationsystem/base/reference/Element.java b/src/main/java/org/gcube/informationsystem/base/reference/Element.java index 59adfed..ed2e06a 100644 --- a/src/main/java/org/gcube/informationsystem/base/reference/Element.java +++ b/src/main/java/org/gcube/informationsystem/base/reference/Element.java @@ -22,4 +22,9 @@ public interface Element extends Serializable { public static final String SUPERCLASSES_PROPERTY = "@superClasses"; + /** + * DateTime Pattern to be used to serialize Dates in every element + */ + public static final String DATETIME_PATTERN = "yyyy-MM-dd HH:mm:ss.SSS Z"; + } diff --git a/src/main/java/org/gcube/informationsystem/base/reference/ISConstants.java b/src/main/java/org/gcube/informationsystem/base/reference/ISConstants.java deleted file mode 100644 index 492aab4..0000000 --- a/src/main/java/org/gcube/informationsystem/base/reference/ISConstants.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.gcube.informationsystem.base.reference; - -public interface ISConstants { - - String DATETIME_PATTERN = "yyyy-MM-dd HH:mm:ss.SSS Z"; - -} diff --git a/src/main/java/org/gcube/informationsystem/model/reference/properties/Header.java b/src/main/java/org/gcube/informationsystem/model/reference/properties/Header.java index a0f6adc..74786c7 100644 --- a/src/main/java/org/gcube/informationsystem/model/reference/properties/Header.java +++ b/src/main/java/org/gcube/informationsystem/model/reference/properties/Header.java @@ -6,7 +6,7 @@ package org.gcube.informationsystem.model.reference.properties; import java.util.Date; import java.util.UUID; -import org.gcube.informationsystem.base.reference.ISConstants; +import org.gcube.informationsystem.base.reference.Element; import org.gcube.informationsystem.model.impl.properties.HeaderImpl; import org.gcube.informationsystem.types.annotations.ISProperty; @@ -41,14 +41,14 @@ public interface Header extends Property { @ISProperty(name = CREATOR_PROPERTY, readonly = true, mandatory = true, nullable = false) public String getCreator(); - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = ISConstants.DATETIME_PATTERN) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = Element.DATETIME_PATTERN) @ISProperty(name = CREATION_TIME_PROPERTY, readonly = true, mandatory = true, nullable = false) public Date getCreationTime(); @ISProperty(name = MODIFIED_BY_PROPERTY, mandatory = true, nullable = false) public String getModifiedBy(); - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = ISConstants.DATETIME_PATTERN) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = Element.DATETIME_PATTERN) @ISProperty(name = LAST_UPDATE_TIME_PROPERTY, mandatory = true, nullable = false) public Date getLastUpdateTime();