From 0a5a6e0459876316b633b3801c2475b5a92d38a5 Mon Sep 17 00:00:00 2001 From: Kai Date: Sat, 10 Oct 2020 09:47:29 +0800 Subject: fix issues Issue-ID: DCAEGEN2-2469 Issue-ID: DCAEGEN2-2470 Signed-off-by: Kai Lu Change-Id: I13b0422e4f7a9f722c8c310eb76a66aa6a01679f --- .../web/spring/ConfigBindingServiceEnvironmentPostProcessor.java | 1 + .../web/spring/ConfigBindingServiceEnvironmentPostProcessorTest.java | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'dcae-analytics/dcae-analytics-web/src') diff --git a/dcae-analytics/dcae-analytics-web/src/main/java/org/onap/dcae/analytics/web/spring/ConfigBindingServiceEnvironmentPostProcessor.java b/dcae-analytics/dcae-analytics-web/src/main/java/org/onap/dcae/analytics/web/spring/ConfigBindingServiceEnvironmentPostProcessor.java index 453cd9c..0a94f8d 100644 --- a/dcae-analytics/dcae-analytics-web/src/main/java/org/onap/dcae/analytics/web/spring/ConfigBindingServiceEnvironmentPostProcessor.java +++ b/dcae-analytics/dcae-analytics-web/src/main/java/org/onap/dcae/analytics/web/spring/ConfigBindingServiceEnvironmentPostProcessor.java @@ -234,6 +234,7 @@ public class ConfigBindingServiceEnvironmentPostProcessor implements Environment String policies = null; if (jsonPolicyConfig != null) { policies = jsonPolicyConfig.getAsJsonObject().getAsJsonArray(ConfigBindingServiceConstants.ITEMS).get(0) + .getAsJsonObject().get(ConfigBindingServiceConstants.CONFIG) .getAsJsonObject().get(ConfigBindingServiceConstants.TCAPOLICY).toString(); } diff --git a/dcae-analytics/dcae-analytics-web/src/test/java/org/onap/dcae/analytics/web/spring/ConfigBindingServiceEnvironmentPostProcessorTest.java b/dcae-analytics/dcae-analytics-web/src/test/java/org/onap/dcae/analytics/web/spring/ConfigBindingServiceEnvironmentPostProcessorTest.java index 0fce3c2..c673933 100644 --- a/dcae-analytics/dcae-analytics-web/src/test/java/org/onap/dcae/analytics/web/spring/ConfigBindingServiceEnvironmentPostProcessorTest.java +++ b/dcae-analytics/dcae-analytics-web/src/test/java/org/onap/dcae/analytics/web/spring/ConfigBindingServiceEnvironmentPostProcessorTest.java @@ -211,6 +211,7 @@ public class ConfigBindingServiceEnvironmentPostProcessorTest extends BaseAnalyt " \"policies\": {\r\n" + " \"event\": {},\r\n" + " \"items\": [{\r\n" + + " \"config\": {\r\n" + " \"tca.policy\": {\r\n" + " \"domain\": \"measurementsForVfScaling\",\r\n" + " \"metricsPerEventName\": [{\r\n" + @@ -238,6 +239,7 @@ public class ConfigBindingServiceEnvironmentPostProcessorTest extends BaseAnalyt " \"policyVersion\": \"v0.0.1\"\r\n" + " }]\r\n" + " }\r\n" + + " }\r\n" + " }]\r\n" + " }\r\n" + "}"; @@ -286,6 +288,7 @@ public class ConfigBindingServiceEnvironmentPostProcessorTest extends BaseAnalyt " \"policies\": {\r\n" + " \"event\": {},\r\n" + " \"items\": [{\r\n" + + " \"config\": {\r\n" + " \"tca.policy\": {\r\n" + " \"domain\": \"measurementsForVfScaling\",\r\n" + " \"metricsPerEventName\": [{\r\n" + @@ -313,6 +316,7 @@ public class ConfigBindingServiceEnvironmentPostProcessorTest extends BaseAnalyt " \"policyVersion\": \"v0.0.1\"\r\n" + " }]\r\n" + " }\r\n" + + " }\r\n" + " }]\r\n" + " }\r\n" + "}"; -- cgit 1.2.3-korg