From 113c3ceb9ea6c05d79a94ffaad958cdab8b2d4e7 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Mon, 13 Sep 2021 16:48:29 +0200
Subject: [PATCH] Not including source in consistsOf when serialising Resource
 #22001

---
 .../contexts/entities/ContextManagement.java   |  4 +++-
 .../relations/IsParentOfManagement.java        |  9 +++------
 .../relations/RelationElementManagement.java   | 18 ++++++++++++++----
 .../model/entities/ResourceManagement.java     |  1 +
 .../model/relations/RelationManagement.java    |  8 +++++++-
 5 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/entities/ContextManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/entities/ContextManagement.java
index 1d2d9b0..9db3857 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/entities/ContextManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/entities/ContextManagement.java
@@ -181,7 +181,9 @@ public class ContextManagement extends EntityElementManagement<Context, EntityTy
 			try {
 				IsParentOfManagement isParentOfManagement = new IsParentOfManagement(oDatabaseDocument);
 				isParentOfManagement.setElement(edge);
-				JsonNode isParentOf = isParentOfManagement.createCompleteJsonNode(true, false);
+				isParentOfManagement.includeSource(true);
+				isParentOfManagement.includeTarget(false);
+				JsonNode isParentOf = isParentOfManagement.createCompleteJsonNode();
 				if (isParentOf != null) {
 					((ObjectNode) context).replace(Context.PARENT_PROPERTY, isParentOf);
 				}
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/relations/IsParentOfManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/relations/IsParentOfManagement.java
index 39aea9b..d188025 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/relations/IsParentOfManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/relations/IsParentOfManagement.java
@@ -39,6 +39,8 @@ public class IsParentOfManagement extends RelationElementManagement<ContextManag
 		this();
 		this.oDatabaseDocument = oDatabaseDocument;
 		getWorkingContext();
+		includeSource = false;
+		includeTarget = true;
 	}
 	
 	@Override
@@ -66,12 +68,7 @@ public class IsParentOfManagement extends RelationElementManagement<ContextManag
 	}
 
 	@Override
-	protected JsonNode createCompleteJsonNode() throws ResourceRegistryException {
-		return createCompleteJsonNode(false, true);
-	}
-
-	@Override
-	public JsonNode createCompleteJsonNode(boolean includeSource, boolean includeTarget)
+	public JsonNode createCompleteJsonNode()
 			throws ResourceRegistryException {
 		JsonNode relation = serializeSelfAsJsonNode();
 
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/RelationElementManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/RelationElementManagement.java
index 1b79539..f7aa62c 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/RelationElementManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/RelationElementManagement.java
@@ -40,6 +40,9 @@ public abstract class RelationElementManagement<SEM extends EntityElementManagem
 	protected SEM sourceEntityManagement;
 	protected TEM targetEntityManagement;
 	
+	protected boolean includeSource;
+	protected boolean includeTarget;
+	
 	protected RelationElementManagement(AccessType accessType, Class<? extends EntityElement> sourceEntityClass, Class<? extends EntityElement> targetEntityClass) {
 		super(accessType);
 		
@@ -57,6 +60,17 @@ public abstract class RelationElementManagement<SEM extends EntityElementManagem
 		
 		this.sourceEntityManagement = null;
 		this.targetEntityManagement = null;
+		
+		this.includeSource = true;
+		this.includeTarget = true;
+	}
+	
+	public void includeSource(boolean includeSource) {
+		this.includeSource = includeSource;
+	}
+	
+	public void includeTarget(boolean includeTarget) {
+		this.includeTarget = includeTarget;
 	}
 	
 	protected RelationElementManagement(AccessType accessType, Class<? extends EntityElement> sourceEntityClass, Class<? extends EntityElement> targetEntityClass, SecurityContext workingContext, ODatabaseDocument orientGraph) {
@@ -95,10 +109,6 @@ public abstract class RelationElementManagement<SEM extends EntityElementManagem
 	
 	@Override
 	protected JsonNode createCompleteJsonNode() throws ResourceRegistryException {
-		return createCompleteJsonNode(true, true);
-	}
-	
-	protected JsonNode createCompleteJsonNode(boolean includeSource, boolean includeTarget) throws ResourceRegistryException {
 		JsonNode relation = serializeSelfAsJsonNode();
 		
 		try {
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/ResourceManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/ResourceManagement.java
index ec4648a..20e9650 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/ResourceManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/ResourceManagement.java
@@ -108,6 +108,7 @@ public class ResourceManagement extends EntityManagement<Resource, ResourceType>
 			
 			if(relationManagement instanceof ConsistsOfManagement) {
 				try {
+					relationManagement.includeSource(false);
 					JsonNode consistsOf = relationManagement.serializeAsJsonNode();
 					sourceResource = addConsistsOf(sourceResource, consistsOf);
 				} catch(ResourceRegistryException e) {
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 6017fbf..418c3d7 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
@@ -149,10 +149,12 @@ public abstract class RelationManagement<T extends EntityManagement<? extends En
 		 * so this variable is initialised as true.
 		 */
 		this.honourPropagationConstraintsInContextSharing = true;
+		
 	}
 	
 	protected PropagationConstraint propagationConstraint;
 	
+	
 	@Override
 	public OEdge getElement() throws NotFoundException, AvailableInAnotherContextException, ResourceRegistryException {
 		try {
@@ -229,7 +231,9 @@ public abstract class RelationManagement<T extends EntityManagement<? extends En
 			if(this instanceof IsRelatedToManagement) {
 				sourceResource = resourceManagement.createCompleteJsonNode();
 			} else if(this instanceof ConsistsOfManagement) {
-				sourceResource = resourceManagement.serializeSelfAsJsonNode();
+				if(includeSource) {
+					sourceResource = resourceManagement.serializeSelfAsJsonNode();
+				}
 			} else {
 				String error = String.format("{%s is not a %s nor a %s. %s", this,
 						IsRelatedToManagement.class.getSimpleName(), ConsistsOfManagement.class.getSimpleName(),
@@ -793,5 +797,7 @@ public abstract class RelationManagement<T extends EntityManagement<? extends En
 		Collection<JsonNode> collection = serializeEdges(edges, false);
 		return serializeJsonNodeCollectionAsString(collection);
 	}
+
+	
 	
 }