From d5dacac45f05b233df39007272bc58e121dd42e0 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Mon, 25 Oct 2021 11:38:06 +0200 Subject: [PATCH] Renamed package to be aligned with all the rest of IS components --- .../informationsystem/base/reference/AccessType.java | 8 ++++---- .../{context => contexts}/impl/entities/ContextImpl.java | 8 ++++---- .../impl/relations/IsParentOfImpl.java | 6 +++--- .../{context => contexts}/reference/entities/Context.java | 6 +++--- .../reference/relations/IsParentOf.java | 6 +++--- .../types/impl/entities/EntityTypeImpl.java | 2 +- .../types/impl/relations/RelationTypeImpl.java | 2 +- .../model/impl/entities/ISContextTest.java | 4 ++-- .../gcube/informationsystem/types/SerializationTest.java | 4 ++-- 9 files changed, 23 insertions(+), 23 deletions(-) rename src/main/java/org/gcube/informationsystem/{context => contexts}/impl/entities/ContextImpl.java (91%) rename src/main/java/org/gcube/informationsystem/{context => contexts}/impl/relations/IsParentOfImpl.java (72%) rename src/main/java/org/gcube/informationsystem/{context => contexts}/reference/entities/Context.java (90%) rename src/main/java/org/gcube/informationsystem/{context => contexts}/reference/relations/IsParentOf.java (87%) diff --git a/src/main/java/org/gcube/informationsystem/base/reference/AccessType.java b/src/main/java/org/gcube/informationsystem/base/reference/AccessType.java index 8b44e54..351bb85 100644 --- a/src/main/java/org/gcube/informationsystem/base/reference/AccessType.java +++ b/src/main/java/org/gcube/informationsystem/base/reference/AccessType.java @@ -13,10 +13,10 @@ import org.gcube.informationsystem.base.impl.relations.RelationElementImpl; import org.gcube.informationsystem.base.reference.entities.EntityElement; import org.gcube.informationsystem.base.reference.properties.PropertyElement; import org.gcube.informationsystem.base.reference.relations.RelationElement; -import org.gcube.informationsystem.context.impl.entities.ContextImpl; -import org.gcube.informationsystem.context.impl.relations.IsParentOfImpl; -import org.gcube.informationsystem.context.reference.entities.Context; -import org.gcube.informationsystem.context.reference.relations.IsParentOf; +import org.gcube.informationsystem.contexts.impl.entities.ContextImpl; +import org.gcube.informationsystem.contexts.impl.relations.IsParentOfImpl; +import org.gcube.informationsystem.contexts.reference.entities.Context; +import org.gcube.informationsystem.contexts.reference.relations.IsParentOf; import org.gcube.informationsystem.model.impl.entities.DummyFacet; import org.gcube.informationsystem.model.impl.entities.DummyResource; import org.gcube.informationsystem.model.impl.entities.EntityImpl; diff --git a/src/main/java/org/gcube/informationsystem/context/impl/entities/ContextImpl.java b/src/main/java/org/gcube/informationsystem/contexts/impl/entities/ContextImpl.java similarity index 91% rename from src/main/java/org/gcube/informationsystem/context/impl/entities/ContextImpl.java rename to src/main/java/org/gcube/informationsystem/contexts/impl/entities/ContextImpl.java index 1921dcd..f7fa0d0 100644 --- a/src/main/java/org/gcube/informationsystem/context/impl/entities/ContextImpl.java +++ b/src/main/java/org/gcube/informationsystem/contexts/impl/entities/ContextImpl.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.informationsystem.context.impl.entities; +package org.gcube.informationsystem.contexts.impl.entities; import java.util.ArrayList; import java.util.List; @@ -11,9 +11,9 @@ import org.gcube.com.fasterxml.jackson.annotation.JsonSetter; import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.com.fasterxml.jackson.core.JsonProcessingException; import org.gcube.informationsystem.base.impl.entities.EntityElementImpl; -import org.gcube.informationsystem.context.impl.relations.IsParentOfImpl; -import org.gcube.informationsystem.context.reference.entities.Context; -import org.gcube.informationsystem.context.reference.relations.IsParentOf; +import org.gcube.informationsystem.contexts.impl.relations.IsParentOfImpl; +import org.gcube.informationsystem.contexts.reference.entities.Context; +import org.gcube.informationsystem.contexts.reference.relations.IsParentOf; import org.gcube.informationsystem.model.impl.properties.HeaderImpl; import org.gcube.informationsystem.utils.UUIDManager; diff --git a/src/main/java/org/gcube/informationsystem/context/impl/relations/IsParentOfImpl.java b/src/main/java/org/gcube/informationsystem/contexts/impl/relations/IsParentOfImpl.java similarity index 72% rename from src/main/java/org/gcube/informationsystem/context/impl/relations/IsParentOfImpl.java rename to src/main/java/org/gcube/informationsystem/contexts/impl/relations/IsParentOfImpl.java index 1856d12..ce2c1f5 100644 --- a/src/main/java/org/gcube/informationsystem/context/impl/relations/IsParentOfImpl.java +++ b/src/main/java/org/gcube/informationsystem/contexts/impl/relations/IsParentOfImpl.java @@ -1,12 +1,12 @@ /** * */ -package org.gcube.informationsystem.context.impl.relations; +package org.gcube.informationsystem.contexts.impl.relations; import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.base.impl.relations.RelationElementImpl; -import org.gcube.informationsystem.context.reference.entities.Context; -import org.gcube.informationsystem.context.reference.relations.IsParentOf; +import org.gcube.informationsystem.contexts.reference.entities.Context; +import org.gcube.informationsystem.contexts.reference.relations.IsParentOf; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/context/reference/entities/Context.java b/src/main/java/org/gcube/informationsystem/contexts/reference/entities/Context.java similarity index 90% rename from src/main/java/org/gcube/informationsystem/context/reference/entities/Context.java rename to src/main/java/org/gcube/informationsystem/contexts/reference/entities/Context.java index d2dc8e6..8d45b89 100644 --- a/src/main/java/org/gcube/informationsystem/context/reference/entities/Context.java +++ b/src/main/java/org/gcube/informationsystem/contexts/reference/entities/Context.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.informationsystem.context.reference.entities; +package org.gcube.informationsystem.contexts.reference.entities; import java.util.List; import java.util.UUID; @@ -11,8 +11,8 @@ import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore; import org.gcube.com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.base.reference.entities.EntityElement; -import org.gcube.informationsystem.context.impl.entities.ContextImpl; -import org.gcube.informationsystem.context.reference.relations.IsParentOf; +import org.gcube.informationsystem.contexts.impl.entities.ContextImpl; +import org.gcube.informationsystem.contexts.reference.relations.IsParentOf; import org.gcube.informationsystem.model.reference.relations.Relation; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.informationsystem.types.reference.Change; diff --git a/src/main/java/org/gcube/informationsystem/context/reference/relations/IsParentOf.java b/src/main/java/org/gcube/informationsystem/contexts/reference/relations/IsParentOf.java similarity index 87% rename from src/main/java/org/gcube/informationsystem/context/reference/relations/IsParentOf.java rename to src/main/java/org/gcube/informationsystem/contexts/reference/relations/IsParentOf.java index c861e97..b66dcf4 100644 --- a/src/main/java/org/gcube/informationsystem/context/reference/relations/IsParentOf.java +++ b/src/main/java/org/gcube/informationsystem/contexts/reference/relations/IsParentOf.java @@ -1,15 +1,15 @@ /** * */ -package org.gcube.informationsystem.context.reference.relations; +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.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.base.reference.relations.RelationElement; -import org.gcube.informationsystem.context.impl.relations.IsParentOfImpl; -import org.gcube.informationsystem.context.reference.entities.Context; +import org.gcube.informationsystem.contexts.impl.relations.IsParentOfImpl; +import org.gcube.informationsystem.contexts.reference.entities.Context; import org.gcube.informationsystem.types.reference.Change; import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.Version; diff --git a/src/main/java/org/gcube/informationsystem/types/impl/entities/EntityTypeImpl.java b/src/main/java/org/gcube/informationsystem/types/impl/entities/EntityTypeImpl.java index cb890fb..8adf956 100644 --- a/src/main/java/org/gcube/informationsystem/types/impl/entities/EntityTypeImpl.java +++ b/src/main/java/org/gcube/informationsystem/types/impl/entities/EntityTypeImpl.java @@ -8,7 +8,7 @@ import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore; import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.base.reference.AccessType; import org.gcube.informationsystem.base.reference.entities.EntityElement; -import org.gcube.informationsystem.context.reference.entities.Context; +import org.gcube.informationsystem.contexts.reference.entities.Context; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.properties.Header; diff --git a/src/main/java/org/gcube/informationsystem/types/impl/relations/RelationTypeImpl.java b/src/main/java/org/gcube/informationsystem/types/impl/relations/RelationTypeImpl.java index 0834365..3746135 100644 --- a/src/main/java/org/gcube/informationsystem/types/impl/relations/RelationTypeImpl.java +++ b/src/main/java/org/gcube/informationsystem/types/impl/relations/RelationTypeImpl.java @@ -8,7 +8,7 @@ import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.base.reference.AccessType; import org.gcube.informationsystem.base.reference.entities.EntityElement; import org.gcube.informationsystem.base.reference.relations.RelationElement; -import org.gcube.informationsystem.context.reference.relations.IsParentOf; +import org.gcube.informationsystem.contexts.reference.relations.IsParentOf; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.relations.ConsistsOf; diff --git a/src/test/java/org/gcube/informationsystem/model/impl/entities/ISContextTest.java b/src/test/java/org/gcube/informationsystem/model/impl/entities/ISContextTest.java index 48166d1..264addc 100644 --- a/src/test/java/org/gcube/informationsystem/model/impl/entities/ISContextTest.java +++ b/src/test/java/org/gcube/informationsystem/model/impl/entities/ISContextTest.java @@ -1,7 +1,7 @@ package org.gcube.informationsystem.model.impl.entities; -import org.gcube.informationsystem.context.impl.entities.ContextImpl; -import org.gcube.informationsystem.context.reference.entities.Context; +import org.gcube.informationsystem.contexts.impl.entities.ContextImpl; +import org.gcube.informationsystem.contexts.reference.entities.Context; import org.gcube.informationsystem.utils.ElementMapper; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/org/gcube/informationsystem/types/SerializationTest.java b/src/test/java/org/gcube/informationsystem/types/SerializationTest.java index 4b16f99..c8f7c0a 100644 --- a/src/test/java/org/gcube/informationsystem/types/SerializationTest.java +++ b/src/test/java/org/gcube/informationsystem/types/SerializationTest.java @@ -3,8 +3,8 @@ package org.gcube.informationsystem.types; import org.gcube.informationsystem.base.reference.AccessType; import org.gcube.informationsystem.base.reference.entities.EntityElement; import org.gcube.informationsystem.base.reference.properties.PropertyElement; -import org.gcube.informationsystem.context.reference.entities.Context; -import org.gcube.informationsystem.context.reference.relations.IsParentOf; +import org.gcube.informationsystem.contexts.reference.entities.Context; +import org.gcube.informationsystem.contexts.reference.relations.IsParentOf; import org.gcube.informationsystem.model.reference.entities.Entity; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.model.reference.entities.Resource;