From 129c4b5b54db0cd014bd27e72dc4f2b30e478ce7 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 26 Feb 2021 18:08:13 +0100 Subject: [PATCH] Getting constant from ORientDB class in place of redefining it --- .../dbinitialization/DatabaseEnvironment.java | 4 +--- .../informationsystem/resourceregistry/types/CachedType.java | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) 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 7a7d02a..3bc2a78 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java @@ -114,8 +114,6 @@ public class DatabaseEnvironment { private static final String SERVER_URI; public static final String DB_URI; - public static final String O_RESTRICTED_CLASS = "ORestricted"; - public static final CONNECTION_STRATEGY CONNECTION_STRATEGY_PARAMETER = CONNECTION_STRATEGY.ROUND_ROBIN_CONNECT; // Used to indicate virtual admin security context @@ -381,7 +379,7 @@ public class DatabaseEnvironment { logger.trace( "Setting Record-level Security (see https://orientdb.com/docs/last/Database-Security.html)"); OSchema oSchema = oMetadata.getSchema(); - OClass oRestricted = oSchema.getClass(O_RESTRICTED_CLASS); + OClass oRestricted = oSchema.getClass(OSecurity.RESTRICTED_CLASSNAME); OClass v = oSchema.getClass("V"); v.addSuperClass(oRestricted); diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/types/CachedType.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/CachedType.java index a3d6aeb..a064ccb 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/types/CachedType.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/CachedType.java @@ -13,7 +13,6 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.Schema import org.gcube.informationsystem.resourceregistry.contexts.ContextUtility; import org.gcube.informationsystem.resourceregistry.contexts.security.AdminSecurityContext; import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityContext.PermissionMode; -import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagement; import org.gcube.informationsystem.types.TypeMapper; import org.gcube.informationsystem.types.reference.Type; @@ -25,6 +24,7 @@ import com.orientechnologies.orient.core.db.document.ODatabaseDocument; import com.orientechnologies.orient.core.metadata.OMetadata; import com.orientechnologies.orient.core.metadata.schema.OClass; import com.orientechnologies.orient.core.metadata.schema.OSchema; +import com.orientechnologies.orient.core.metadata.security.OSecurity; import com.tinkerpop.blueprints.util.StringFactory; /** @@ -132,7 +132,7 @@ public class CachedType { CachedType cachedType = typesCache.getCachedType(name); cachedType.setOClass(oSuperClass); if(name.compareTo(StringFactory.V.toUpperCase()) == 0 || name.compareTo(StringFactory.E.toUpperCase()) == 0 - || name.compareTo(DatabaseEnvironment.O_RESTRICTED_CLASS) == 0) { + || name.compareTo(OSecurity.RESTRICTED_CLASSNAME) == 0) { continue; }