Fix assigning substitution filter property to service property

[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / components / validation / NodeFilterValidator.java

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 c1eaf60..e62893a 100644 (file)
--- 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<Boolean, ResponseFormat> validateComponentPropertyConstraint(final Component component, final UIConstraint uiConstraint) {
         String source = SOURCE;
         final List<PropertyDefinition> propertyDefinitions = component.getProperties();
-        List<? extends PropertyDefinition> sourcePropertyDefinition =
-            component.getName().equals(uiConstraint.getSourceName()) && propertyDefinitions != null ? propertyDefinitions : Collections.emptyList();
-        if (CollectionUtils.isNotEmpty(sourcePropertyDefinition)) {
-            final Optional<? extends PropertyDefinition> sourceSelectedProperty = sourcePropertyDefinition.stream()
+        if (CollectionUtils.isNotEmpty(propertyDefinitions)) {
+            final Optional<? extends PropertyDefinition> sourceSelectedProperty = propertyDefinitions.stream()
                 .filter(property -> uiConstraint.getValue().equals(property.getName())).findFirst();
             final Optional<? extends PropertyDefinition> targetComponentProperty = component.getProperties().stream()
                 .filter(property -> uiConstraint.getServicePropertyName().equals(property.getName())).findFirst();