Added code (and commented) to return also target Resource on Resource marshalling.

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry@135176 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/EntityManagementImpl.java

@@ -21,7 +21,7 @@ import org.gcube.informationsystem.impl.utils.Entities;
 import org.gcube.informationsystem.model.embedded.Embedded;
 import org.gcube.informationsystem.model.embedded.Header;
 import org.gcube.informationsystem.model.embedded.RelationProperty;
-import org.gcube.informationsystem.model.embedded.RelationProperty.ReferentiaIntegrity;
+import org.gcube.informationsystem.model.embedded.RelationProperty.ReferentialIntegrity;
 import org.gcube.informationsystem.model.entity.Entity;
 import org.gcube.informationsystem.model.entity.Facet;
 import org.gcube.informationsystem.model.entity.Resource;
@@ -61,6 +61,7 @@ import com.tinkerpop.blueprints.Element;
 import com.tinkerpop.blueprints.Vertex;
 import com.tinkerpop.blueprints.impls.orient.OrientBaseGraph;
 import com.tinkerpop.blueprints.impls.orient.OrientEdge;
+import com.tinkerpop.blueprints.impls.orient.OrientEdgeType;
 import com.tinkerpop.blueprints.impls.orient.OrientGraph;
 import com.tinkerpop.blueprints.impls.orient.OrientVertex;
 
@@ -1169,34 +1170,44 @@ public class EntityManagementImpl implements EntityManagement {
 				true);
 
 		JSONArray consistsOfArray = new JSONArray();
-
+		/*
+		JSONArray isRelatedToArray = new JSONArray();
+		*/
+		
 		Iterable<Edge> edges = vertex.getEdges(Direction.OUT);
 
 		for (Edge edge : edges) {
 
-			String edgeType = edge.getLabel();
-
-			try {
-				SchemaManagementImpl.getTypeSchema(orientGraph, edgeType,
-						ConsistsOf.NAME);
-			} catch (SchemaNotFoundException e) {
-				// This not an ConsistsOf Edge. it will be skipped
-				continue;
-			}
 
+			OrientEdgeType orientEdgeType = ((OrientEdge) edge).getType();
+			
 			JSONObject jsonObjectEdge = Utility.toJsonObject((OrientEdge) edge,
 					true);
-			Vertex facetVertex = edge.getVertex(Direction.IN);
+			
+			Vertex targetVertex = edge.getVertex(Direction.IN);
 
 			jsonObjectEdge.put(Relation.TARGET_PROPERTY,
-					Utility.toJsonObject((OrientVertex) facetVertex, true));
+					Utility.toJsonObject((OrientVertex) targetVertex, true));
-			consistsOfArray.put(jsonObjectEdge);
+			
+			
+			if(orientEdgeType.isSubClassOf(ConsistsOf.NAME)){
+				consistsOfArray.put(jsonObjectEdge);
+			}
+			/*
+			else if(orientEdgeType.isSubClassOf(IsRelatedTo.NAME)){
+				isRelatedToArray.put(jsonObjectEdge);
+			}
+			*/
 
 		}
 
 		jsonObject.put(lowerCaseFirstCharacter(ConsistsOf.NAME),
 				consistsOfArray);
-
+		/*
+		jsonObject.put(lowerCaseFirstCharacter(IsRelatedTo.NAME),
+				isRelatedToArray);
+		*/
+		
 		return jsonObject.toString();
 	}
 
@@ -1390,8 +1401,8 @@ public class EntityManagementImpl implements EntityManagement {
 						//+ rid
 				+ ") "
 				+ "WHERE ("
-					+ Relation.RELATION_PROPERTY + "." + RelationProperty.REFERENTIAL_INTEGRITY + " = '" + ReferentiaIntegrity.onDeleteCascade.toString() + "' OR ("
+					+ Relation.RELATION_PROPERTY + "." + RelationProperty.REFERENTIAL_INTEGRITY + " = '" + ReferentialIntegrity.onDeleteCascade.toString() + "' OR ("
-						+ Relation.RELATION_PROPERTY + "." + RelationProperty.REFERENTIAL_INTEGRITY + " = '" + ReferentiaIntegrity.onDeleteCascadeWhenOrphan.toString() + "' AND "
+						+ Relation.RELATION_PROPERTY + "." + RelationProperty.REFERENTIAL_INTEGRITY + " = '" + ReferentialIntegrity.onDeleteCascadeWhenOrphan.toString() + "' AND "
 						+ "inV().inE().size()=1"
 					+ ")"
 				+ ")";
@@ -1436,11 +1447,12 @@ public class EntityManagementImpl implements EntityManagement {
 				OrientEdge relation = iterator.next();
 				ODocument oDocument = relation.getInVertex().getRecord();
 				oDocument.delete();
+				relation.remove();
 			}
 		}
 		
 		resource.remove();
-
+		
 	}
 	
 	@Override

src/test/java/org/gcube/informationsystem/resourceregistry/resources/impl/ReferentialIntegrityTest.java

@@ -0,0 +1,35 @@
+/**
+ * 
+ */
+package org.gcube.informationsystem.resourceregistry.resources.impl;
+
+import java.util.UUID;
+
+import org.gcube.common.scope.api.ScopeProvider;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ *
+ */
+public class ReferentialIntegrityTest {
+
+	protected EntityManagementImpl entityManagementImpl;
+
+	@Before
+	public void before(){
+		ScopeProvider.instance.set("/gcube/devNext");
+	}
+	
+	
+	public ReferentialIntegrityTest() {
+		entityManagementImpl = new EntityManagementImpl();
+	}
+	
+	@Test
+	public void test() throws Exception{
+		
+	}
+	
+}

src/test/java/org/gcube/informationsystem/resourceregistry/resources/impl/SmartgearResourcesTest.java

@@ -132,7 +132,7 @@ public class SmartgearResourcesTest {
 		networkingFacet.setAdditionalProperty("Port", 8080);
 		
 		RelationProperty relationProperty = new RelationPropertyImpl();
-		relationProperty.setReferentialIntegrity(RelationProperty.ReferentiaIntegrity.onDeleteCascadeWhenOrphan);
+		relationProperty.setReferentialIntegrity(RelationProperty.ReferentialIntegrity.onDeleteCascadeWhenOrphan);
 		
 		IsIdentifiedBy<HostingNode, NetworkingFacet> isIdentifiedBy = 
 				new IsIdentifiedByImpl<>(hostingNode, networkingFacet, relationProperty);