X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Futil%2Fdrawing%2FClampGraphBuilder.java;h=846b3ab2d42fb3a17d3d86e4d0aae26164a7b0eb;hb=635445a5f262464c88287e5b5ceace4abf9cc4bc;hp=6ce89873b601fb605df24e1cac235cc7a54956cf;hpb=5d03e8b55ff7780079085184f6d30a4d0a26a4a7;p=clamp.git

diff --git a/src/main/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilder.java b/src/main/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilder.java
index 6ce89873..846b3ab2 100755
--- a/src/main/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilder.java
+++ b/src/main/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilder.java
@@ -24,16 +24,17 @@
 
 package org.onap.clamp.clds.util.drawing;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import org.onap.clamp.clds.sdc.controller.installer.BlueprintMicroService;
+import java.util.HashSet;
+import java.util.Set;
+import org.onap.clamp.loop.template.LoopElementModel;
+import org.onap.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.clamp.policy.operational.OperationalPolicy;
 
 public class ClampGraphBuilder {
-    private String policy;
+    private Set<OperationalPolicy> policies = new HashSet<>();
     private String collector;
-    private List<BlueprintMicroService> microServices = new ArrayList<>();
+    private Set<MicroServicePolicy> microServices = new HashSet<>();
+    private Set<LoopElementModel> loopElementModels = new HashSet<>();
     private final Painter painter;
 
     public ClampGraphBuilder(Painter painter) {
@@ -45,33 +46,62 @@ public class ClampGraphBuilder {
         return this;
     }
 
-    public ClampGraphBuilder policy(String policy) {
-        this.policy = policy;
+    public ClampGraphBuilder addPolicy(OperationalPolicy policy) {
+        this.policies.add(policy);
         return this;
     }
 
-    public ClampGraphBuilder addMicroService(BlueprintMicroService ms) {
+    public ClampGraphBuilder addAllPolicies(Set<OperationalPolicy> policies) {
+        this.policies.addAll(policies);
+        return this;
+    }
+
+    public ClampGraphBuilder addMicroService(MicroServicePolicy ms) {
         microServices.add(ms);
         return this;
     }
 
-    public ClampGraphBuilder addAllMicroServices(List<BlueprintMicroService> msList) {
+    public ClampGraphBuilder addAllMicroServices(Set<MicroServicePolicy> msList) {
         microServices.addAll(msList);
         return this;
     }
 
+    /**
+     * This method adds all loop element specified in input to the current structure.
+     *
+     * @param loopElementModels A set of LoopElementModels
+     * @return Return the current ClampGraphBuilder
+     */
+    public ClampGraphBuilder addAllLoopElementModels(Set<LoopElementModel> loopElementModels) {
+        for (LoopElementModel elem : loopElementModels) {
+            this.addLoopElementModel(elem);
+        }
+        return this;
+    }
+
+    /**
+     * This method adds one loop element specified in input to the current structure.
+     *
+     * @param loopElementModel A LoopElementModels
+     * @return Return the current ClampGraphBuilder
+     */
+    public ClampGraphBuilder addLoopElementModel(LoopElementModel loopElementModel) {
+        if (LoopElementModel.MICRO_SERVICE_TYPE.equals(loopElementModel.getLoopElementType())) {
+            microServices.add(new MicroServicePolicy(loopElementModel.getName(),
+                    loopElementModel.getPolicyModels().first(), false, loopElementModel));
+        } else if (LoopElementModel.OPERATIONAL_POLICY_TYPE.equals(loopElementModel.getLoopElementType())) {
+            policies.add(new OperationalPolicy(loopElementModel.getName(), null, null,
+                    loopElementModel.getPolicyModels().first(), loopElementModel, null, null));
+        }
+        return this;
+    }
+
     /**
      * Build the SVG.
-     * 
+     *
      * @return Clamp graph (SVG)
      */
     public ClampGraph build() {
-        if (microServices.isEmpty()) {
-            throw new InvalidStateException("At least one microservice is required");
-        }
-        if (Objects.isNull(policy) || policy.trim().isEmpty()) {
-            throw new InvalidStateException("Policy element must be present");
-        }
-        return new ClampGraph(painter.doPaint(collector, microServices, policy));
+        return new ClampGraph(painter.doPaint(collector, microServices, policies));
     }
 }