X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=openecomp-be%2Flib%2Fopenecomp-sdc-translator-lib%2Fopenecomp-sdc-translator-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fsdc%2Ftranslator%2Fservices%2Fheattotosca%2FConsolidationTypesConnectivity.java;fp=openecomp-be%2Flib%2Fopenecomp-sdc-translator-lib%2Fopenecomp-sdc-translator-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fsdc%2Ftranslator%2Fservices%2Fheattotosca%2FConsolidationTypesConnectivity.java;h=628f204da583690992d20738ed63f74540cff650;hb=991e8cdeb0f49573d7e849da741251027ea4de6c;hp=7b258d651f268865f0f18109d658debd16a8f8fd;hpb=bedf1ad331ac7a19339197fef19c5f7c096e28d3;p=sdc.git diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationTypesConnectivity.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationTypesConnectivity.java index 7b258d651f..628f204da5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationTypesConnectivity.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationTypesConnectivity.java @@ -27,13 +27,7 @@ public class ConsolidationTypesConnectivity { } static boolean isDependsOnRelationshipValid(ConsolidationEntityType source, ConsolidationEntityType target) { - return !eitherSourceOrTargetIsNested(source, target) - && (!entityToEntitiesWithoutRelationship.containsKey(source) - || !entityToEntitiesWithoutRelationship.containsEntry(source, target)); - } - - private static boolean eitherSourceOrTargetIsNested(ConsolidationEntityType source, - ConsolidationEntityType target) { - return ConsolidationEntityType.isEntityTypeNested(source) || ConsolidationEntityType.isEntityTypeNested(target); + return !entityToEntitiesWithoutRelationship.containsKey(source) + || !entityToEntitiesWithoutRelationship.containsEntry(source, target); } }