Improving Environment hierarchy

src/main/java/org/gcube/informationsystem/resourceregistry/base/ElementManagement.java

@@ -48,9 +48,9 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaV
 import org.gcube.informationsystem.resourceregistry.base.properties.PropertyElementManagement;
 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.Environment;
 import org.gcube.informationsystem.resourceregistry.environments.Environment.PermissionMode;
+import org.gcube.informationsystem.resourceregistry.environments.administration.AdminEnvironment;
 import org.gcube.informationsystem.resourceregistry.environments.instances.InstanceEnvironment;
 import org.gcube.informationsystem.resourceregistry.instances.model.Operation;
 import org.gcube.informationsystem.resourceregistry.rest.requests.RequestUtility;

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.base.ElementManagementUtility;
-import org.gcube.informationsystem.resourceregistry.environments.AdminEnvironment;
 import org.gcube.informationsystem.resourceregistry.environments.Environment;
 import org.gcube.informationsystem.resourceregistry.environments.Environment.PermissionMode;
+import org.gcube.informationsystem.resourceregistry.environments.administration.AdminEnvironment;
 import org.gcube.informationsystem.resourceregistry.environments.instances.InstanceEnvironment;
 import org.gcube.informationsystem.resourceregistry.utils.OrientDBUtility;
 import org.gcube.informationsystem.resourceregistry.utils.UUIDUtility;

src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java

@@ -24,8 +24,8 @@ import org.gcube.informationsystem.model.reference.properties.Property;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaAlreadyPresentException;
 import org.gcube.informationsystem.resourceregistry.base.ElementManagement;
 import org.gcube.informationsystem.resourceregistry.contexts.ServerContextCache;
-import org.gcube.informationsystem.resourceregistry.environments.AdminEnvironment;
 import org.gcube.informationsystem.resourceregistry.environments.Environment.PermissionMode;
+import org.gcube.informationsystem.resourceregistry.environments.administration.AdminEnvironment;
 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;

src/main/java/org/gcube/informationsystem/resourceregistry/environments/Environment.java

@@ -16,6 +16,7 @@ import org.gcube.common.authorization.utils.user.User;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.contexts.ContextUtility;
 import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment;
+import org.gcube.informationsystem.resourceregistry.environments.administration.AdminEnvironment;
 import org.gcube.informationsystem.resourceregistry.instances.model.Operation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,10 +36,10 @@ import com.orientechnologies.orient.core.record.impl.ODocument;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
- * Base class for any system environment.
+ * Base class for any environment.
- * In the current implementation it represent a 
+ * In the current implementation it represents a 
- * partion of a graph which in OrientDB is implemented 
+ * portion of a graph which in OrientDB 
- * via security.
+ * is implemented via security.
  */
 public abstract class Environment {
 	

src/main/java/org/gcube/informationsystem/resourceregistry/environments/SystemEnvironment.java

@@ -0,0 +1,16 @@
+package org.gcube.informationsystem.resourceregistry.environments;
+
+import java.util.UUID;
+
+import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
+
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
+public abstract class SystemEnvironment extends Environment {
+
+	protected SystemEnvironment(UUID context) throws ResourceRegistryException {
+		super(context);
+	}
+
+}

src/main/java/org/gcube/informationsystem/resourceregistry/environments/administration/AdminEnvironment.java

@@ -1,9 +1,11 @@
-package org.gcube.informationsystem.resourceregistry.environments;
+package org.gcube.informationsystem.resourceregistry.environments.administration;
 
 import java.util.UUID;
 
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment;
+import org.gcube.informationsystem.resourceregistry.environments.Environment;
+import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -16,7 +18,7 @@ import com.orientechnologies.orient.core.metadata.security.OSecurity;
  * This SystemEnvironment is used in all the case the
  * operation must be done by an administrator 
  */
-public class AdminEnvironment extends Environment {
+public class AdminEnvironment extends SystemEnvironment {
 	
 	private static Logger logger = LoggerFactory.getLogger(Environment.class);
 	

src/main/java/org/gcube/informationsystem/resourceregistry/environments/contexts/ContextEnvironment.java

@@ -4,6 +4,7 @@ import java.util.UUID;
 
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.environments.Environment;
+import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -16,7 +17,7 @@ import com.orientechnologies.orient.core.metadata.security.ORule;
  * Contexts information and their relations among
  * others, e.g. a Context is parent of another.
  */
-public class ContextEnvironment extends Environment {
+public class ContextEnvironment extends SystemEnvironment {
 	
 	private static Logger logger = LoggerFactory.getLogger(Environment.class);
 	

src/main/java/org/gcube/informationsystem/resourceregistry/environments/contexts/ShadowContextEnvironment.java

@@ -4,6 +4,7 @@ import java.util.UUID;
 
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.environments.Environment;
+import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -19,7 +20,7 @@ import com.orientechnologies.orient.core.metadata.security.ORule;
  * ah historical information and to provide a minimal support for 
  * Context reborn.
  */
-public class ShadowContextEnvironment extends Environment {
+public class ShadowContextEnvironment extends SystemEnvironment {
 	
 	private static Logger logger = LoggerFactory.getLogger(Environment.class);
 	

src/main/java/org/gcube/informationsystem/resourceregistry/environments/queries/templates/QueryTemplateEnvironment.java

@@ -4,6 +4,7 @@ import java.util.UUID;
 
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.environments.Environment;
+import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,7 +15,7 @@ import com.orientechnologies.orient.core.metadata.security.ORule;
  * @author Luca Frosini (ISTI - CNR)
  * Contains all the query templates
  */
-public class QueryTemplateEnvironment extends Environment {
+public class QueryTemplateEnvironment extends SystemEnvironment {
 	
 	private static Logger logger = LoggerFactory.getLogger(Environment.class);
 	

src/main/java/org/gcube/informationsystem/resourceregistry/environments/types/TypeEnvironment.java

@@ -4,6 +4,7 @@ import java.util.UUID;
 
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.environments.Environment;
+import org.gcube.informationsystem.resourceregistry.environments.SystemEnvironment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -16,7 +17,7 @@ import com.orientechnologies.orient.core.metadata.security.ORule;
  * plus all the types defined on top of the 
  * information-system-model (e.g the gcube-model)
  */
-public class TypeEnvironment extends Environment {
+public class TypeEnvironment extends SystemEnvironment {
 	
 	private static Logger logger = LoggerFactory.getLogger(Environment.class);
 	

src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/ERManagementUtility.java

@@ -12,9 +12,9 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.contexts.Cont
 import org.gcube.informationsystem.resourceregistry.base.ElementManagement;
 import org.gcube.informationsystem.resourceregistry.base.ElementManagementUtility;
 import org.gcube.informationsystem.resourceregistry.contexts.ContextUtility;
-import org.gcube.informationsystem.resourceregistry.environments.AdminEnvironment;
 import org.gcube.informationsystem.resourceregistry.environments.Environment;
 import org.gcube.informationsystem.resourceregistry.environments.Environment.PermissionMode;
+import org.gcube.informationsystem.resourceregistry.environments.administration.AdminEnvironment;
 import org.gcube.informationsystem.utils.TypeUtility;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java

@@ -28,9 +28,9 @@ import org.gcube.informationsystem.resourceregistry.base.ElementManagementUtilit
 import org.gcube.informationsystem.resourceregistry.base.entities.EntityElementManagement;
 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.Environment;
 import org.gcube.informationsystem.resourceregistry.environments.Environment.PermissionMode;
+import org.gcube.informationsystem.resourceregistry.environments.administration.AdminEnvironment;
 import org.gcube.informationsystem.resourceregistry.instances.model.ERManagement;
 import org.gcube.informationsystem.resourceregistry.instances.model.Operation;
 import org.gcube.informationsystem.resourceregistry.instances.model.relations.RelationManagement;

src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java

@@ -32,9 +32,9 @@ import org.gcube.informationsystem.resourceregistry.base.ElementManagementUtilit
 import org.gcube.informationsystem.resourceregistry.base.relations.RelationElementManagement;
 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.Environment;
 import org.gcube.informationsystem.resourceregistry.environments.Environment.PermissionMode;
+import org.gcube.informationsystem.resourceregistry.environments.administration.AdminEnvironment;
 import org.gcube.informationsystem.resourceregistry.instances.model.ERManagement;
 import org.gcube.informationsystem.resourceregistry.instances.model.Operation;
 import org.gcube.informationsystem.resourceregistry.instances.model.entities.EntityManagement;

src/main/java/org/gcube/informationsystem/resourceregistry/types/CachedType.java

@@ -13,8 +13,8 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaN
 import org.gcube.informationsystem.resourceregistry.base.ElementManagement;
 import org.gcube.informationsystem.resourceregistry.contexts.ContextUtility;
 import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment;
-import org.gcube.informationsystem.resourceregistry.environments.AdminEnvironment;
 import org.gcube.informationsystem.resourceregistry.environments.Environment.PermissionMode;
+import org.gcube.informationsystem.resourceregistry.environments.administration.AdminEnvironment;
 import org.gcube.informationsystem.types.TypeMapper;
 import org.gcube.informationsystem.types.reference.Type;
 import org.gcube.informationsystem.types.reference.properties.LinkedEntity;

src/main/java/org/gcube/informationsystem/resourceregistry/types/TypeManagement.java

@@ -32,8 +32,8 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaC
 import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaNotFoundException;
 import org.gcube.informationsystem.resourceregistry.base.ElementManagement;
-import org.gcube.informationsystem.resourceregistry.environments.AdminEnvironment;
 import org.gcube.informationsystem.resourceregistry.environments.Environment.PermissionMode;
+import org.gcube.informationsystem.resourceregistry.environments.administration.AdminEnvironment;
 import org.gcube.informationsystem.resourceregistry.types.entities.FacetTypeDefinitionManagement;
 import org.gcube.informationsystem.resourceregistry.types.entities.ResourceTypeDefinitionManagement;
 import org.gcube.informationsystem.resourceregistry.types.properties.PropertyTypeDefinitionManagement;

src/main/java/org/gcube/informationsystem/resourceregistry/utils/OrientDBUtility.java

@@ -15,8 +15,8 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundExcep
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.base.ElementManagementUtility;
 import org.gcube.informationsystem.resourceregistry.contexts.ContextUtility;
-import org.gcube.informationsystem.resourceregistry.environments.AdminEnvironment;
 import org.gcube.informationsystem.resourceregistry.environments.Environment.PermissionMode;
+import org.gcube.informationsystem.resourceregistry.environments.administration.AdminEnvironment;
 import org.gcube.informationsystem.serialization.ElementMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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.Element;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
-import org.gcube.informationsystem.resourceregistry.environments.AdminEnvironment;
 import org.gcube.informationsystem.resourceregistry.environments.Environment.PermissionMode;
+import org.gcube.informationsystem.resourceregistry.environments.administration.AdminEnvironment;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;