From eb99996c628c141c5a68ad2dfe1177ec2bd13ea3 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Mon, 27 Jan 2020 17:04:45 +0100 Subject: [PATCH] Reorganized Packages --- .../AdminSecurityContext.java | 2 +- .../ContextSecurityContext.java | 2 +- .../SchemaSecurityContext.java | 2 +- .../{security => contexts}/SecurityContext.java | 2 +- .../dbinitialization/DatabaseEnvironment.java | 10 +++++----- .../dbinitialization/SchemaActionImpl.java | 2 +- .../instances/base/ERManagement.java | 4 ++-- .../instances/base/ERManagementUtility.java | 6 +++--- .../base/entities/BaseEntityManagement.java | 2 +- .../base/relations/BaseRelationManagement.java | 2 +- .../instances/context/ContextUtility.java | 6 +++--- .../context/entities/ContextManagement.java | 2 +- .../context/relations/IsParentOfManagement.java | 2 +- .../model/entities/EntityManagement.java | 4 ++-- .../model/entities/FacetManagement.java | 2 +- .../model/entities/ResourceManagement.java | 4 ++-- .../model/relations/ConsistsOfManagement.java | 2 +- .../model/relations/IsRelatedToManagement.java | 2 +- .../model/relations/RelationManagement.java | 4 ++-- .../resourceregistry/query/QueryImpl.java | 4 ++-- .../resourceregistry/rest/Access.java | 4 ++-- .../resourceregistry/rest/SchemaManager.java | 4 ++-- .../type => types}/SchemaManagement.java | 2 +- .../type => types}/SchemaManagementImpl.java | 16 ++++++++-------- .../entities/EntityTypeDefinitionManagement.java | 4 ++-- .../entities/FacetTypeDefinitionManagement.java | 4 ++-- .../ResourceTypeDefinitionManagement.java | 4 ++-- .../PropertyTypeDefinitionManagement.java | 4 ++-- .../ConsistsOfTypeDefinitionManagement.java | 6 +++--- .../IsRelatedToTypeDefinitionManagement.java | 6 +++--- .../RelationTypeDefinitionManagement.java | 8 ++++---- .../resourceregistry/utils/Utility.java | 4 ++-- .../context/ContextManagementTest.java | 8 ++++---- .../DatabaseEnvironmentTest.java | 2 +- .../SchemaManagementImplTest.java | 6 +++--- 35 files changed, 74 insertions(+), 74 deletions(-) rename src/main/java/org/gcube/informationsystem/resourceregistry/{security => contexts}/AdminSecurityContext.java (96%) rename src/main/java/org/gcube/informationsystem/resourceregistry/{security => contexts}/ContextSecurityContext.java (95%) rename src/main/java/org/gcube/informationsystem/resourceregistry/{security => contexts}/SchemaSecurityContext.java (95%) rename src/main/java/org/gcube/informationsystem/resourceregistry/{security => contexts}/SecurityContext.java (99%) rename src/main/java/org/gcube/informationsystem/resourceregistry/{instances/type => types}/SchemaManagement.java (93%) rename src/main/java/org/gcube/informationsystem/resourceregistry/{instances/type => types}/SchemaManagementImpl.java (95%) rename src/main/java/org/gcube/informationsystem/resourceregistry/{instances/type => types}/entities/EntityTypeDefinitionManagement.java (98%) rename src/main/java/org/gcube/informationsystem/resourceregistry/{instances/type => types}/entities/FacetTypeDefinitionManagement.java (82%) rename src/main/java/org/gcube/informationsystem/resourceregistry/{instances/type => types}/entities/ResourceTypeDefinitionManagement.java (83%) rename src/main/java/org/gcube/informationsystem/resourceregistry/{instances/type => types}/properties/PropertyTypeDefinitionManagement.java (98%) rename src/main/java/org/gcube/informationsystem/resourceregistry/{instances/type => types}/relations/ConsistsOfTypeDefinitionManagement.java (81%) rename src/main/java/org/gcube/informationsystem/resourceregistry/{instances/type => types}/relations/IsRelatedToTypeDefinitionManagement.java (81%) rename src/main/java/org/gcube/informationsystem/resourceregistry/{instances/type => types}/relations/RelationTypeDefinitionManagement.java (95%) rename src/test/java/org/gcube/informationsystem/resourceregistry/{type => types}/SchemaManagementImplTest.java (97%) diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/security/AdminSecurityContext.java b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/AdminSecurityContext.java similarity index 96% rename from src/main/java/org/gcube/informationsystem/resourceregistry/security/AdminSecurityContext.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/contexts/AdminSecurityContext.java index bbb74c8..bd34fa0 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/security/AdminSecurityContext.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/AdminSecurityContext.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.resourceregistry.security; +package org.gcube.informationsystem.resourceregistry.contexts; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/security/ContextSecurityContext.java b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ContextSecurityContext.java similarity index 95% rename from src/main/java/org/gcube/informationsystem/resourceregistry/security/ContextSecurityContext.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ContextSecurityContext.java index a036a71..d45552d 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/security/ContextSecurityContext.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ContextSecurityContext.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.resourceregistry.security; +package org.gcube.informationsystem.resourceregistry.contexts; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/security/SchemaSecurityContext.java b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/SchemaSecurityContext.java similarity index 95% rename from src/main/java/org/gcube/informationsystem/resourceregistry/security/SchemaSecurityContext.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/contexts/SchemaSecurityContext.java index e9c0ef6..47645ea 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/security/SchemaSecurityContext.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/SchemaSecurityContext.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.resourceregistry.security; +package org.gcube.informationsystem.resourceregistry.contexts; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/security/SecurityContext.java b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/SecurityContext.java similarity index 99% rename from src/main/java/org/gcube/informationsystem/resourceregistry/security/SecurityContext.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/contexts/SecurityContext.java index da361ac..8a73d1f 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/security/SecurityContext.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/SecurityContext.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.informationsystem.resourceregistry.security; +package org.gcube.informationsystem.resourceregistry.contexts; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java b/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java index 08b95f1..4bd2054 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java @@ -21,13 +21,13 @@ import org.gcube.informationsystem.base.reference.properties.BaseProperty; import org.gcube.informationsystem.base.reference.relations.BaseRelation; import org.gcube.informationsystem.model.reference.properties.Header; import org.gcube.informationsystem.model.reference.properties.Property; +import org.gcube.informationsystem.resourceregistry.contexts.AdminSecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.ContextSecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.SchemaSecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.instances.base.ERManagement; import org.gcube.informationsystem.resourceregistry.instances.context.ContextUtility; -import org.gcube.informationsystem.resourceregistry.instances.type.properties.PropertyTypeDefinitionManagement; -import org.gcube.informationsystem.resourceregistry.security.AdminSecurityContext; -import org.gcube.informationsystem.resourceregistry.security.ContextSecurityContext; -import org.gcube.informationsystem.resourceregistry.security.SchemaSecurityContext; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext.PermissionMode; +import org.gcube.informationsystem.resourceregistry.types.properties.PropertyTypeDefinitionManagement; import org.gcube.informationsystem.types.TypeBinder; import org.gcube.informationsystem.types.reference.TypeDefinition; import org.gcube.informationsystem.types.reference.entities.EntityTypeDefinition; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/SchemaActionImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/SchemaActionImpl.java index bc05bb5..270722f 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/SchemaActionImpl.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/SchemaActionImpl.java @@ -9,7 +9,7 @@ import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.relations.ConsistsOf; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaAlreadyPresentException; -import org.gcube.informationsystem.resourceregistry.instances.type.SchemaManagementImpl; +import org.gcube.informationsystem.resourceregistry.types.SchemaManagementImpl; import org.gcube.informationsystem.types.TypeBinder; import org.gcube.informationsystem.utils.discovery.SchemaAction; import org.slf4j.Logger; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ERManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ERManagement.java index d930597..6967645 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ERManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ERManagement.java @@ -28,11 +28,11 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundExcep import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaException; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment; import org.gcube.informationsystem.resourceregistry.instances.base.properties.BasePropertyManagement; import org.gcube.informationsystem.resourceregistry.instances.context.ContextUtility; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.utils.HeaderOrient; import org.gcube.informationsystem.resourceregistry.utils.HeaderUtility; import org.gcube.informationsystem.resourceregistry.utils.Utility; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ERManagementUtility.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ERManagementUtility.java index 2b86fb0..cab4abf 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ERManagementUtility.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ERManagementUtility.java @@ -14,6 +14,9 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundExcep import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaNotFoundException; +import org.gcube.informationsystem.resourceregistry.contexts.AdminSecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.instances.context.ContextUtility; import org.gcube.informationsystem.resourceregistry.instances.model.entities.EntityManagement; import org.gcube.informationsystem.resourceregistry.instances.model.entities.FacetManagement; @@ -21,9 +24,6 @@ import org.gcube.informationsystem.resourceregistry.instances.model.entities.Res import org.gcube.informationsystem.resourceregistry.instances.model.relations.ConsistsOfManagement; import org.gcube.informationsystem.resourceregistry.instances.model.relations.IsRelatedToManagement; import org.gcube.informationsystem.resourceregistry.instances.model.relations.RelationManagement; -import org.gcube.informationsystem.resourceregistry.security.AdminSecurityContext; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext.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/instances/base/entities/BaseEntityManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/entities/BaseEntityManagement.java index 7d02f67..1a26cf5 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/entities/BaseEntityManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/entities/BaseEntityManagement.java @@ -9,10 +9,10 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAn import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.EntityAlreadyPresentException; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; import org.gcube.informationsystem.resourceregistry.instances.base.ERManagement; import org.gcube.informationsystem.resourceregistry.instances.base.ERManagementUtility; import org.gcube.informationsystem.resourceregistry.instances.base.relations.BaseRelationManagement; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; import org.gcube.informationsystem.resourceregistry.utils.Utility; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/BaseRelationManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/BaseRelationManagement.java index f6367b3..ca5af48 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/BaseRelationManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/BaseRelationManagement.java @@ -8,10 +8,10 @@ import org.gcube.informationsystem.model.reference.relations.Relation; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.RelationNotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaException; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; import org.gcube.informationsystem.resourceregistry.instances.base.ERManagement; import org.gcube.informationsystem.resourceregistry.instances.base.entities.BaseEntityManagement; import org.gcube.informationsystem.resourceregistry.instances.model.entities.FacetManagement; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; import org.gcube.informationsystem.resourceregistry.utils.Utility; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/context/ContextUtility.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/context/ContextUtility.java index 5435400..afb0137 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/context/ContextUtility.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/context/ContextUtility.java @@ -15,11 +15,11 @@ import org.gcube.informationsystem.context.reference.relations.IsParentOf; 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.contexts.AdminSecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment; import org.gcube.informationsystem.resourceregistry.instances.base.ERManagement; -import org.gcube.informationsystem.resourceregistry.security.AdminSecurityContext; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext.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/instances/context/entities/ContextManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/context/entities/ContextManagement.java index 13f8aad..e4414da 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/context/entities/ContextManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/context/entities/ContextManagement.java @@ -16,12 +16,12 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.context.Conte import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.EntityAvailableInAnotherContextException; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment; import org.gcube.informationsystem.resourceregistry.instances.base.ERManagement; import org.gcube.informationsystem.resourceregistry.instances.base.entities.BaseEntityManagement; import org.gcube.informationsystem.resourceregistry.instances.context.ContextUtility; import org.gcube.informationsystem.resourceregistry.instances.context.relations.IsParentOfManagement; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; 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/instances/context/relations/IsParentOfManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/context/relations/IsParentOfManagement.java index 6227de0..fb5f4b8 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/context/relations/IsParentOfManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/context/relations/IsParentOfManagement.java @@ -9,11 +9,11 @@ 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.isparentof.IsParentOfAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.isparentof.IsParentOfNotFoundException; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment; import org.gcube.informationsystem.resourceregistry.instances.base.relations.BaseRelationManagement; import org.gcube.informationsystem.resourceregistry.instances.context.ContextUtility; import org.gcube.informationsystem.resourceregistry.instances.context.entities.ContextManagement; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; import org.gcube.informationsystem.resourceregistry.utils.Utility; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java index bfab08c..38e1ce5 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java @@ -20,12 +20,12 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.EntityAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.query.InvalidQueryException; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.instances.base.ERManagement; import org.gcube.informationsystem.resourceregistry.instances.base.ERManagementUtility; import org.gcube.informationsystem.resourceregistry.instances.base.entities.BaseEntityManagement; import org.gcube.informationsystem.resourceregistry.instances.model.relations.RelationManagement; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.utils.Utility; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/FacetManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/FacetManagement.java index c40b3a1..781a0ba 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/FacetManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/FacetManagement.java @@ -7,8 +7,8 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet.FacetAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet.FacetAvailableInAnotherContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet.FacetNotFoundException; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; import org.gcube.informationsystem.resourceregistry.instances.base.ERManagement; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; import com.fasterxml.jackson.databind.JsonNode; import com.orientechnologies.orient.core.db.document.ODatabaseDocument; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/ResourceManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/ResourceManagement.java index 57f68db..7f6479b 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/ResourceManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/ResourceManagement.java @@ -11,11 +11,11 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceAvailableInAnotherContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceNotFoundException; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.instances.model.relations.ConsistsOfManagement; import org.gcube.informationsystem.resourceregistry.instances.model.relations.IsRelatedToManagement; import org.gcube.informationsystem.resourceregistry.instances.model.relations.RelationManagement; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.utils.Utility; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/ConsistsOfManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/ConsistsOfManagement.java index 77fad43..52c1c49 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/ConsistsOfManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/ConsistsOfManagement.java @@ -11,8 +11,8 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.consistsOf.ConsistsOfAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.consistsOf.ConsistsOfAvailableInAnotherContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.consistsOf.ConsistsOfNotFoundException; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; import org.gcube.informationsystem.resourceregistry.instances.model.entities.FacetManagement; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; import com.orientechnologies.orient.core.db.document.ODatabaseDocument; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/IsRelatedToManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/IsRelatedToManagement.java index baaa5fb..bd7ee26 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/IsRelatedToManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/IsRelatedToManagement.java @@ -11,8 +11,8 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.isrelatedto.IsRelatedToAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.isrelatedto.IsRelatedToAvailableInAnotherContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.isrelatedto.IsRelatedToNotFoundException; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; import org.gcube.informationsystem.resourceregistry.instances.model.entities.ResourceManagement; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; import com.orientechnologies.orient.core.db.document.ODatabaseDocument; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java index 6886c6c..d29cd78 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java @@ -17,6 +17,8 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundExcep import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.RelationNotFoundException; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.instances.base.ERManagement; import org.gcube.informationsystem.resourceregistry.instances.base.ERManagementUtility; import org.gcube.informationsystem.resourceregistry.instances.base.relations.BaseRelationManagement; @@ -24,8 +26,6 @@ import org.gcube.informationsystem.resourceregistry.instances.context.ContextUti import org.gcube.informationsystem.resourceregistry.instances.model.entities.EntityManagement; import org.gcube.informationsystem.resourceregistry.instances.model.entities.FacetManagement; import org.gcube.informationsystem.resourceregistry.instances.model.entities.ResourceManagement; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.utils.PropagationConstraintOrient; import org.gcube.informationsystem.resourceregistry.utils.Utility; import org.gcube.informationsystem.utils.ISMapper; 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 ddd50f6..a34dd94 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/query/QueryImpl.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/query/QueryImpl.java @@ -6,11 +6,11 @@ import java.util.Map; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.query.InvalidQueryException; import org.gcube.informationsystem.resourceregistry.api.rest.AccessPath; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.instances.base.ERManagement; import org.gcube.informationsystem.resourceregistry.instances.base.ERManagementUtility; import org.gcube.informationsystem.resourceregistry.instances.context.ContextUtility; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext.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/rest/Access.java b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/Access.java index d4a017b..b974a7e 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/Access.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/Access.java @@ -38,10 +38,10 @@ import org.gcube.informationsystem.resourceregistry.instances.base.ERManagementU import org.gcube.informationsystem.resourceregistry.instances.context.ContextUtility; import org.gcube.informationsystem.resourceregistry.instances.context.entities.ContextManagement; import org.gcube.informationsystem.resourceregistry.instances.model.entities.ResourceManagement; -import org.gcube.informationsystem.resourceregistry.instances.type.SchemaManagement; -import org.gcube.informationsystem.resourceregistry.instances.type.SchemaManagementImpl; import org.gcube.informationsystem.resourceregistry.query.Query; import org.gcube.informationsystem.resourceregistry.query.QueryImpl; +import org.gcube.informationsystem.resourceregistry.types.SchemaManagement; +import org.gcube.informationsystem.resourceregistry.types.SchemaManagementImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/SchemaManager.java b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/SchemaManager.java index 892c6cb..0728a79 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/SchemaManager.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/SchemaManager.java @@ -28,8 +28,8 @@ import org.gcube.informationsystem.resourceregistry.api.rest.AccessPath; import org.gcube.informationsystem.resourceregistry.api.rest.InstancePath; import org.gcube.informationsystem.resourceregistry.api.rest.TypePath; import org.gcube.informationsystem.resourceregistry.instances.base.ERManagementUtility; -import org.gcube.informationsystem.resourceregistry.instances.type.SchemaManagement; -import org.gcube.informationsystem.resourceregistry.instances.type.SchemaManagementImpl; +import org.gcube.informationsystem.resourceregistry.types.SchemaManagement; +import org.gcube.informationsystem.resourceregistry.types.SchemaManagementImpl; import org.gcube.informationsystem.types.TypeBinder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/SchemaManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/SchemaManagement.java similarity index 93% rename from src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/SchemaManagement.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/types/SchemaManagement.java index 14b73f2..b560c21 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/SchemaManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/SchemaManagement.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.resourceregistry.instances.type; +package org.gcube.informationsystem.resourceregistry.types; import org.gcube.informationsystem.base.reference.AccessType; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaAlreadyPresentException; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/SchemaManagementImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/SchemaManagementImpl.java similarity index 95% rename from src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/SchemaManagementImpl.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/types/SchemaManagementImpl.java index 6965a33..986f5df 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/SchemaManagementImpl.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/SchemaManagementImpl.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.informationsystem.resourceregistry.instances.type; +package org.gcube.informationsystem.resourceregistry.types; import java.util.ArrayList; import java.util.Collection; @@ -26,15 +26,15 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.Schema import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaCreationException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaNotFoundException; +import org.gcube.informationsystem.resourceregistry.contexts.AdminSecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.instances.base.ERManagement; import org.gcube.informationsystem.resourceregistry.instances.context.ContextUtility; -import org.gcube.informationsystem.resourceregistry.instances.type.entities.FacetTypeDefinitionManagement; -import org.gcube.informationsystem.resourceregistry.instances.type.entities.ResourceTypeDefinitionManagement; -import org.gcube.informationsystem.resourceregistry.instances.type.properties.PropertyTypeDefinitionManagement; -import org.gcube.informationsystem.resourceregistry.instances.type.relations.ConsistsOfTypeDefinitionManagement; -import org.gcube.informationsystem.resourceregistry.instances.type.relations.IsRelatedToTypeDefinitionManagement; -import org.gcube.informationsystem.resourceregistry.security.AdminSecurityContext; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext.PermissionMode; +import org.gcube.informationsystem.resourceregistry.types.entities.FacetTypeDefinitionManagement; +import org.gcube.informationsystem.resourceregistry.types.entities.ResourceTypeDefinitionManagement; +import org.gcube.informationsystem.resourceregistry.types.properties.PropertyTypeDefinitionManagement; +import org.gcube.informationsystem.resourceregistry.types.relations.ConsistsOfTypeDefinitionManagement; +import org.gcube.informationsystem.resourceregistry.types.relations.IsRelatedToTypeDefinitionManagement; import org.gcube.informationsystem.types.Type; import org.gcube.informationsystem.types.TypeBinder; import org.gcube.informationsystem.types.reference.TypeDefinition; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/entities/EntityTypeDefinitionManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/EntityTypeDefinitionManagement.java similarity index 98% rename from src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/entities/EntityTypeDefinitionManagement.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/EntityTypeDefinitionManagement.java index 74dfb2b..0d4a4e9 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/entities/EntityTypeDefinitionManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/EntityTypeDefinitionManagement.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.resourceregistry.instances.type.entities; +package org.gcube.informationsystem.resourceregistry.types.entities; import java.util.HashMap; @@ -11,11 +11,11 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.context.Conte import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.EntityAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaNotFoundException; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment; import org.gcube.informationsystem.resourceregistry.instances.base.ERManagement; import org.gcube.informationsystem.resourceregistry.instances.base.entities.BaseEntityManagement; import org.gcube.informationsystem.resourceregistry.instances.context.ContextUtility; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; import org.gcube.informationsystem.resourceregistry.utils.Utility; import org.gcube.informationsystem.types.TypeBinder; import org.gcube.informationsystem.types.reference.entities.EntityTypeDefinition; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/entities/FacetTypeDefinitionManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/FacetTypeDefinitionManagement.java similarity index 82% rename from src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/entities/FacetTypeDefinitionManagement.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/FacetTypeDefinitionManagement.java index 3c1c8c8..6e0330c 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/entities/FacetTypeDefinitionManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/FacetTypeDefinitionManagement.java @@ -1,7 +1,7 @@ -package org.gcube.informationsystem.resourceregistry.instances.type.entities; +package org.gcube.informationsystem.resourceregistry.types.entities; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; import org.gcube.informationsystem.types.reference.entities.FacetTypeDefinition; import com.orientechnologies.orient.core.db.document.ODatabaseDocument; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/entities/ResourceTypeDefinitionManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/ResourceTypeDefinitionManagement.java similarity index 83% rename from src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/entities/ResourceTypeDefinitionManagement.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/ResourceTypeDefinitionManagement.java index 9872da8..f899792 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/entities/ResourceTypeDefinitionManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/ResourceTypeDefinitionManagement.java @@ -1,7 +1,7 @@ -package org.gcube.informationsystem.resourceregistry.instances.type.entities; +package org.gcube.informationsystem.resourceregistry.types.entities; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; import org.gcube.informationsystem.types.reference.entities.ResourceTypeDefinition; import com.orientechnologies.orient.core.db.document.ODatabaseDocument; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/properties/PropertyTypeDefinitionManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/properties/PropertyTypeDefinitionManagement.java similarity index 98% rename from src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/properties/PropertyTypeDefinitionManagement.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/types/properties/PropertyTypeDefinitionManagement.java index 826696d..49c0f06 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/properties/PropertyTypeDefinitionManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/properties/PropertyTypeDefinitionManagement.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.resourceregistry.instances.type.properties; +package org.gcube.informationsystem.resourceregistry.types.properties; import java.util.HashMap; @@ -10,10 +10,10 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaNotFoundException; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment; import org.gcube.informationsystem.resourceregistry.instances.base.ERManagement; import org.gcube.informationsystem.resourceregistry.instances.context.ContextUtility; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; import org.gcube.informationsystem.resourceregistry.utils.Utility; import org.gcube.informationsystem.types.reference.entities.EntityTypeDefinition; import org.gcube.informationsystem.types.reference.properties.PropertyTypeDefinition; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/relations/ConsistsOfTypeDefinitionManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/ConsistsOfTypeDefinitionManagement.java similarity index 81% rename from src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/relations/ConsistsOfTypeDefinitionManagement.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/ConsistsOfTypeDefinitionManagement.java index cbca3dd..4476d6b 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/relations/ConsistsOfTypeDefinitionManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/ConsistsOfTypeDefinitionManagement.java @@ -1,8 +1,8 @@ -package org.gcube.informationsystem.resourceregistry.instances.type.relations; +package org.gcube.informationsystem.resourceregistry.types.relations; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; -import org.gcube.informationsystem.resourceregistry.instances.type.entities.FacetTypeDefinitionManagement; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; +import org.gcube.informationsystem.resourceregistry.types.entities.FacetTypeDefinitionManagement; import org.gcube.informationsystem.types.reference.entities.FacetTypeDefinition; import org.gcube.informationsystem.types.reference.relations.ConsistsOfTypeDefinition; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/relations/IsRelatedToTypeDefinitionManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/IsRelatedToTypeDefinitionManagement.java similarity index 81% rename from src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/relations/IsRelatedToTypeDefinitionManagement.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/IsRelatedToTypeDefinitionManagement.java index 7a2247f..1cc8e7d 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/relations/IsRelatedToTypeDefinitionManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/IsRelatedToTypeDefinitionManagement.java @@ -1,8 +1,8 @@ -package org.gcube.informationsystem.resourceregistry.instances.type.relations; +package org.gcube.informationsystem.resourceregistry.types.relations; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; -import org.gcube.informationsystem.resourceregistry.instances.type.entities.ResourceTypeDefinitionManagement; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; +import org.gcube.informationsystem.resourceregistry.types.entities.ResourceTypeDefinitionManagement; import org.gcube.informationsystem.types.reference.entities.ResourceTypeDefinition; import org.gcube.informationsystem.types.reference.relations.IsRelatedToTypeDefinition; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/relations/RelationTypeDefinitionManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/RelationTypeDefinitionManagement.java similarity index 95% rename from src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/relations/RelationTypeDefinitionManagement.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/RelationTypeDefinitionManagement.java index 57ee42f..5c9260f 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/type/relations/RelationTypeDefinitionManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/RelationTypeDefinitionManagement.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.resourceregistry.instances.type.relations; +package org.gcube.informationsystem.resourceregistry.types.relations; import java.util.HashMap; @@ -12,13 +12,13 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.context.Conte import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.RelationNotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaNotFoundException; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment; import org.gcube.informationsystem.resourceregistry.instances.base.ERManagement; import org.gcube.informationsystem.resourceregistry.instances.base.relations.BaseRelationManagement; import org.gcube.informationsystem.resourceregistry.instances.context.ContextUtility; -import org.gcube.informationsystem.resourceregistry.instances.type.entities.EntityTypeDefinitionManagement; -import org.gcube.informationsystem.resourceregistry.instances.type.entities.ResourceTypeDefinitionManagement; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; +import org.gcube.informationsystem.resourceregistry.types.entities.EntityTypeDefinitionManagement; +import org.gcube.informationsystem.resourceregistry.types.entities.ResourceTypeDefinitionManagement; import org.gcube.informationsystem.resourceregistry.utils.Utility; import org.gcube.informationsystem.types.reference.entities.EntityTypeDefinition; import org.gcube.informationsystem.types.reference.entities.ResourceTypeDefinition; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/Utility.java b/src/main/java/org/gcube/informationsystem/resourceregistry/utils/Utility.java index a020b54..3961b06 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/Utility.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/utils/Utility.java @@ -10,10 +10,10 @@ import org.gcube.informationsystem.model.reference.properties.Header; import org.gcube.informationsystem.model.reference.relations.Relation; import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; +import org.gcube.informationsystem.resourceregistry.contexts.AdminSecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.instances.base.ERManagement; import org.gcube.informationsystem.resourceregistry.instances.context.ContextUtility; -import org.gcube.informationsystem.resourceregistry.security.AdminSecurityContext; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext.PermissionMode; import org.gcube.informationsystem.utils.ISMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java index 77f739e..8f7b8da 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java @@ -13,13 +13,13 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException; +import org.gcube.informationsystem.resourceregistry.contexts.ContextSecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext.PermissionMode; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext.SecurityType; import org.gcube.informationsystem.resourceregistry.instances.context.ContextUtility; import org.gcube.informationsystem.resourceregistry.instances.context.entities.ContextManagement; import org.gcube.informationsystem.resourceregistry.instances.model.entity.FacetManagementTest; -import org.gcube.informationsystem.resourceregistry.security.ContextSecurityContext; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext.PermissionMode; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext.SecurityType; import org.gcube.informationsystem.utils.ISMapper; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironmentTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironmentTest.java index e1c97c0..75f6a17 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironmentTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironmentTest.java @@ -2,8 +2,8 @@ package org.gcube.informationsystem.resourceregistry.dbinitialization; import org.gcube.informationsystem.base.reference.ISConstants; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; +import org.gcube.informationsystem.resourceregistry.contexts.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.instances.context.ContextUtility; -import org.gcube.informationsystem.resourceregistry.security.SecurityContext.PermissionMode; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/type/SchemaManagementImplTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/types/SchemaManagementImplTest.java similarity index 97% rename from src/test/java/org/gcube/informationsystem/resourceregistry/type/SchemaManagementImplTest.java rename to src/test/java/org/gcube/informationsystem/resourceregistry/types/SchemaManagementImplTest.java index a59ec5d..5cea6d9 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/type/SchemaManagementImplTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/types/SchemaManagementImplTest.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.informationsystem.resourceregistry.type; +package org.gcube.informationsystem.resourceregistry.types; import java.util.List; @@ -21,8 +21,8 @@ import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.informationsystem.model.reference.relations.Relation; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaException; -import org.gcube.informationsystem.resourceregistry.instances.type.SchemaManagement; -import org.gcube.informationsystem.resourceregistry.instances.type.SchemaManagementImpl; +import org.gcube.informationsystem.resourceregistry.types.SchemaManagement; +import org.gcube.informationsystem.resourceregistry.types.SchemaManagementImpl; import org.gcube.informationsystem.types.TypeBinder; import org.gcube.informationsystem.types.impl.entities.EntityTypeDefinitionImpl; import org.gcube.informationsystem.types.impl.properties.PropertyTypeDefinitionImpl;