1 files changed, 13 insertions, 52 deletions
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/utils/PropertyDataDefinitionBuilder.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/utils/PropertyDataDefinitionBuilder.java
index e7ed170414..85b2228933 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/utils/PropertyDataDefinitionBuilder.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/utils/PropertyDataDefinitionBuilder.java
@@ -1,68 +1,29 @@
 package org.openecomp.sdc.be.components.utils;
 
-import java.util.ArrayList;
-
-import org.openecomp.sdc.be.datatypes.elements.GetInputValueDataDefinition;
-import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
-import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
+import org.openecomp.sdc.be.model.PropertyConstraint;
 import org.openecomp.sdc.be.model.PropertyDefinition;
 
-public class PropertyDataDefinitionBuilder {
-
-    private PropertyDefinition propertyDefinition;
-
-    public PropertyDataDefinitionBuilder() {
-        propertyDefinition = new PropertyDefinition();
-    }
-
-    public PropertyDataDefinitionBuilder setUniqueId(String id) {
-        this.propertyDefinition.setUniqueId(id);
-        return this;
-    }
-
-    public PropertyDataDefinitionBuilder setName(String name) {
-        this.propertyDefinition.setName(name);
-        return this;
-    }
+import java.util.List;
 
-    public PropertyDataDefinitionBuilder setValue(String value) {
-        this.propertyDefinition.setValue(value);
-        return this;
-    }
+public class PropertyDataDefinitionBuilder extends PropertyDataDefinitionAbstractBuilder<PropertyDefinition, PropertyDataDefinitionBuilder> {
 
-    public PropertyDataDefinitionBuilder setDefaultValue(String value) {
-        this.propertyDefinition.setDefaultValue(value);
+    protected PropertyDataDefinitionBuilder self() {
         return this;
     }
 
-    public PropertyDataDefinitionBuilder setType(String type) {
-        this.propertyDefinition.setType(type);
-        return this;
+    @Override
+    PropertyDefinition propertyDefinition() {
+        return new PropertyDefinition();
     }
 
-    public PropertyDataDefinitionBuilder setSchemaType(String type) {
-        if (propertyDefinition.getSchema() == null) {
-            propertyDefinition.setSchema(new SchemaDefinition());
-        }
-        if (propertyDefinition.getSchema().getProperty() == null) {
-            propertyDefinition.getSchema().setProperty(new PropertyDataDefinition());
-        }
-        propertyDefinition.getSchema().getProperty().setType(type);
-        return this;
+    @Override
+    public PropertyDefinition build() {
+        return propertyDefinition;
     }
 
-    public PropertyDataDefinitionBuilder addGetInputValue(String inputName) {
-        GetInputValueDataDefinition getInputValueDataDefinition = new GetInputValueDataDefinition();
-        getInputValueDataDefinition.setInputName(inputName);
-        getInputValueDataDefinition.setInputId(inputName);
-        if (propertyDefinition.getGetInputValues() == null) {
-            propertyDefinition.setGetInputValues(new ArrayList<>());
-        }
-        propertyDefinition.getGetInputValues().add(getInputValueDataDefinition);
-        return this;
+    public PropertyDataDefinitionBuilder setConstraints(List<PropertyConstraint> constraints) {
+        propertyDefinition.setConstraints(constraints);
+        return self();
     }
 
-    public PropertyDefinition build() {
-        return propertyDefinition;
-    }
 }