1 files changed, 95 insertions, 0 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/RelationsComparator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/RelationsComparator.java
new file mode 100644
index 0000000000..6c20e501f9
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/RelationsComparator.java
@@ -0,0 +1,95 @@
+package org.openecomp.sdc.be.components.merge;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.model.RelationshipInfo;
+import org.openecomp.sdc.be.model.RequirementCapabilityRelDef;
+import org.openecomp.sdc.be.model.Resource;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RelationsComparator {
+
+    /**
+     *
+     * @param oldResource the old resource
+     * @param newResource the new resource
+     * @return true if there was a change in one of the relations between the old and new resource
+     * a change in relation is determine by comparing the relations type, node, capability and requirement name
+     */
+    public boolean isRelationsChanged(Resource oldResource,  Resource newResource) {
+        Map<String, List<RequirementCapabilityRelDef>> oldRelationsByInstance = oldResource.groupRelationsByInstanceName(oldResource);
+        Map<String, List<RequirementCapabilityRelDef>> newRelationsByInstance = newResource.groupRelationsByInstanceName(newResource);
+        for (Map.Entry<String, List<RequirementCapabilityRelDef>> relationByInst : newRelationsByInstance.entrySet()) {
+            List<RequirementCapabilityRelDef> oldRelations = oldRelationsByInstance.get(relationByInst.getKey());
+            List<RequirementCapabilityRelDef> newRelations = relationByInst.getValue();
+            if (isInstanceRelationsChanged(oldResource, oldRelations, newResource, newRelations)) {
+                return true;
+            }
+        }
+        return false;
+
+    }
+
+    private boolean isInstanceRelationsChanged(Resource oldResource, List<RequirementCapabilityRelDef> oldRelations, Resource newResource, List<RequirementCapabilityRelDef> newRelations) {
+        if (oldRelations == null || oldRelations.size() != newRelations.size()){
+            return true;
+        }
+        return newRelations.stream().anyMatch(newRelation -> !findRelation(oldResource, oldRelations, newResource, newRelation));
+    }
+
+
+
+    private boolean findRelation(Resource oldResource, List<RequirementCapabilityRelDef> oldRelations, Resource newResource, RequirementCapabilityRelDef newRelation) {
+        for (RequirementCapabilityRelDef oldRelation : oldRelations) {
+            RelationshipInfo oldRelationship = oldRelation.getSingleRelationship().getRelation();
+            RelationshipInfo newRelationship = newRelation.getSingleRelationship().getRelation();
+            if (oldRelationship != null && newRelationship != null && isRelationEqual(oldRelationship, newRelationship) && isRelationToNodeEquals(oldResource, oldRelation, newResource, newRelation)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean isRelationToNodeEquals(Resource oldResource, RequirementCapabilityRelDef oldRelation, Resource newResource, RequirementCapabilityRelDef newRelation) {
+        String oldToNodeId = oldRelation.getToNode();
+        String newToNodeId = newRelation.getToNode();
+        Optional<ComponentInstance> oldRelationToNode = oldResource.getComponentInstanceById(oldToNodeId);
+        Optional<ComponentInstance> newRelationToNode = newResource.getComponentInstanceById(newToNodeId);
+        return oldRelationToNode.isPresent() && newRelationToNode.isPresent() && oldRelationToNode.get().getName().equals(newRelationToNode.get().getName());
+    }
+
+    private boolean isRelationEqual(RelationshipInfo oldRelationship, RelationshipInfo newRelationship) {
+        return isRelationshipTypeEquals(oldRelationship, newRelationship) &&
+               isRelationshipCapabilityEquals(oldRelationship, newRelationship) &&
+               isRelationshipReqNameEquals(oldRelationship, newRelationship);
+    }
+
+    private boolean isRelationshipCapabilityEquals(RelationshipInfo oldRelationship, RelationshipInfo newRelationship) {
+        if(oldRelationship.getCapabilityUid() !=null && newRelationship.getCapabilityUid() != null){
+        	return oldRelationship.getCapabilityUid().equals(newRelationship.getCapabilityUid());
+        }
+        else if(oldRelationship.getCapabilityUid() == null && newRelationship.getCapabilityUid() == null){
+        	return true;
+        }
+    	return false;
+    }
+
+    private boolean isRelationshipTypeEquals(RelationshipInfo oldRelationship, RelationshipInfo newRelationship) {
+        return oldRelationship.getRelationship().getType().equals(newRelationship.getRelationship().getType());
+    }
+
+    private boolean isRelationshipReqNameEquals(RelationshipInfo oldRelationship, RelationshipInfo newRelationship) {
+        if(oldRelationship.getRequirement() != null && newRelationship.getRequirement() != null){
+        	return oldRelationship.getRequirement().equals(newRelationship.getRequirement());
+        }
+        else if(oldRelationship.getRequirement() == null && newRelationship.getRequirement() == null){
+        	return true;
+        }
+    	return false;
+    }
+
+}