diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ContextUtility.java b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ContextUtility.java index a832b5f..baedfcb 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ContextUtility.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ContextUtility.java @@ -14,9 +14,9 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis import org.gcube.informationsystem.resourceregistry.api.exceptions.contexts.ContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.contexts.ContextNotFoundException; import org.gcube.informationsystem.resourceregistry.environments.AdminEnvironment; -import org.gcube.informationsystem.resourceregistry.environments.InstanceEnvironment; import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment; import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment.PermissionMode; +import org.gcube.informationsystem.resourceregistry.environments.instances.InstanceEnvironment; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagementUtility; import org.gcube.informationsystem.resourceregistry.utils.OrientDBUtility; import org.gcube.informationsystem.resourceregistry.utils.UUIDUtility; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/entities/ContextManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/entities/ContextManagement.java index a580f26..9f39398 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/entities/ContextManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/entities/ContextManagement.java @@ -34,9 +34,9 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaV import org.gcube.informationsystem.resourceregistry.contexts.ContextUtility; import org.gcube.informationsystem.resourceregistry.contexts.ServerContextCache; import org.gcube.informationsystem.resourceregistry.contexts.relations.IsParentOfManagement; -import org.gcube.informationsystem.resourceregistry.environments.ContextEnvironment; -import org.gcube.informationsystem.resourceregistry.environments.InstanceEnvironment; import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment; +import org.gcube.informationsystem.resourceregistry.environments.contexts.ContextEnvironment; +import org.gcube.informationsystem.resourceregistry.environments.instances.InstanceEnvironment; import org.gcube.informationsystem.resourceregistry.instances.base.entities.EntityElementManagement; import org.gcube.informationsystem.resourceregistry.instances.model.Operation; import org.gcube.informationsystem.resourceregistry.queries.operators.ComparisonOperator; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/relations/IsParentOfManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/relations/IsParentOfManagement.java index d48f339..8e5ae56 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/relations/IsParentOfManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/relations/IsParentOfManagement.java @@ -15,8 +15,8 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.relations.isp import org.gcube.informationsystem.resourceregistry.api.exceptions.relations.isparentof.IsParentOfNotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaViolationException; import org.gcube.informationsystem.resourceregistry.contexts.entities.ContextManagement; -import org.gcube.informationsystem.resourceregistry.environments.ContextEnvironment; import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment; +import org.gcube.informationsystem.resourceregistry.environments.contexts.ContextEnvironment; import org.gcube.informationsystem.resourceregistry.instances.base.relations.RelationElementManagement; import org.gcube.informationsystem.resourceregistry.utils.OrientDBUtility; import org.gcube.informationsystem.types.reference.entities.EntityType; 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 5b3f7ea..feaf07f 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java @@ -24,10 +24,10 @@ import org.gcube.informationsystem.model.reference.properties.Property; import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.contexts.ServerContextCache; import org.gcube.informationsystem.resourceregistry.environments.AdminEnvironment; -import org.gcube.informationsystem.resourceregistry.environments.ContextEnvironment; -import org.gcube.informationsystem.resourceregistry.environments.QueryTemplateEnvironment; -import org.gcube.informationsystem.resourceregistry.environments.TypeEnvironment; import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment.PermissionMode; +import org.gcube.informationsystem.resourceregistry.environments.contexts.ContextEnvironment; +import org.gcube.informationsystem.resourceregistry.environments.queries.templates.QueryTemplateEnvironment; +import org.gcube.informationsystem.resourceregistry.environments.types.TypeEnvironment; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagement; import org.gcube.informationsystem.resourceregistry.types.TypeManagement; import org.gcube.informationsystem.resourceregistry.types.properties.PropertyTypeDefinitionManagement; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/environments/ContextEnvironment.java b/src/main/java/org/gcube/informationsystem/resourceregistry/environments/contexts/ContextEnvironment.java similarity index 95% rename from src/main/java/org/gcube/informationsystem/resourceregistry/environments/ContextEnvironment.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/environments/contexts/ContextEnvironment.java index 5934019..e7af635 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/environments/ContextEnvironment.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/environments/contexts/ContextEnvironment.java @@ -1,8 +1,9 @@ -package org.gcube.informationsystem.resourceregistry.environments; +package org.gcube.informationsystem.resourceregistry.environments.contexts; import java.util.UUID; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; +import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/environments/ShadowContextEnvironment.java b/src/main/java/org/gcube/informationsystem/resourceregistry/environments/contexts/ShadowContextEnvironment.java similarity index 95% rename from src/main/java/org/gcube/informationsystem/resourceregistry/environments/ShadowContextEnvironment.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/environments/contexts/ShadowContextEnvironment.java index 79c5c7c..a969032 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/environments/ShadowContextEnvironment.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/environments/contexts/ShadowContextEnvironment.java @@ -1,8 +1,9 @@ -package org.gcube.informationsystem.resourceregistry.environments; +package org.gcube.informationsystem.resourceregistry.environments.contexts; import java.util.UUID; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; +import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/environments/InstanceEnvironment.java b/src/main/java/org/gcube/informationsystem/resourceregistry/environments/instances/InstanceEnvironment.java similarity index 80% rename from src/main/java/org/gcube/informationsystem/resourceregistry/environments/InstanceEnvironment.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/environments/instances/InstanceEnvironment.java index 4b7bddc..20e974e 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/environments/InstanceEnvironment.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/environments/instances/InstanceEnvironment.java @@ -1,8 +1,9 @@ -package org.gcube.informationsystem.resourceregistry.environments; +package org.gcube.informationsystem.resourceregistry.environments.instances; import java.util.UUID; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; +import org.gcube.informationsystem.resourceregistry.environments.HierarchicalSystemEnvironment; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/environments/QueryTemplateEnvironment.java b/src/main/java/org/gcube/informationsystem/resourceregistry/environments/queries/templates/QueryTemplateEnvironment.java similarity index 95% rename from src/main/java/org/gcube/informationsystem/resourceregistry/environments/QueryTemplateEnvironment.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/environments/queries/templates/QueryTemplateEnvironment.java index 6d95140..147cc70 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/environments/QueryTemplateEnvironment.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/environments/queries/templates/QueryTemplateEnvironment.java @@ -1,8 +1,9 @@ -package org.gcube.informationsystem.resourceregistry.environments; +package org.gcube.informationsystem.resourceregistry.environments.queries.templates; import java.util.UUID; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; +import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/environments/TypeEnvironment.java b/src/main/java/org/gcube/informationsystem/resourceregistry/environments/types/TypeEnvironment.java similarity index 95% rename from src/main/java/org/gcube/informationsystem/resourceregistry/environments/TypeEnvironment.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/environments/types/TypeEnvironment.java index 0ae0883..f738771 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/environments/TypeEnvironment.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/environments/types/TypeEnvironment.java @@ -1,8 +1,9 @@ -package org.gcube.informationsystem.resourceregistry.environments; +package org.gcube.informationsystem.resourceregistry.environments.types; import java.util.UUID; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; +import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ElementManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ElementManagement.java index 8c99027..f2446fc 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ElementManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ElementManagement.java @@ -48,9 +48,9 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaV import org.gcube.informationsystem.resourceregistry.contexts.ContextUtility; import org.gcube.informationsystem.resourceregistry.contexts.ServerContextCache; import org.gcube.informationsystem.resourceregistry.environments.AdminEnvironment; -import org.gcube.informationsystem.resourceregistry.environments.InstanceEnvironment; import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment; import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment.PermissionMode; +import org.gcube.informationsystem.resourceregistry.environments.instances.InstanceEnvironment; import org.gcube.informationsystem.resourceregistry.instances.base.properties.PropertyElementManagement; import org.gcube.informationsystem.resourceregistry.instances.model.Operation; import org.gcube.informationsystem.resourceregistry.requests.RequestUtility; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/queries/templates/QueryTemplateManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/queries/templates/QueryTemplateManagement.java index 47f3526..67b4078 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/queries/templates/QueryTemplateManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/queries/templates/QueryTemplateManagement.java @@ -21,9 +21,9 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.queries.templ import org.gcube.informationsystem.resourceregistry.api.exceptions.queries.templates.QueryTemplateNotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaViolationException; import org.gcube.informationsystem.resourceregistry.contexts.ContextUtility; -import org.gcube.informationsystem.resourceregistry.environments.QueryTemplateEnvironment; import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment; import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment.PermissionMode; +import org.gcube.informationsystem.resourceregistry.environments.queries.templates.QueryTemplateEnvironment; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagementUtility; import org.gcube.informationsystem.resourceregistry.instances.base.entities.EntityElementManagement; import org.gcube.informationsystem.resourceregistry.instances.model.Operation; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/EntityTypeDefinitionManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/EntityTypeDefinitionManagement.java index 45bc79d..84d8208 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/EntityTypeDefinitionManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/EntityTypeDefinitionManagement.java @@ -14,7 +14,7 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaA import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaNotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaViolationException; import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment; -import org.gcube.informationsystem.resourceregistry.environments.TypeEnvironment; +import org.gcube.informationsystem.resourceregistry.environments.types.TypeEnvironment; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagementUtility; import org.gcube.informationsystem.resourceregistry.instances.base.entities.EntityElementManagement; import org.gcube.informationsystem.resourceregistry.utils.OrientDBUtility; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/types/properties/PropertyTypeDefinitionManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/properties/PropertyTypeDefinitionManagement.java index 4ccdb64..73061a3 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/types/properties/PropertyTypeDefinitionManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/properties/PropertyTypeDefinitionManagement.java @@ -13,7 +13,7 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaA import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaNotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaViolationException; import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment; -import org.gcube.informationsystem.resourceregistry.environments.TypeEnvironment; +import org.gcube.informationsystem.resourceregistry.environments.types.TypeEnvironment; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagement; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagementUtility; import org.gcube.informationsystem.resourceregistry.utils.OrientDBUtility; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/RelationTypeDefinitionManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/RelationTypeDefinitionManagement.java index 3adcd73..a26e326 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/RelationTypeDefinitionManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/RelationTypeDefinitionManagement.java @@ -16,7 +16,7 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaA import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaNotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaViolationException; import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment; -import org.gcube.informationsystem.resourceregistry.environments.TypeEnvironment; +import org.gcube.informationsystem.resourceregistry.environments.types.TypeEnvironment; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagementUtility; import org.gcube.informationsystem.resourceregistry.instances.base.relations.RelationElementManagement; import org.gcube.informationsystem.resourceregistry.types.entities.EntityTypeDefinitionManagement; diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/contexts/ContextManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/contexts/ContextManagementTest.java index e0dc8b9..d98343b 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/contexts/ContextManagementTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/contexts/ContextManagementTest.java @@ -18,10 +18,10 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.contexts.Cont import org.gcube.informationsystem.resourceregistry.api.exceptions.contexts.ContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.contexts.ContextNotFoundException; import org.gcube.informationsystem.resourceregistry.contexts.entities.ContextManagement; -import org.gcube.informationsystem.resourceregistry.environments.ContextEnvironment; -import org.gcube.informationsystem.resourceregistry.environments.InstanceEnvironment; import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment.PermissionMode; import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment.SecurityType; +import org.gcube.informationsystem.resourceregistry.environments.contexts.ContextEnvironment; +import org.gcube.informationsystem.resourceregistry.environments.instances.InstanceEnvironment; import org.gcube.informationsystem.resourceregistry.utils.MetadataUtility; import org.gcube.informationsystem.serialization.ElementMapper; import org.junit.Assert;