From 2d7805b132b59b43a0866eafd377cf9438ef209c Mon Sep 17 00:00:00 2001 From: "luca.frosini" Date: Fri, 17 Nov 2017 16:34:29 +0000 Subject: [PATCH] Refs #10238: Refactor Context Port Type Task-Url: https://support.d4science.org/issues/10238 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry@158632 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../resourceregistry/er/ERManagement.java | 10 +-- .../er/entity/EntityManagement.java | 6 +- .../er/entity/ResourceManagement.java | 3 - .../er/relation/RelationManagement.java | 86 +++++++++---------- 4 files changed, 50 insertions(+), 55 deletions(-) diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/er/ERManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/er/ERManagement.java index e4d82a8..527b678 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/er/ERManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/er/ERManagement.java @@ -59,7 +59,6 @@ import com.tinkerpop.blueprints.Element; import com.tinkerpop.blueprints.Vertex; import com.tinkerpop.blueprints.impls.orient.OrientElement; import com.tinkerpop.blueprints.impls.orient.OrientGraph; -import com.tinkerpop.blueprints.impls.orient.OrientVertex; import com.tinkerpop.blueprints.util.StringFactory; /** @@ -115,7 +114,6 @@ public abstract class ERManagement { this.ignoreStartWithKeys.add(AT); this.ignoreStartWithKeys.add(UNDERSCORE); - } protected ERManagement(AccessType accessType, OrientGraph orientGraph) { @@ -274,7 +272,7 @@ public abstract class ERManagement { reallyUpdate(); HeaderUtility.updateModifiedByAndLastUpdate(element); - ((OrientVertex) element).save(); + ((OrientElement) element).save(); return element; }catch (ResourceRegistryException e) { @@ -306,8 +304,8 @@ public abstract class ERManagement { public boolean internalAddToContext() throws ContextException, ResourceRegistryException { try { boolean ret = reallyAddToContext(); - HeaderUtility.updateModifiedByAndLastUpdate(getElement()); - ((OrientElement) getElement()).save(); + HeaderUtility.updateModifiedByAndLastUpdate(element); + ((OrientElement) element).save(); return ret && true; }catch (ResourceRegistryException e) { throw e; @@ -323,7 +321,7 @@ public abstract class ERManagement { try { boolean ret = reallyRemoveFromContext(); HeaderUtility.updateModifiedByAndLastUpdate(element); - ((OrientVertex) element).save(); + ((OrientElement) element).save(); return ret && true; }catch (ResourceRegistryException e) { throw e; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/EntityManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/EntityManagement.java index 13559e7..c159a40 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/EntityManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/EntityManagement.java @@ -193,15 +193,15 @@ public abstract class EntityManagement extends protected boolean reallyRemoveFromContext() throws ContextException, ResourceRegistryException { - ContextUtility.removeFromActualContext(orientGraph, getElement()); - - Iterable edges = element.getEdges(Direction.OUT); + Iterable edges = getElement().getEdges(Direction.OUT); for (Edge edge : edges) { @SuppressWarnings("rawtypes") RelationManagement relationManagement = getRelationManagement(edge); relationManagement.internalRemoveFromContext(); } + + ContextUtility.removeFromActualContext(orientGraph, getElement()); return true; } diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/ResourceManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/ResourceManagement.java index 15f73e0..9ae9bbd 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/ResourceManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/ResourceManagement.java @@ -1,6 +1,3 @@ -/** - * - */ package org.gcube.informationsystem.resourceregistry.er.entity; import java.util.Iterator; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/er/relation/RelationManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/er/relation/RelationManagement.java index e768140..28ba472 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/er/relation/RelationManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/er/relation/RelationManagement.java @@ -53,8 +53,8 @@ public abstract class RelationManagement targetEntityClass; - private S sourceEntityManagemen; - private T targetEntityManagemen; + private S sourceEntityManagement; + private T targetEntityManagement; protected RelationManagement(AccessType accessType) { super(accessType); @@ -81,8 +81,8 @@ public abstract class RelationManagement {}", erType, getSourceEntityManagemen().serialize(), - getTargetEntityManagemen().serialize()); + logger.trace("Creating {} beetween {} -> {}", erType, getSourceEntityManagement().serialize(), + getTargetEntityManagement().serialize()); - Vertex source = (Vertex) getSourceEntityManagemen().getElement(); - Vertex target = (Vertex) getTargetEntityManagemen().getElement(); + Vertex source = (Vertex) getSourceEntityManagement().getElement(); + Vertex target = (Vertex) getTargetEntityManagement().getElement(); element = orientGraph.addEdge(null, source, target, erType); @@ -374,7 +374,7 @@ public abstract class RelationManagement iterable = target.getEdges(Direction.IN); Iterator iterator = iterable.iterator(); @@ -480,7 +480,7 @@ public abstract class RelationManagement