From 46222aaa75ad7ebe957c06e05abe2b0e7ce579de Mon Sep 17 00:00:00 2001 From: JvD_Ericsson Date: Tue, 15 Mar 2022 08:16:40 +0000 Subject: Fix assigning substitution filter property to service property Issue-ID: SDC-3916 Signed-off-by: JvD_Ericsson Change-Id: I313c3ca7ef2492ee686bd7351d9477631665c722 --- .../openecomp/sdc/be/components/validation/NodeFilterValidator.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'catalog-be') diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/NodeFilterValidator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/NodeFilterValidator.java index c1eaf60ad0..e62893a148 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/NodeFilterValidator.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/NodeFilterValidator.java @@ -342,10 +342,8 @@ public class NodeFilterValidator { private Either validateComponentPropertyConstraint(final Component component, final UIConstraint uiConstraint) { String source = SOURCE; final List propertyDefinitions = component.getProperties(); - List sourcePropertyDefinition = - component.getName().equals(uiConstraint.getSourceName()) && propertyDefinitions != null ? propertyDefinitions : Collections.emptyList(); - if (CollectionUtils.isNotEmpty(sourcePropertyDefinition)) { - final Optional sourceSelectedProperty = sourcePropertyDefinition.stream() + if (CollectionUtils.isNotEmpty(propertyDefinitions)) { + final Optional sourceSelectedProperty = propertyDefinitions.stream() .filter(property -> uiConstraint.getValue().equals(property.getName())).findFirst(); final Optional targetComponentProperty = component.getProperties().stream() .filter(property -> uiConstraint.getServicePropertyName().equals(property.getName())).findFirst(); -- cgit 1.2.3-korg