X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=dcae-analytics%2Fdcae-analytics-tca-web%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdcae%2Fanalytics%2Ftca%2Fweb%2FTcaAppProperties.java;h=d70922b250d10cc2f797729053f3ca79dece41e8;hb=0688c66229fe1bfb1d7d8920705b019d5cfeb17f;hp=0214a3d7d437f8da31a3215ced326b3c6ceb2c82;hpb=ddb9b0f7e578aefd06ee9e3f01d810b0b9034f3a;p=dcaegen2%2Fanalytics%2Ftca-gen2.git

diff --git a/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/TcaAppProperties.java b/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/TcaAppProperties.java
index 0214a3d..d70922b 100644
--- a/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/TcaAppProperties.java
+++ b/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/TcaAppProperties.java
@@ -30,11 +30,6 @@ import org.onap.dcae.analytics.model.configbindingservice.BaseConfigBindingServi
 import org.onap.dcae.analytics.model.configbindingservice.ConfigBindingServiceConstants;
 import org.springframework.core.env.Environment;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
 import lombok.Data;
 import lombok.ToString;
 
@@ -106,17 +101,12 @@ public class TcaAppProperties extends BaseConfigBindingServiceProperties {
      */
     private String getPolicy() {
 
-        String policies = environment.getProperty(ConfigBindingServiceConstants.POLICIES);
+        String policies = environment.getProperty(ConfigBindingServiceConstants.WITHPOLICIES);
         if (policies == null) {
             return environment.getProperty(ConfigBindingServiceConstants.POLICY);
         }
-        JsonObject policiesObject = new JsonParser().parse(policies).getAsJsonObject();
-        JsonArray items = policiesObject.get(ConfigBindingServiceConstants.ITEMS).getAsJsonArray();
-        JsonElement policy = items.get(0)
-                                 .getAsJsonObject().get(ConfigBindingServiceConstants.CONFIG)
-                                 .getAsJsonObject().get(ConfigBindingServiceConstants.TCAPOLICY);
 
-        return policy.toString();
+        return policies;
 
     }