From 5676d17c583bc69ec185f3f92828d2bfdb045cbf Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 22 Oct 2021 20:05:55 +0200 Subject: [PATCH] Aligned name --- ...maSecurityContext.java => TypeSecurityContext.java} | 10 +++++----- .../dbinitialization/DatabaseEnvironment.java | 6 +++--- .../types/entities/EntityTypeDefinitionManagement.java | 4 ++-- .../properties/PropertyTypeDefinitionManagement.java | 4 ++-- .../relations/RelationTypeDefinitionManagement.java | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) rename src/main/java/org/gcube/informationsystem/resourceregistry/contexts/security/{SchemaSecurityContext.java => TypeSecurityContext.java} (85%) diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/security/SchemaSecurityContext.java b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/security/TypeSecurityContext.java similarity index 85% rename from src/main/java/org/gcube/informationsystem/resourceregistry/contexts/security/SchemaSecurityContext.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/contexts/security/TypeSecurityContext.java index be91f9c..1f462fe 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/security/SchemaSecurityContext.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/security/TypeSecurityContext.java @@ -13,7 +13,7 @@ import com.orientechnologies.orient.core.metadata.security.ORule; /** * @author Luca Frosini (ISTI - CNR) */ -public class SchemaSecurityContext extends SecurityContext { +public class TypeSecurityContext extends SecurityContext { private static Logger logger = LoggerFactory.getLogger(SecurityContext.class); @@ -25,18 +25,18 @@ public class SchemaSecurityContext extends SecurityContext { SCHEMA_SECURITY_CONTEXT_UUID = UUID.fromString(SCHEMA_SECURITY_CONTEXT); } - private static SchemaSecurityContext instance; + private static TypeSecurityContext instance; - public static SchemaSecurityContext getInstance() throws ResourceRegistryException { + public static TypeSecurityContext getInstance() throws ResourceRegistryException { if(instance==null) { - instance = new SchemaSecurityContext(); + instance = new TypeSecurityContext(); ContextUtility contextUtility = ContextUtility.getInstance(); contextUtility.addSecurityContext(SCHEMA_SECURITY_CONTEXT, instance); } return instance; } - private SchemaSecurityContext() throws ResourceRegistryException { + private TypeSecurityContext() throws ResourceRegistryException { super(SCHEMA_SECURITY_CONTEXT_UUID, false); } 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 15bb24f..4667849 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java @@ -22,7 +22,7 @@ import org.gcube.informationsystem.model.reference.properties.Property; import org.gcube.informationsystem.resourceregistry.contexts.security.AdminSecurityContext; import org.gcube.informationsystem.resourceregistry.contexts.security.ContextSecurityContext; import org.gcube.informationsystem.resourceregistry.contexts.security.QueryTemplatesSecurityContext; -import org.gcube.informationsystem.resourceregistry.contexts.security.SchemaSecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.security.TypeSecurityContext; import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagement; import org.gcube.informationsystem.resourceregistry.types.properties.PropertyTypeDefinitionManagement; @@ -185,7 +185,7 @@ public class DatabaseEnvironment { AdminSecurityContext adminSecurityContext = AdminSecurityContext.getInstance(); QueryTemplatesSecurityContext queryTemplatesSecurityContext = QueryTemplatesSecurityContext.getInstance(); - SchemaSecurityContext schemaSecurityContext = SchemaSecurityContext.getInstance(); + TypeSecurityContext typeSecurityContext = TypeSecurityContext.getInstance(); ContextSecurityContext contextSecurityContext = ContextSecurityContext.getInstance(); if(created) { @@ -198,7 +198,7 @@ public class DatabaseEnvironment { pool.close(); queryTemplatesSecurityContext.create(); - schemaSecurityContext.create(); + typeSecurityContext.create(); contextSecurityContext.create(); 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 5405fdb..edcf83a 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 @@ -13,7 +13,7 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.Entity import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaNotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaViolationException; -import org.gcube.informationsystem.resourceregistry.contexts.security.SchemaSecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.security.TypeSecurityContext; import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityContext; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagementUtility; import org.gcube.informationsystem.resourceregistry.instances.base.entities.EntityElementManagement; @@ -49,7 +49,7 @@ public abstract class EntityTypeDefinitionManagement exten @Override protected SecurityContext getWorkingContext() throws ResourceRegistryException { if (workingContext == null) { - workingContext = SchemaSecurityContext.getInstance(); + workingContext = TypeSecurityContext.getInstance(); } return workingContext; } 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 dc99032..cb42d89 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 @@ -12,7 +12,7 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaNotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaViolationException; -import org.gcube.informationsystem.resourceregistry.contexts.security.SchemaSecurityContext; +import org.gcube.informationsystem.resourceregistry.contexts.security.TypeSecurityContext; import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityContext; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagement; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagementUtility; @@ -56,7 +56,7 @@ public class PropertyTypeDefinitionManagement extends ElementManagement