Support TOSCA functions in Node Filters

[sdc.git] / common-be / src / main / java / org / openecomp / sdc / be / datatypes / elements / SubstitutionFilterPropertyDataDefinition.java

diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementSubstitutionFilterPropertyDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/SubstitutionFilterPropertyDataDefinition.java
similarity index 63%
rename from common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementSubstitutionFilterPropertyDataDefinition.java
rename to common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/SubstitutionFilterPropertyDataDefinition.java
index b1b53bb..977c374 100644 (file)
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementSubstitutionFilterPropertyDataDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/SubstitutionFilterPropertyDataDefinition.java
@@ -20,24 +20,25 @@ package org.openecomp.sdc.be.datatypes.elements;
 
 import java.io.Serializable;
 import java.util.List;
-import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
 
-public class RequirementSubstitutionFilterPropertyDataDefinition extends ToscaDataDefinition implements Serializable {
+public class SubstitutionFilterPropertyDataDefinition extends ToscaDataDefinition implements Serializable {
 
-    public List<String> getConstraints() {
-        return (List<String>) getToscaPresentationValue(JsonPresentationFields.PROPERTY_FILTER_CONSTRAINT);
+    private final PropertyFilterDataDefinition propertyFilterDataDefinition = new PropertyFilterDataDefinition();
+
+    public List<PropertyFilterConstraintDataDefinition> getConstraints() {
+        return propertyFilterDataDefinition.getConstraints();
     }
 
-    public void setConstraints(final List<String> constraints) {
-        setToscaPresentationValue(JsonPresentationFields.PROPERTY_FILTER_CONSTRAINT, constraints);
+    public void setConstraints(final List<PropertyFilterConstraintDataDefinition> constraints) {
+        propertyFilterDataDefinition.setConstraints(constraints);
     }
 
     public String getName() {
-        return (String) getToscaPresentationValue(JsonPresentationFields.PROPERTY_FILTER_NAME);
+        return propertyFilterDataDefinition.getName();
     }
 
     public void setName(final String name) {
-        setToscaPresentationValue(JsonPresentationFields.PROPERTY_FILTER_NAME, name);
+        propertyFilterDataDefinition.setName(name);
     }
 }