From 8ddd4bd3dbaf85574835002f5aa65f845173d245 Mon Sep 17 00:00:00 2001 From: "luca.frosini" Date: Thu, 22 Dec 2016 16:33:10 +0000 Subject: [PATCH] Reorganizing PACKAGES git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry@141387 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../resourceregistry/{utils => context}/ContextUtility.java | 5 ++--- .../ermanagement/entity/EntityManagement.java | 2 +- .../ermanagement/relation/RelationManagement.java | 2 +- .../informationsystem/resourceregistry/query/QueryImpl.java | 2 +- .../informationsystem/resourceregistry/rest/ERManager.java | 2 +- .../resourceregistry/schema/SchemaManagement.java | 1 - 6 files changed, 6 insertions(+), 8 deletions(-) rename src/main/java/org/gcube/informationsystem/resourceregistry/{utils => context}/ContextUtility.java (97%) diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/ContextUtility.java b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextUtility.java similarity index 97% rename from src/main/java/org/gcube/informationsystem/resourceregistry/utils/ContextUtility.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextUtility.java index d383d40..5eaa865 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/ContextUtility.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextUtility.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.informationsystem.resourceregistry.utils; +package org.gcube.informationsystem.resourceregistry.context; import java.util.Iterator; import java.util.UUID; @@ -15,9 +15,8 @@ import org.gcube.informationsystem.model.entity.Context; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException; -import org.gcube.informationsystem.resourceregistry.context.SecurityContext; -import org.gcube.informationsystem.resourceregistry.context.SecurityContextMapper; import org.gcube.informationsystem.resourceregistry.context.SecurityContextMapper.PermissionMode; +import org.gcube.informationsystem.resourceregistry.utils.Utility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/ermanagement/entity/EntityManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/ermanagement/entity/EntityManagement.java index 71469ce..1051e28 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/ermanagement/entity/EntityManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/ermanagement/entity/EntityManagement.java @@ -20,12 +20,12 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.Entity import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet.FacetNotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceNotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaNotFoundException; +import org.gcube.informationsystem.resourceregistry.context.ContextUtility; import org.gcube.informationsystem.resourceregistry.context.SecurityContextMapper; import org.gcube.informationsystem.resourceregistry.context.SecurityContextMapper.PermissionMode; import org.gcube.informationsystem.resourceregistry.ermanagement.ERManagement; import org.gcube.informationsystem.resourceregistry.ermanagement.relation.RelationManagement; import org.gcube.informationsystem.resourceregistry.schema.SchemaManagementImpl; -import org.gcube.informationsystem.resourceregistry.utils.ContextUtility; import org.gcube.informationsystem.resourceregistry.utils.HeaderUtility; import org.gcube.informationsystem.resourceregistry.utils.Utility; import org.slf4j.Logger; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/ermanagement/relation/RelationManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/ermanagement/relation/RelationManagement.java index 1b7c77e..210536c 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/ermanagement/relation/RelationManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/ermanagement/relation/RelationManagement.java @@ -25,6 +25,7 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.RelationNotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaNotFoundException; +import org.gcube.informationsystem.resourceregistry.context.ContextUtility; import org.gcube.informationsystem.resourceregistry.context.SecurityContextMapper; import org.gcube.informationsystem.resourceregistry.context.SecurityContextMapper.PermissionMode; import org.gcube.informationsystem.resourceregistry.ermanagement.ERManagement; @@ -32,7 +33,6 @@ import org.gcube.informationsystem.resourceregistry.ermanagement.entity.EntityMa import org.gcube.informationsystem.resourceregistry.ermanagement.entity.FacetManagement; import org.gcube.informationsystem.resourceregistry.ermanagement.entity.ResourceManagement; import org.gcube.informationsystem.resourceregistry.schema.SchemaManagementImpl; -import org.gcube.informationsystem.resourceregistry.utils.ContextUtility; import org.gcube.informationsystem.resourceregistry.utils.HeaderUtility; import org.gcube.informationsystem.resourceregistry.utils.Utility; import org.slf4j.Logger; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/query/QueryImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/query/QueryImpl.java index 0a4acdd..f44afe6 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/query/QueryImpl.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/query/QueryImpl.java @@ -8,8 +8,8 @@ import java.io.Writer; import java.util.List; import org.gcube.informationsystem.resourceregistry.api.exceptions.InvalidQueryException; +import org.gcube.informationsystem.resourceregistry.context.ContextUtility; import org.gcube.informationsystem.resourceregistry.context.SecurityContextMapper.PermissionMode; -import org.gcube.informationsystem.resourceregistry.utils.ContextUtility; import org.gcube.informationsystem.resourceregistry.utils.Utility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/ERManager.java b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/ERManager.java index 719d17a..45b825c 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/ERManager.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/ERManager.java @@ -21,11 +21,11 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.Entity import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet.FacetNotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceNotFoundException; import org.gcube.informationsystem.resourceregistry.api.rest.EntityPath; +import org.gcube.informationsystem.resourceregistry.context.ContextUtility; import org.gcube.informationsystem.resourceregistry.ermanagement.entity.FacetManagement; import org.gcube.informationsystem.resourceregistry.ermanagement.entity.ResourceManagement; import org.gcube.informationsystem.resourceregistry.ermanagement.relation.ConsistsOfManagement; import org.gcube.informationsystem.resourceregistry.ermanagement.relation.IsRelatedToManagement; -import org.gcube.informationsystem.resourceregistry.utils.ContextUtility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/schema/SchemaManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/schema/SchemaManagement.java index b66e374..fe4bb80 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/schema/SchemaManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/schema/SchemaManagement.java @@ -4,7 +4,6 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.Schema import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaNotFoundException; /** - * Service Endpoint Interface * @author Luca Frosini (ISTI - CNR) * * For JSON schema see