From 0a807d74a26edfcf836f6e1cfef1301367fad2ca Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Tue, 2 Mar 2021 09:35:02 +0100 Subject: [PATCH] Improving code --- .../instances/base/ElementManagement.java | 17 ++++++++--------- .../model/entities/EntityManagement.java | 3 +++ .../model/relations/RelationManagement.java | 2 ++ .../resourceregistry/rest/InstancesManager.java | 8 -------- .../resourceregistry/rest/SharingManager.java | 1 - 5 files changed, 13 insertions(+), 18 deletions(-) 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 abc0da8..b5e1c12 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 @@ -128,14 +128,6 @@ public abstract class ElementManagement { public UUID getUUID() { return uuid; } - - public boolean isEntryPoint() { - return entryPoint; - } - - public void setEntryPoint(boolean entryPoint) { - this.entryPoint = entryPoint; - } public boolean isReload() { return reload; @@ -496,6 +488,7 @@ public abstract class ElementManagement { public abstract String reallyGetAll(boolean polymorphic) throws ResourceRegistryException; public String all(boolean polymorphic) throws ResourceRegistryException { + entryPoint = true; ODatabaseDocument current = ContextUtility.getCurrentODatabaseDocumentFromThreadLocal(); try { oDatabaseDocument = getWorkingContext().getDatabaseDocument(PermissionMode.READER); @@ -516,6 +509,7 @@ public abstract class ElementManagement { } public boolean exists() throws NotFoundException, AvailableInAnotherContextException, ResourceRegistryException { + entryPoint = true; ODatabaseDocument current = ContextUtility.getCurrentODatabaseDocumentFromThreadLocal(); try { oDatabaseDocument = getWorkingContext().getDatabaseDocument(PermissionMode.READER); @@ -542,6 +536,7 @@ public abstract class ElementManagement { public String createOrUpdate() throws NotFoundException, AvailableInAnotherContextException, ResourceRegistryException { + entryPoint = true; ODatabaseDocument current = ContextUtility.getCurrentODatabaseDocumentFromThreadLocal(); try { oDatabaseDocument = getWorkingContext().getDatabaseDocument(PermissionMode.WRITER); @@ -592,6 +587,7 @@ public abstract class ElementManagement { } public String create() throws AlreadyPresentException, ResourceRegistryException { + entryPoint = true; ODatabaseDocument current = ContextUtility.getCurrentODatabaseDocumentFromThreadLocal(); try { oDatabaseDocument = getWorkingContext().getDatabaseDocument(PermissionMode.WRITER); @@ -629,9 +625,9 @@ public abstract class ElementManagement { } public String read() throws NotFoundException, AvailableInAnotherContextException, ResourceRegistryException { + entryPoint = true; ODatabaseDocument current = ContextUtility.getCurrentODatabaseDocumentFromThreadLocal(); try { - oDatabaseDocument = getWorkingContext().getDatabaseDocument(PermissionMode.READER); getElement(); @@ -655,6 +651,7 @@ public abstract class ElementManagement { } public String update() throws NotFoundException, AvailableInAnotherContextException, ResourceRegistryException { + entryPoint = true; ODatabaseDocument current = ContextUtility.getCurrentODatabaseDocumentFromThreadLocal(); try { oDatabaseDocument = getWorkingContext().getDatabaseDocument(PermissionMode.WRITER); @@ -694,6 +691,7 @@ public abstract class ElementManagement { } public boolean delete() throws NotFoundException, AvailableInAnotherContextException, ResourceRegistryException { + entryPoint = true; logger.debug("Going to delete {} with UUID {}", accessType.getName(), uuid); ODatabaseDocument current = ContextUtility.getCurrentODatabaseDocumentFromThreadLocal(); try { @@ -737,6 +735,7 @@ public abstract class ElementManagement { public Set getContextsSet() throws NotFoundException, ContextException, ResourceRegistryException { + entryPoint = true; logger.debug("Going to get contexts for {} with UUID", typeName, uuid); ODatabaseDocument current = ContextUtility.getCurrentODatabaseDocumentFromThreadLocal(); try { 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 8873e77..a973385 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 @@ -347,6 +347,7 @@ public abstract class EntityManagement } public Map addToContext(UUID contextUUID) throws SchemaViolationException, NotFoundException, ContextException, ResourceRegistryException { + entryPoint = true; logger.info("Going to add {} with UUID {} to Context with UUID {}", accessType.getName(), uuid, contextUUID); ODatabaseDocument current = ContextUtility.getCurrentODatabaseDocumentFromThreadLocal(); try { @@ -438,6 +439,7 @@ public abstract class EntityManagement public Map removeFromContext(UUID contextUUID) throws SchemaViolationException, NotFoundException, ContextException, ResourceRegistryException { + entryPoint = true; logger.debug("Going to remove {} with UUID {} from Context with UUID {}", typeName, uuid, contextUUID); ODatabaseDocument current = ContextUtility.getCurrentODatabaseDocumentFromThreadLocal(); try { @@ -794,6 +796,7 @@ public abstract class EntityManagement public String query(String relationType, String referenceType, UUID referenceUUID, ODirection direction, boolean polymorphic, Map constraint, boolean includeRelationInResult) throws ResourceRegistryException { try { + entryPoint = true; oDatabaseDocument = getWorkingContext().getDatabaseDocument(PermissionMode.READER); TypesCache typesCache = TypesCache.getInstance(); 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 e305829..a74e603 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 @@ -536,6 +536,7 @@ public abstract class RelationManagement addToContext(UUID contextUUID) throws NotFoundException, ContextException { + entryPoint = true; logger.debug("Going to add {} with UUID {} to Context with UUID {}", accessType.getName(), uuid, contextUUID); ODatabaseDocument current = ContextUtility.getCurrentODatabaseDocumentFromThreadLocal(); try { @@ -678,6 +679,7 @@ public abstract class RelationManagement removeFromContext(UUID contextUUID) throws NotFoundException, ContextException, ResourceRegistryException { + entryPoint = true; logger.debug("Going to remove {} with UUID {} from Context with UUID {}", typeName, uuid, contextUUID); ODatabaseDocument current = ContextUtility.getCurrentODatabaseDocumentFromThreadLocal(); try { diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/InstancesManager.java b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/InstancesManager.java index cb773ac..bbec461 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/InstancesManager.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/InstancesManager.java @@ -55,7 +55,6 @@ public class InstancesManager extends BaseRest { @SuppressWarnings("rawtypes") ElementManagement erManagement = ElementManagementUtility.getERManagement(type); - erManagement.setEntryPoint(true); return erManagement.all(polymorphic); } @@ -78,8 +77,6 @@ public class InstancesManager extends BaseRest { @SuppressWarnings("rawtypes") ElementManagement erManagement = ElementManagementUtility.getERManagement(type); - erManagement.setEntryPoint(true); - try { erManagement.setUUID(UUID.fromString(uuid)); boolean found = erManagement.exists(); @@ -118,7 +115,6 @@ public class InstancesManager extends BaseRest { @SuppressWarnings("rawtypes") ElementManagement erManagement = ElementManagementUtility.getERManagement(type); - erManagement.setEntryPoint(true); erManagement.setElementType(type); erManagement.setUUID(UUID.fromString(uuid)); return erManagement.read().toString(); @@ -143,11 +139,9 @@ public class InstancesManager extends BaseRest { @SuppressWarnings("rawtypes") ElementManagement erManagement = ElementManagementUtility.getERManagement(type); - erManagement.setEntryPoint(true); erManagement.setUUID(UUID.fromString(uuid)); erManagement.setElementType(type); erManagement.setJson(json); - return erManagement.createOrUpdate(); } @@ -165,7 +159,6 @@ public class InstancesManager extends BaseRest { @SuppressWarnings("rawtypes") ElementManagement erManagement = ElementManagementUtility.getERManagement(type); - erManagement.setEntryPoint(true); erManagement.setUUID(UUID.fromString(uuid)); erManagement.delete(); @@ -194,7 +187,6 @@ public class InstancesManager extends BaseRest { @SuppressWarnings("rawtypes") ElementManagement erManagement = ElementManagementUtility.getERManagement(type); - erManagement.setEntryPoint(true); erManagement.setUUID(UUID.fromString(instanceId)); return erManagement.getContexts(); } diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/SharingManager.java b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/SharingManager.java index 1959eb7..59c704a 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/SharingManager.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/SharingManager.java @@ -185,7 +185,6 @@ public class SharingManager { ElementManagement elementManagement = ElementManagementUtility.getERManagement(type); - elementManagement.setEntryPoint(true); elementManagement.setUUID(UUID.fromString(instanceId)); ((ERManagement) elementManagement).setDryRunContextSharing(dryRun);