Add code in UI to create new policy version

Add code to call the policy create backend endpoint + alert box to show status of the creation + Fix backend +

Issue-ID: POLICY-2928
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ia8f2506ecc692ad68111ebe7a55a92579b951908

2 files changed, 112 insertions, 104 deletions

diff --git a/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMerger.java b/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMerger.java
index cf3c1656c..44b11119b 100644
--- a/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMerger.java
+++ b/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMerger.java
@@ -105,9 +105,11 @@ public class PoliciesPdpMerger {
     /**
      * This method removes the pdp States added for one policy.
      *
-     * @param policyJsonNode The policy node in Json
+     * @param policyJsonNode The policy node Json as String
+     * @return The Json with pdp group info removed
      */
     public static JsonObject removePdpStatesOnePolicy(JsonObject policyJsonNode) {
+        //JsonObject policyJson = JsonUtils.GSON.fromJson(policyJsonNode, JsonObject.class);
         // Simply remove the nodes we have added.
         policyJsonNode.remove(PdpGroupsAnalyzer.ASSIGNED_PDP_GROUPS_INFO);
         policyJsonNode.remove(PdpGroupsAnalyzer.SUPPORTED_PDP_GROUPS_INFO);
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 bcad3ea33..f924a8a24 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -803,6 +803,107 @@
                 </doTry>
             </route>
         </post>
+        <get uri="/v2/templates"
+             outType="org.onap.policy.clamp.loop.template.LoopTemplate"
+             produces="application/json">
+            <route>
+                <removeHeaders pattern="*"/>
+                <doTry>
+                    <to
+                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Templates')"/>
+                    <to
+                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')"/>
+                    <to
+                            uri="bean:org.onap.policy.clamp.loop.template.LoopTemplatesService?method=getAllLoopTemplates()"/>
+                    <to
+                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
+                    <doCatch>
+                        <exception>java.lang.Exception</exception>
+                        <handled>
+                            <constant>true</constant>
+                        </handled>
+                        <to
+                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
+                        <log loggingLevel="ERROR"
+                             message="GET ALL templates request failed: ${exception.stacktrace}"/>
+                        <setHeader headerName="CamelHttpResponseCode">
+                            <constant>500</constant>
+                        </setHeader>
+                        <setBody>
+                            <simple>GET ALL templates FAILED</simple>
+                        </setBody>
+                    </doCatch>
+                </doTry>
+            </route>
+        </get>
+        <get uri="/v2/templates/{templateName}"
+             outType="org.onap.policy.clamp.loop.template.LoopTemplate"
+             produces="application/json">
+            <route>
+                <removeHeaders pattern="*"
+                               excludePattern="templateName"/>
+                <doTry>
+                    <to
+                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET a Template by NAME')"/>
+                    <to
+                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')"/>
+                    <to
+                            uri="bean:org.onap.policy.clamp.loop.template.LoopTemplatesService?method=getLoopTemplate(${header.templateName})"/>
+                    <to
+                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
+                    <doCatch>
+                        <exception>java.lang.Exception</exception>
+                        <handled>
+                            <constant>true</constant>
+                        </handled>
+                        <to
+                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
+                        <log loggingLevel="ERROR"
+                             message="GET Template request failed for template: ${header.templateName},  ${exception.stacktrace}"/>
+                        <setHeader headerName="CamelHttpResponseCode">
+                            <constant>500</constant>
+                        </setHeader>
+                        <setBody>
+                            <simple>GET Template FAILED</simple>
+                        </setBody>
+                    </doCatch>
+                </doTry>
+            </route>
+        </get>
+        <get uri="/v2/templates/names" outType="java.lang.String[]"
+             produces="application/json">
+            <route>
+                <removeHeaders pattern="*"/>
+                <doTry>
+                    <to
+                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Loop Template Names')"/>
+                    <to
+                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')"/>
+                    <to
+                            uri="bean:org.onap.policy.clamp.loop.template.LoopTemplatesService?method=getLoopTemplateNames()"/>
+                    <to
+                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
+                    <doCatch>
+                        <exception>java.lang.Exception</exception>
+                        <handled>
+                            <constant>true</constant>
+                        </handled>
+                        <to
+                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
+                        <log loggingLevel="ERROR"
+                             message="GET All Template names request failed for template:  ${exception.stacktrace}"/>
+                        <setHeader headerName="CamelHttpResponseCode">
+                            <constant>500</constant>
+                        </setHeader>
+                        <setBody>
+                            <simple>GET All Template names FAILED</simple>
+                        </setBody>
+                    </doCatch>
+                </doTry>
+            </route>
+        </get>
+
+        <!-- NON LOOP related endpoints -->
         <get uri="/v2/dictionary"
              outType="org.onap.policy.clamp.tosca.Dictionary" produces="application/json">
             <route>
@@ -1217,106 +1318,6 @@
             </route>
         </put>
 
-        <get uri="/v2/templates"
-             outType="org.onap.policy.clamp.loop.template.LoopTemplate"
-             produces="application/json">
-            <route>
-                <removeHeaders pattern="*"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Templates')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.template.LoopTemplatesService?method=getAllLoopTemplates()"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="GET ALL templates request failed: ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>GET ALL templates FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </get>
-        <get uri="/v2/templates/{templateName}"
-             outType="org.onap.policy.clamp.loop.template.LoopTemplate"
-             produces="application/json">
-            <route>
-                <removeHeaders pattern="*"
-                               excludePattern="templateName"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET a Template by NAME')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.template.LoopTemplatesService?method=getLoopTemplate(${header.templateName})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="GET Template request failed for template: ${header.templateName},  ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>GET Template FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </get>
-        <get uri="/v2/templates/names" outType="java.lang.String[]"
-             produces="application/json">
-            <route>
-                <removeHeaders pattern="*"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Loop Template Names')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.template.LoopTemplatesService?method=getLoopTemplateNames()"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="GET All Template names request failed for template:  ${exception.stacktrace}"/>
-                        <setHeader headerName="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>GET All Template names FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </get>
-
         <!-- Policy Related endpoints, not related to LOOP  -->
         <get uri="/v2/policies" outType="com.google.gson.JsonObject" produces="application/json">
             <route>
@@ -1360,11 +1361,13 @@
                 </doTry>
             </route>
         </get>
-        <!-- Update an existing policy, therefore it removes it from pdp first, delete it and then recreate it -->
-        <!--  TO BE DONE -->
 
         <!-- Create a new policy -->
-        <post uri="/v2/policies/{policyModelName}/{policyModelVersion}" outType="com.google.gson.JsonObject" produces="application/json">
+        <post uri="/v2/policies/{policyModelName}/{policyModelVersion}"
+              type="com.google.gson.JsonElement"
+              consumes="application/json"
+              outType="com.google.gson.JsonObject"
+              produces="application/json">
             <route>
                 <removeHeaders pattern="*"
                                excludePattern="policyModelName|policyModelVersion"/>
@@ -1382,6 +1385,9 @@
                     <setBody>
                         <method ref="org.onap.policy.clamp.policy.pdpgroup.PoliciesPdpMerger"
                                 method="removePdpStatesOnePolicy(${body})"/>
+                     </setBody>
+                    <setBody>
+                        <simple>${body.toString()}</simple>
                     </setBody>
                     <to uri="direct:create-policy"/>
                     <to