Fix op policy payload

[clamp.git] / src / main / java / org / onap / clamp / policy / operational / OperationalPolicy.java

diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
index b2f6109..2ce5aff 100644 (file)
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
@@ -183,13 +183,20 @@ public class OperationalPolicy implements Serializable, Policy {
         return (new Yaml()).dump(jsonMap);
     }
 
+    public String createPolicyPayloadYamlLegacy() {
+        Gson gson = new GsonBuilder().create();
+        Map<?, ?> jsonMap = gson.fromJson(gson.toJson(this.configurationsJson.get("operational_policy")), Map.class);
+        return (new Yaml()).dump(jsonMap);
+    }
+
     @Override
     public String createPolicyPayload() throws UnsupportedEncodingException {
 
         // Now the Yaml payload must be injected in a json ...
         JsonObject payload = new JsonObject();
         payload.addProperty("policy-id", this.getName());
-        payload.addProperty("content", URLEncoder.encode(createPolicyPayloadYaml(), StandardCharsets.UTF_8.toString()));
+        payload.addProperty("content",
+            URLEncoder.encode(createPolicyPayloadYamlLegacy(), StandardCharsets.UTF_8.toString()));
         return new GsonBuilder().setPrettyPrinting().create().toJson(payload);
     }
 
@@ -206,7 +213,7 @@ public class OperationalPolicy implements Serializable, Policy {
             for (Entry<String, JsonElement> guardElem : guardsList.getAsJsonObject().entrySet()) {
                 JsonObject guard = new JsonObject();
                 guard.addProperty("policy-id", guardElem.getKey());
-                guard.add("contents", guardElem.getValue());
+                guard.add("content", guardElem.getValue());
                 result.put(guardElem.getKey(), new GsonBuilder().create().toJson(guard));
             }
         }