From 4e97771a1688713b7852c66429e946f50f25a627 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Mon, 25 Oct 2021 10:58:30 +0200 Subject: [PATCH] Aligned package names --- .../informationsystem/base/reference/AccessType.java | 12 ++++++------ .../templates/impl/entities/QueryTemplateImpl.java | 8 ++++---- .../impl/properties/TemplatePropertyImpl.java | 4 ++-- .../impl/properties/TemplateVariableImpl.java | 6 +++--- .../templates/reference/entities/QueryTemplate.java | 8 ++++---- .../reference/properties/TemplateProperty.java | 4 ++-- .../reference/properties/TemplateVariable.java | 4 ++-- .../types/impl/entities/EntityTypeImpl.java | 2 +- .../types/impl/properties/PropertyTypeImpl.java | 4 ++-- .../informationsystem/types/SerializationTest.java | 4 ++-- 10 files changed, 28 insertions(+), 28 deletions(-) rename src/main/java/org/gcube/informationsystem/{query => queries}/templates/impl/entities/QueryTemplateImpl.java (80%) rename src/main/java/org/gcube/informationsystem/{query => queries}/templates/impl/properties/TemplatePropertyImpl.java (75%) rename src/main/java/org/gcube/informationsystem/{query => queries}/templates/impl/properties/TemplateVariableImpl.java (80%) rename src/main/java/org/gcube/informationsystem/{query => queries}/templates/reference/entities/QueryTemplate.java (89%) rename src/main/java/org/gcube/informationsystem/{query => queries}/templates/reference/properties/TemplateProperty.java (83%) rename src/main/java/org/gcube/informationsystem/{query => queries}/templates/reference/properties/TemplateVariable.java (92%) 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 c8d8bc2..8b44e54 100644 --- a/src/main/java/org/gcube/informationsystem/base/reference/AccessType.java +++ b/src/main/java/org/gcube/informationsystem/base/reference/AccessType.java @@ -34,12 +34,12 @@ import org.gcube.informationsystem.model.reference.properties.Property; import org.gcube.informationsystem.model.reference.relations.ConsistsOf; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.informationsystem.model.reference.relations.Relation; -import org.gcube.informationsystem.query.templates.impl.entities.QueryTemplateImpl; -import org.gcube.informationsystem.query.templates.impl.properties.TemplatePropertyImpl; -import org.gcube.informationsystem.query.templates.impl.properties.TemplateVariableImpl; -import org.gcube.informationsystem.query.templates.reference.entities.QueryTemplate; -import org.gcube.informationsystem.query.templates.reference.properties.TemplateProperty; -import org.gcube.informationsystem.query.templates.reference.properties.TemplateVariable; +import org.gcube.informationsystem.queries.templates.impl.entities.QueryTemplateImpl; +import org.gcube.informationsystem.queries.templates.impl.properties.TemplatePropertyImpl; +import org.gcube.informationsystem.queries.templates.impl.properties.TemplateVariableImpl; +import org.gcube.informationsystem.queries.templates.reference.entities.QueryTemplate; +import org.gcube.informationsystem.queries.templates.reference.properties.TemplateProperty; +import org.gcube.informationsystem.queries.templates.reference.properties.TemplateVariable; import org.gcube.informationsystem.types.impl.entities.EntityTypeImpl; import org.gcube.informationsystem.types.impl.properties.PropertyDefinitionImpl; import org.gcube.informationsystem.types.impl.properties.PropertyTypeImpl; diff --git a/src/main/java/org/gcube/informationsystem/query/templates/impl/entities/QueryTemplateImpl.java b/src/main/java/org/gcube/informationsystem/queries/templates/impl/entities/QueryTemplateImpl.java similarity index 80% rename from src/main/java/org/gcube/informationsystem/query/templates/impl/entities/QueryTemplateImpl.java rename to src/main/java/org/gcube/informationsystem/queries/templates/impl/entities/QueryTemplateImpl.java index 8afad25..0474b82 100644 --- a/src/main/java/org/gcube/informationsystem/query/templates/impl/entities/QueryTemplateImpl.java +++ b/src/main/java/org/gcube/informationsystem/queries/templates/impl/entities/QueryTemplateImpl.java @@ -1,12 +1,12 @@ -package org.gcube.informationsystem.query.templates.impl.entities; +package org.gcube.informationsystem.queries.templates.impl.entities; import java.util.HashMap; import java.util.Map; import org.gcube.informationsystem.base.impl.entities.EntityElementImpl; -import org.gcube.informationsystem.query.templates.reference.entities.QueryTemplate; -import org.gcube.informationsystem.query.templates.reference.properties.TemplateProperty; -import org.gcube.informationsystem.query.templates.reference.properties.TemplateVariable; +import org.gcube.informationsystem.queries.templates.reference.entities.QueryTemplate; +import org.gcube.informationsystem.queries.templates.reference.properties.TemplateProperty; +import org.gcube.informationsystem.queries.templates.reference.properties.TemplateVariable; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/query/templates/impl/properties/TemplatePropertyImpl.java b/src/main/java/org/gcube/informationsystem/queries/templates/impl/properties/TemplatePropertyImpl.java similarity index 75% rename from src/main/java/org/gcube/informationsystem/query/templates/impl/properties/TemplatePropertyImpl.java rename to src/main/java/org/gcube/informationsystem/queries/templates/impl/properties/TemplatePropertyImpl.java index 9348d9b..d01aa26 100644 --- a/src/main/java/org/gcube/informationsystem/query/templates/impl/properties/TemplatePropertyImpl.java +++ b/src/main/java/org/gcube/informationsystem/queries/templates/impl/properties/TemplatePropertyImpl.java @@ -1,11 +1,11 @@ /** * */ -package org.gcube.informationsystem.query.templates.impl.properties; +package org.gcube.informationsystem.queries.templates.impl.properties; import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.base.impl.properties.PropertyElementImpl; -import org.gcube.informationsystem.query.templates.reference.properties.TemplateProperty; +import org.gcube.informationsystem.queries.templates.reference.properties.TemplateProperty; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/query/templates/impl/properties/TemplateVariableImpl.java b/src/main/java/org/gcube/informationsystem/queries/templates/impl/properties/TemplateVariableImpl.java similarity index 80% rename from src/main/java/org/gcube/informationsystem/query/templates/impl/properties/TemplateVariableImpl.java rename to src/main/java/org/gcube/informationsystem/queries/templates/impl/properties/TemplateVariableImpl.java index 3ae9f29..a08125e 100644 --- a/src/main/java/org/gcube/informationsystem/query/templates/impl/properties/TemplateVariableImpl.java +++ b/src/main/java/org/gcube/informationsystem/queries/templates/impl/properties/TemplateVariableImpl.java @@ -1,12 +1,12 @@ /** * */ -package org.gcube.informationsystem.query.templates.impl.properties; +package org.gcube.informationsystem.queries.templates.impl.properties; import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.base.impl.properties.PropertyElementImpl; -import org.gcube.informationsystem.query.templates.reference.properties.TemplateProperty; -import org.gcube.informationsystem.query.templates.reference.properties.TemplateVariable; +import org.gcube.informationsystem.queries.templates.reference.properties.TemplateProperty; +import org.gcube.informationsystem.queries.templates.reference.properties.TemplateVariable; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/query/templates/reference/entities/QueryTemplate.java b/src/main/java/org/gcube/informationsystem/queries/templates/reference/entities/QueryTemplate.java similarity index 89% rename from src/main/java/org/gcube/informationsystem/query/templates/reference/entities/QueryTemplate.java rename to src/main/java/org/gcube/informationsystem/queries/templates/reference/entities/QueryTemplate.java index c3dd9bb..3914b0f 100644 --- a/src/main/java/org/gcube/informationsystem/query/templates/reference/entities/QueryTemplate.java +++ b/src/main/java/org/gcube/informationsystem/queries/templates/reference/entities/QueryTemplate.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.query.templates.reference.entities; +package org.gcube.informationsystem.queries.templates.reference.entities; import java.util.Map; @@ -7,9 +7,9 @@ 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.query.templates.impl.entities.QueryTemplateImpl; -import org.gcube.informationsystem.query.templates.reference.properties.TemplateProperty; -import org.gcube.informationsystem.query.templates.reference.properties.TemplateVariable; +import org.gcube.informationsystem.queries.templates.impl.entities.QueryTemplateImpl; +import org.gcube.informationsystem.queries.templates.reference.properties.TemplateProperty; +import org.gcube.informationsystem.queries.templates.reference.properties.TemplateVariable; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.informationsystem.types.reference.Change; import org.gcube.informationsystem.types.reference.TypeMetadata; diff --git a/src/main/java/org/gcube/informationsystem/query/templates/reference/properties/TemplateProperty.java b/src/main/java/org/gcube/informationsystem/queries/templates/reference/properties/TemplateProperty.java similarity index 83% rename from src/main/java/org/gcube/informationsystem/query/templates/reference/properties/TemplateProperty.java rename to src/main/java/org/gcube/informationsystem/queries/templates/reference/properties/TemplateProperty.java index b384f18..f6aad90 100644 --- a/src/main/java/org/gcube/informationsystem/query/templates/reference/properties/TemplateProperty.java +++ b/src/main/java/org/gcube/informationsystem/queries/templates/reference/properties/TemplateProperty.java @@ -1,8 +1,8 @@ -package org.gcube.informationsystem.query.templates.reference.properties; +package org.gcube.informationsystem.queries.templates.reference.properties; import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.base.reference.properties.PropertyElement; -import org.gcube.informationsystem.query.templates.impl.properties.TemplatePropertyImpl; +import org.gcube.informationsystem.queries.templates.impl.properties.TemplatePropertyImpl; 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/query/templates/reference/properties/TemplateVariable.java b/src/main/java/org/gcube/informationsystem/queries/templates/reference/properties/TemplateVariable.java similarity index 92% rename from src/main/java/org/gcube/informationsystem/query/templates/reference/properties/TemplateVariable.java rename to src/main/java/org/gcube/informationsystem/queries/templates/reference/properties/TemplateVariable.java index 65e1fff..e1ae18b 100644 --- a/src/main/java/org/gcube/informationsystem/query/templates/reference/properties/TemplateVariable.java +++ b/src/main/java/org/gcube/informationsystem/queries/templates/reference/properties/TemplateVariable.java @@ -1,8 +1,8 @@ -package org.gcube.informationsystem.query.templates.reference.properties; +package org.gcube.informationsystem.queries.templates.reference.properties; import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.base.reference.properties.PropertyElement; -import org.gcube.informationsystem.query.templates.impl.properties.TemplateVariableImpl; +import org.gcube.informationsystem.queries.templates.impl.properties.TemplateVariableImpl; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.informationsystem.types.reference.Change; import org.gcube.informationsystem.types.reference.TypeMetadata; 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 3d83b1c..cb890fb 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 @@ -12,7 +12,7 @@ import org.gcube.informationsystem.context.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; -import org.gcube.informationsystem.query.templates.reference.entities.QueryTemplate; +import org.gcube.informationsystem.queries.templates.reference.entities.QueryTemplate; import org.gcube.informationsystem.types.impl.TypeImpl; import org.gcube.informationsystem.types.reference.entities.EntityType; import org.gcube.informationsystem.types.reference.entities.FacetType; diff --git a/src/main/java/org/gcube/informationsystem/types/impl/properties/PropertyTypeImpl.java b/src/main/java/org/gcube/informationsystem/types/impl/properties/PropertyTypeImpl.java index 303eac8..9463cad 100644 --- a/src/main/java/org/gcube/informationsystem/types/impl/properties/PropertyTypeImpl.java +++ b/src/main/java/org/gcube/informationsystem/types/impl/properties/PropertyTypeImpl.java @@ -7,8 +7,8 @@ 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.properties.PropertyElement; -import org.gcube.informationsystem.query.templates.reference.properties.TemplateProperty; -import org.gcube.informationsystem.query.templates.reference.properties.TemplateVariable; +import org.gcube.informationsystem.queries.templates.reference.properties.TemplateProperty; +import org.gcube.informationsystem.queries.templates.reference.properties.TemplateVariable; import org.gcube.informationsystem.types.impl.TypeImpl; import org.gcube.informationsystem.types.reference.properties.LinkedEntity; import org.gcube.informationsystem.types.reference.properties.PropertyDefinition; diff --git a/src/test/java/org/gcube/informationsystem/types/SerializationTest.java b/src/test/java/org/gcube/informationsystem/types/SerializationTest.java index de6a2c1..4b16f99 100644 --- a/src/test/java/org/gcube/informationsystem/types/SerializationTest.java +++ b/src/test/java/org/gcube/informationsystem/types/SerializationTest.java @@ -15,8 +15,8 @@ import org.gcube.informationsystem.model.reference.properties.Property; import org.gcube.informationsystem.model.reference.relations.ConsistsOf; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.informationsystem.model.reference.relations.Relation; -import org.gcube.informationsystem.query.templates.reference.properties.TemplateProperty; -import org.gcube.informationsystem.query.templates.reference.properties.TemplateVariable; +import org.gcube.informationsystem.queries.templates.reference.properties.TemplateProperty; +import org.gcube.informationsystem.queries.templates.reference.properties.TemplateVariable; import org.gcube.informationsystem.types.reference.entities.EntityType; import org.gcube.informationsystem.types.reference.entities.FacetType; import org.gcube.informationsystem.types.reference.entities.ResourceType;