1 files changed, 14 insertions, 99 deletions

diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/utils/ResourceBuilder.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/utils/ResourceBuilder.java
index 3d4a29da71..25468af3c9 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/utils/ResourceBuilder.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/utils/ResourceBuilder.java
@@ -1,79 +1,26 @@
 package org.openecomp.sdc.be.components.utils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.ComponentInstanceInput;
-import org.openecomp.sdc.be.model.ComponentInstanceProperty;
-import org.openecomp.sdc.be.model.InputDefinition;
 import org.openecomp.sdc.be.model.PropertyDefinition;
-import org.openecomp.sdc.be.model.RequirementCapabilityRelDef;
 import org.openecomp.sdc.be.model.Resource;
 
-public class ResourceBuilder {
-
-    private Resource resource;
-
-    public ResourceBuilder() {
-        this.resource = new Resource();
-    }
-
-    public ResourceBuilder(Resource resource) {
-        this.resource = resource;
-    }
-
-    public ResourceBuilder setUniqueId(String id) {
-        resource.setUniqueId(id);
-        return this;
-    }
-
-    public ResourceBuilder setInvariantUUid(String invariantUUid) {
-        resource.setInvariantUUID(invariantUUid);
-        return this;
-    }
-
-    public ResourceBuilder setName(String name) {
-        resource.setName(name);
-        return this;
-    }
-
-    public ResourceBuilder setComponentType(ComponentTypeEnum type) {
-        resource.setComponentType(type);
-        return this;
-    }
+import java.util.ArrayList;
 
-    public ResourceBuilder setSystemName(String systemName) {
-        resource.setSystemName(systemName);
-        return this;
-    }
+public class ResourceBuilder extends ComponentBuilder<Resource, ResourceBuilder> {
 
-    public ResourceBuilder addComponentInstance(ComponentInstance componentInstance) {
-        if (resource.getComponentInstances() == null) {
-            resource.setComponentInstances(new ArrayList<>());
-        }
-        resource.getComponentInstances().add(componentInstance);
-        return this;
-    }
+    private Resource resource;
 
-    public ResourceBuilder addInput(InputDefinition input) {
-        if (resource.getInputs() == null) {
-            resource.setInputs(new ArrayList<>());
-        }
-        resource.getInputs().add(input);
-        return this;
+    @Override
+    protected Resource component() {
+        resource = new Resource();
+        return resource;
     }
 
-    public ResourceBuilder addInput(String inputName) {
-        InputDefinition inputDefinition = new InputDefinition();
-        inputDefinition.setName(inputName);
-        inputDefinition.setUniqueId(inputName);
-        this.addInput(inputDefinition);
+    @Override
+    protected ComponentBuilder<Resource, ResourceBuilder> self() {
         return this;
     }
 
-    public ResourceBuilder addProperty(PropertyDefinition propertyDefinition) {
+    ResourceBuilder addProperty(PropertyDefinition propertyDefinition) {
         if (resource.getProperties() == null) {
             resource.setProperties(new ArrayList<>());
         }
@@ -81,46 +28,14 @@ public class ResourceBuilder {
         return this;
     }
 
-    public ResourceBuilder addInstanceProperty(String instanceId, ComponentInstanceProperty prop) {
-        if (resource.getComponentInstancesProperties() == null) {
-            resource.setComponentInstancesProperties(new HashMap<>());
-        }
-        resource.getComponentInstancesProperties().computeIfAbsent(instanceId, key -> new ArrayList<>()).add(prop);
-        return this;
-    }
-
-    public ResourceBuilder addInstanceProperty(String instanceId, String propName) {
-        ComponentInstanceProperty componentInstanceProperty = new ComponentInstanceProperty();
-        componentInstanceProperty.setName(propName);
-        this.addInstanceProperty(instanceId, componentInstanceProperty);
-        return this;
-    }
 
-    public ResourceBuilder addInstanceInput(String instanceId, ComponentInstanceInput prop) {
-        if (resource.getComponentInstancesInputs() == null) {
-            resource.setComponentInstancesInputs(new HashMap<>());
-        }
-        resource.getComponentInstancesInputs().computeIfAbsent(instanceId, key -> new ArrayList<>()).add(prop);
-        return this;
-    }
 
-    public ResourceBuilder addInstanceInput(String instanceId, String propName) {
-        ComponentInstanceInput componentInstanceInput = new ComponentInstanceInput();
-        componentInstanceInput.setName(propName);
-        this.addInstanceInput(instanceId, componentInstanceInput);
-        return this;
+    public ResourceBuilder() {
+        super();
     }
 
-    public ResourceBuilder addRelationship(RequirementCapabilityRelDef requirementCapabilityRelDef) {
-        if (resource.getComponentInstancesRelations() == null) {
-            resource.setComponentInstancesRelations(new ArrayList<>());
-        }
-        resource.getComponentInstancesRelations().add(requirementCapabilityRelDef);
-        return this;
+    public ResourceBuilder(Resource resource) {
+        super(resource);
     }
 
-
-    public Resource build() {
-        return resource;
-    }
 }