From 2b1f3fa9a36418c745002d1c4dd4608e55856e53 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 4 May 2023 18:12:19 +0200 Subject: [PATCH] Added properties order --- .../contexts/reference/entities/Context.java | 4 ++++ .../contexts/reference/relations/IsParentOf.java | 4 ++++ .../org/gcube/informationsystem/types/reference/Type.java | 3 +++ 3 files changed, 11 insertions(+) diff --git a/src/main/java/org/gcube/informationsystem/contexts/reference/entities/Context.java b/src/main/java/org/gcube/informationsystem/contexts/reference/entities/Context.java index 8b24067..49cbd60 100644 --- a/src/main/java/org/gcube/informationsystem/contexts/reference/entities/Context.java +++ b/src/main/java/org/gcube/informationsystem/contexts/reference/entities/Context.java @@ -9,7 +9,10 @@ import java.util.UUID; import org.gcube.com.fasterxml.jackson.annotation.JsonGetter; import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore; import org.gcube.com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import org.gcube.com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import org.gcube.informationsystem.base.reference.Element; +import org.gcube.informationsystem.base.reference.IdentifiableElement; import org.gcube.informationsystem.base.reference.entities.EntityElement; import org.gcube.informationsystem.contexts.impl.entities.ContextImpl; import org.gcube.informationsystem.contexts.reference.relations.IsParentOf; @@ -25,6 +28,7 @@ import org.gcube.informationsystem.utils.Version; * @author Luca Frosini (ISTI - CNR) */ @JsonDeserialize(as = ContextImpl.class) +@JsonPropertyOrder({ IdentifiableElement.ID_PROPERTY, Element.TYPE_PROPERTY, IdentifiableElement.METADATA_PROPERTY}) @TypeMetadata(name = Context.NAME, description = "This type is the used to define a Context", version = Version.MINIMAL_VERSION_STRING) @Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface Context extends EntityElement { diff --git a/src/main/java/org/gcube/informationsystem/contexts/reference/relations/IsParentOf.java b/src/main/java/org/gcube/informationsystem/contexts/reference/relations/IsParentOf.java index a363617..1d7be1a 100644 --- a/src/main/java/org/gcube/informationsystem/contexts/reference/relations/IsParentOf.java +++ b/src/main/java/org/gcube/informationsystem/contexts/reference/relations/IsParentOf.java @@ -6,7 +6,10 @@ package org.gcube.informationsystem.contexts.reference.relations; import org.gcube.com.fasterxml.jackson.annotation.JsonGetter; import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore; import org.gcube.com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import org.gcube.com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import org.gcube.informationsystem.base.reference.Element; +import org.gcube.informationsystem.base.reference.IdentifiableElement; import org.gcube.informationsystem.base.reference.relations.RelationElement; import org.gcube.informationsystem.contexts.impl.relations.IsParentOfImpl; import org.gcube.informationsystem.contexts.reference.entities.Context; @@ -20,6 +23,7 @@ import org.gcube.informationsystem.utils.Version; * @author Luca Frosini (ISTI - CNR) */ @JsonDeserialize(as = IsParentOfImpl.class) +@JsonPropertyOrder({ IdentifiableElement.ID_PROPERTY, Element.TYPE_PROPERTY, IdentifiableElement.METADATA_PROPERTY}) @TypeMetadata(name = IsParentOf.NAME, description = "This type is the used to define parental relations between Context", version = Version.MINIMAL_VERSION_STRING) @Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface IsParentOf extends RelationElement { diff --git a/src/main/java/org/gcube/informationsystem/types/reference/Type.java b/src/main/java/org/gcube/informationsystem/types/reference/Type.java index 86db90a..61128c3 100644 --- a/src/main/java/org/gcube/informationsystem/types/reference/Type.java +++ b/src/main/java/org/gcube/informationsystem/types/reference/Type.java @@ -7,8 +7,10 @@ import java.util.UUID; import org.gcube.com.fasterxml.jackson.annotation.JsonGetter; import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore; import org.gcube.com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import org.gcube.com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.gcube.com.fasterxml.jackson.annotation.JsonSetter; import org.gcube.informationsystem.base.reference.AccessType; +import org.gcube.informationsystem.base.reference.Element; import org.gcube.informationsystem.base.reference.IdentifiableElement; import org.gcube.informationsystem.model.reference.properties.Metadata; import org.gcube.informationsystem.types.annotations.Abstract; @@ -20,6 +22,7 @@ import org.gcube.informationsystem.utils.Version; */ @Abstract @JsonIgnoreProperties(ignoreUnknown=true) +@JsonPropertyOrder({ IdentifiableElement.ID_PROPERTY, Element.TYPE_PROPERTY, Element.SUPERTYPES_PROPERTY, IdentifiableElement.METADATA_PROPERTY }) @TypeMetadata(name = Type.NAME, description = "This is the base type to define any Type", version = Version.MINIMAL_VERSION_STRING) @Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) //@JsonDeserialize(as=TypeImpl.class) Do not uncomment to manage subclasses