Add updateGlobalPropertiesJson controller

Change-Id: I83d474a3616462cdb0cc31eadae3a189dd275683
Issue-ID: CLAMP-301
Signed-off-by: michal.banka <michal.banka@nokia.com>

3 files changed, 45 insertions, 16 deletions

diff --git a/src/main/java/org/onap/clamp/loop/LoopController.java b/src/main/java/org/onap/clamp/loop/LoopController.java
index 7e4517492..2bcce1e37 100644
--- a/src/main/java/org/onap/clamp/loop/LoopController.java
+++ b/src/main/java/org/onap/clamp/loop/LoopController.java
@@ -24,6 +24,8 @@
 package org.onap.clamp.loop;
 
 import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
 
 import java.lang.reflect.Type;
@@ -60,13 +62,17 @@ public class LoopController {
     public Loop updateOperationalPolicies(String loopName, JsonArray operationalPoliciesJson) {
         List<OperationalPolicy> operationalPolicies = JsonUtils.GSON
             .fromJson(operationalPoliciesJson, OPERATIONAL_POLICY_TYPE);
-        return loopService.updateOperationalPolicies(loopName, operationalPolicies);
+        return loopService.updateAndSaveOperationalPolicies(loopName, operationalPolicies);
     }
 
     public Loop updateMicroservicePolicies(String loopName, JsonArray microServicePoliciesJson) {
         List<MicroServicePolicy> microservicePolicies = JsonUtils.GSON
             .fromJson(microServicePoliciesJson, MICROSERVICE_POLICY_TYPE);
-        return loopService.updateMicroservicePolicies(loopName, microservicePolicies);
+        return loopService.updateAndSaveMicroservicePolicies(loopName, microservicePolicies);
+    }
+
+    public Loop updateGlobalPropertiesJson(String loopName, JsonObject globalProperties){
+        return loopService.updateAndSaveGlobalPropertiesJson(loopName, globalProperties);
     }
 
     public String getSVGRepresentation(String loopName) {
diff --git a/src/main/java/org/onap/clamp/loop/LoopService.java b/src/main/java/org/onap/clamp/loop/LoopService.java
index 91b4bdf89..cf2f4c669 100644
--- a/src/main/java/org/onap/clamp/loop/LoopService.java
+++ b/src/main/java/org/onap/clamp/loop/LoopService.java
@@ -26,6 +26,8 @@ package org.onap.clamp.loop;
 import java.util.List;
 import java.util.Set;
 import javax.persistence.EntityNotFoundException;
+
+import com.google.gson.JsonObject;
 import org.onap.clamp.policy.microservice.MicroservicePolicyService;
 import org.onap.clamp.policy.operational.OperationalPolicyService;
 import org.onap.clamp.policy.microservice.MicroServicePolicy;
@@ -66,22 +68,42 @@ public class LoopService {
         return closedLoopByName.getSvgRepresentation();
     }
 
-    Loop updateOperationalPolicies(String loopName, List<OperationalPolicy> newOperationalPolicies) {
+    Loop updateAndSaveOperationalPolicies(String loopName, List<OperationalPolicy> newOperationalPolicies) {
         Loop loop = findClosedLoopByName(loopName);
-        Set<OperationalPolicy> newPolicies = operationalPolicyService
-            .updatePolicies(loop, newOperationalPolicies);
+        updateOperationalPolicies(loop, newOperationalPolicies);
+        return loopsRepository.save(loop);
+    }
 
-        loop.setOperationalPolicies(newPolicies);
+    Loop updateAndSaveMicroservicePolicies(String loopName, List<MicroServicePolicy> newMicroservicePolicies) {
+        Loop loop = findClosedLoopByName(loopName);
+        updateMicroservicePolicies(loop, newMicroservicePolicies);
         return loopsRepository.save(loop);
     }
 
-    Loop updateMicroservicePolicies(String loopName, List<MicroServicePolicy> newMicroservicePolicies) {
+    Loop updateAndSaveGlobalPropertiesJson(String loopName, JsonObject newGlobalPropertiesJson) {
         Loop loop = findClosedLoopByName(loopName);
-        Set<MicroServicePolicy> newPolicies = microservicePolicyService
-            .updatePolicies(loop, newMicroservicePolicies);
+        updateGlobalPropertiesJson(loop, newGlobalPropertiesJson);
+        return loopsRepository.save(loop);
+    }
 
+    private Loop updateOperationalPolicies(Loop loop, List<OperationalPolicy> newOperationalPolicies) {
+        Set<OperationalPolicy> newPolicies = operationalPolicyService
+                .updatePolicies(loop, newOperationalPolicies);
+
+        loop.setOperationalPolicies(newPolicies);
+        return loop;
+    }
+
+    private Loop updateMicroservicePolicies(Loop loop, List<MicroServicePolicy> newMicroservicePolicies) {
+        Set<MicroServicePolicy> newPolicies = microservicePolicyService
+                .updatePolicies(loop, newMicroservicePolicies);
         loop.setMicroServicePolicies(newPolicies);
-        return loopsRepository.save(loop);
+        return loop;
+    }
+
+    private Loop updateGlobalPropertiesJson(Loop loop, JsonObject newGlobalPropertiesJson) {
+        loop.setGlobalPropertiesJson(newGlobalPropertiesJson);
+        return loop;
     }
 
     private Loop findClosedLoopByName(String loopName) {
diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
index 442375278..abc7dc091 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -20,13 +20,14 @@
             <to
                 uri="bean:org.onap.clamp.loop.LoopController?method=getSVGRepresentation(${header.loopName})" />
         </get>
-        <post uri="/v2/loop/globalProperties/{loopName}"
-            type="com.google.gson.JsonArray"
-            consumes="application/json"
-            outType="org.onap.clamp.loop.Loop"
-            produces="application/json">
+
+        <post uri="/v2/loop/updateGlobalProperties/{loopName}"
+              type="com.google.gson.JsonObject"
+              consumes="application/json"
+              outType="org.onap.clamp.loop.Loop"
+              produces="application/json">
             <to
-                uri="bean:org.onap.clamp.loop.LoopController?method=updateOperationalPolicies(${header.loopName},${body})" />
+                    uri="bean:org.onap.clamp.loop.LoopController?method=updateGlobalPropertiesJson(${header.loopName},${body})" />
         </post>
         <post uri="/v2/loop/updateOperationalPolicies/{loopName}"
             type="com.google.gson.JsonArray"