diff options
Diffstat (limited to 'catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/RelationsComparator.java')
-rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/RelationsComparator.java | 55 |
1 files changed, 25 insertions, 30 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 index 47f71cb05d..0c64538484 100644 --- 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 @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,30 +17,27 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - 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; -import java.util.List; -import java.util.Map; -import java.util.Optional; - @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 + * @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) { + public boolean isRelationsChanged(Resource oldResource, Resource newResource) { Map<String, List<RequirementCapabilityRelDef>> oldRelationsByInstance = oldResource.groupRelationsFromCsarByInstanceName(oldResource); Map<String, List<RequirementCapabilityRelDef>> newRelationsByInstance = newResource.groupRelationsFromCsarByInstanceName(newResource); for (Map.Entry<String, List<RequirementCapabilityRelDef>> relationByInst : newRelationsByInstance.entrySet()) { @@ -51,48 +48,48 @@ public class RelationsComparator { } } return false; - } - private boolean isInstanceRelationsChanged(Resource oldResource, List<RequirementCapabilityRelDef> oldRelations, Resource newResource, List<RequirementCapabilityRelDef> newRelations) { - if (oldRelations == null || oldRelations.size() != newRelations.size()){ + 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) { + private boolean findRelation(Resource oldResource, List<RequirementCapabilityRelDef> oldRelations, Resource newResource, + RequirementCapabilityRelDef newRelation) { for (RequirementCapabilityRelDef oldRelation : oldRelations) { RelationshipInfo oldRelationship = oldRelation.resolveSingleRelationship().getRelation(); RelationshipInfo newRelationship = newRelation.resolveSingleRelationship().getRelation(); - if (oldRelationship != null && newRelationship != null && isRelationEqual(oldRelationship, newRelationship) && isRelationToNodeEquals(oldResource, oldRelation, newResource, newRelation)) { + 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) { + 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().getInvariantName().equals(newRelationToNode.get().getInvariantName()); + return oldRelationToNode.isPresent() && newRelationToNode.isPresent() && oldRelationToNode.get().getInvariantName() + .equals(newRelationToNode.get().getInvariantName()); } private boolean isRelationEqual(RelationshipInfo oldRelationship, RelationshipInfo newRelationship) { - return isRelationshipTypeEquals(oldRelationship, newRelationship) && - isRelationshipCapabilityEquals(oldRelationship, newRelationship) && - isRelationshipReqNameEquals(oldRelationship, 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){ + if (oldRelationship.getCapabilityUid() != null && newRelationship.getCapabilityUid() != null) { return oldRelationship.getCapabilityUid().equals(newRelationship.getCapabilityUid()); - } - else if(oldRelationship.getCapabilityUid() == null && newRelationship.getCapabilityUid() == null){ + } else if (oldRelationship.getCapabilityUid() == null && newRelationship.getCapabilityUid() == null) { return true; } return false; @@ -103,13 +100,11 @@ public class RelationsComparator { } private boolean isRelationshipReqNameEquals(RelationshipInfo oldRelationship, RelationshipInfo newRelationship) { - if(oldRelationship.getRequirement() != null && newRelationship.getRequirement() != null){ + if (oldRelationship.getRequirement() != null && newRelationship.getRequirement() != null) { return oldRelationship.getRequirement().equals(newRelationship.getRequirement()); - } - else if(oldRelationship.getRequirement() == null && newRelationship.getRequirement() == null){ + } else if (oldRelationship.getRequirement() == null && newRelationship.getRequirement() == null) { return true; } return false; } - } |