X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fclamp%2Fpolicy%2Foperational%2FOperationalPolicy.java;h=b0e8b0c3d8f29b7a44b422b8dabd534cc3f84cce;hb=5c3a825851bb1a345620c5c4951726c5b94a0341;hp=7cf06dcfc434fc7f7bc4a19beb92360fd2ed8462;hpb=3121b5bee2e70b1f753f9988344d41f3132edf69;p=clamp.git

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 7cf06dcf..b0e8b0c3 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
@@ -51,6 +51,8 @@ import javax.persistence.Table;
 import javax.persistence.Transient;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
+import org.onap.clamp.clds.tosca.ToscaYamlToJsonConvertor;
+import org.onap.clamp.clds.util.JsonUtils;
 import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
 import org.onap.clamp.loop.Loop;
 import org.onap.clamp.loop.template.LoopElementModel;
@@ -80,12 +82,6 @@ public class OperationalPolicy extends Policy implements Serializable {
     @JoinColumn(name = "loop_id", nullable = false)
     private Loop loop;
 
-    @Expose
-    @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumns({@JoinColumn(name = "policy_model_type", referencedColumnName = "policy_model_type"),
-            @JoinColumn(name = "policy_model_version", referencedColumnName = "version")})
-    private PolicyModel policyModel;
-
     public OperationalPolicy() {
         // Serialization
     }
@@ -111,16 +107,32 @@ public class OperationalPolicy extends Policy implements Serializable {
         this.setPdpGroup(pdpGroup);
         this.setPdpSubgroup(pdpSubgroup);
         this.setLoopElementModel(loopElementModel);
-        if (policyModel != null && policyModel.getPolicyModelType().contains("legacy")) {
-            LegacyOperationalPolicy.preloadConfiguration(configurationsJson, loop);
+        this.setJsonRepresentation(this.generateJsonRepresentation(policyModel));
+
+    }
+
+    private JsonObject generateJsonRepresentation(PolicyModel policyModel) {
+        JsonObject jsonReturned = new JsonObject();
+        if (policyModel == null) {
+            return new JsonObject();
         }
         try {
-            this.setJsonRepresentation(
-                OperationalPolicyRepresentationBuilder.generateOperationalPolicySchema(loop.getModelService()));
+            if (isLegacy()) {
+                // Op policy Legacy case
+                LegacyOperationalPolicy.preloadConfiguration(jsonReturned, loop);
+                this.setJsonRepresentation(
+                        OperationalPolicyRepresentationBuilder.generateOperationalPolicySchema(loop.getModelService()));
+            } else {
+                // Generic Case
+                this.setJsonRepresentation(JsonUtils.GSON
+                        .fromJson(new ToscaYamlToJsonConvertor().parseToscaYaml(policyModel.getPolicyModelTosca(),
+                                policyModel.getPolicyModelType()), JsonObject.class));
+            }
         } catch (JsonSyntaxException | IOException | NullPointerException e) {
             logger.error("Unable to generate the operational policy Schema ... ", e);
             this.setJsonRepresentation(new JsonObject());
         }
+        return jsonReturned;
     }
 
     public void setLoop(Loop loopName) {
@@ -146,24 +158,6 @@ public class OperationalPolicy extends Policy implements Serializable {
         this.name = name;
     }
 
-    /**
-     * policyModel getter.
-     *
-     * @return the policyModel
-     */
-    public PolicyModel getPolicyModel() {
-        return policyModel;
-    }
-
-    /**
-     * policyModel setter.
-     *
-     * @param policyModel the policyModel to set
-     */
-    public void setPolicyModel(PolicyModel policyModel) {
-        this.policyModel = policyModel;
-    }
-
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -194,6 +188,10 @@ public class OperationalPolicy extends Policy implements Serializable {
         return true;
     }
 
+    public Boolean isLegacy() {
+        return (this.getPolicyModel() != null) && this.getPolicyModel().getPolicyModelType().contains("legacy");
+    }
+
     /**
      * Create policy Yaml from json defined here.
      *
@@ -236,17 +234,22 @@ public class OperationalPolicy extends Policy implements Serializable {
 
     @Override
     public String createPolicyPayload() throws UnsupportedEncodingException {
-        // Now using the legacy payload fo Dublin
-        JsonObject payload = new JsonObject();
-        payload.addProperty("policy-id", this.getName());
-        payload.addProperty("content",
-                URLEncoder.encode(
-                        LegacyOperationalPolicy
-                                .createPolicyPayloadYamlLegacy(this.getConfigurationsJson().get("operational_policy")),
-                        StandardCharsets.UTF_8.toString()));
-        String opPayload = new GsonBuilder().setPrettyPrinting().create().toJson(payload);
-        logger.info("Operational policy payload: " + opPayload);
-        return opPayload;
+        if (isLegacy()) {
+            // Now using the legacy payload fo Dublin
+            JsonObject payload = new JsonObject();
+            payload.addProperty("policy-id", this.getName());
+            payload.addProperty("content",
+                    URLEncoder.encode(
+                            LegacyOperationalPolicy
+                                    .createPolicyPayloadYamlLegacy(
+                                            this.getConfigurationsJson().get("operational_policy")),
+                            StandardCharsets.UTF_8.toString()));
+            String opPayload = new GsonBuilder().setPrettyPrinting().create().toJson(payload);
+            logger.info("Operational policy payload: " + opPayload);
+            return opPayload;
+        } else {
+            return super.createPolicyPayload();
+        }
     }
 
     /**