diff options
| author |   Kai <lukai@chinamobile.com> | 2020-10-10 09:47:29 +0800 |
|---|---|---|
| committer | Kai <lukai@chinamobile.com> | 2020-10-10 10:22:30 +0800 |
| commit | 0a5a6e0459876316b633b3801c2475b5a92d38a5 (patch) | |
| tree | 520c94efa20353204a56a292f189a2a58fdb1bd1 /dcae-analytics/dcae-analytics-web | |
| parent | 85abdfd0c4b791eb5a149050bfd347ace53425a1 (diff) | |
fix issues
Issue-ID: DCAEGEN2-2469
Issue-ID: DCAEGEN2-2470
Signed-off-by: Kai Lu <lukai@chinamobile.com>
Change-Id: I13b0422e4f7a9f722c8c310eb76a66aa6a01679f
Diffstat (limited to 'dcae-analytics/dcae-analytics-web')
3 files changed, 6 insertions, 1 deletions
diff --git a/dcae-analytics/dcae-analytics-web/pom.xml b/dcae-analytics/dcae-analytics-web/pom.xml index 2f2ef9f..e6f7237 100644 --- a/dcae-analytics/dcae-analytics-web/pom.xml +++ b/dcae-analytics/dcae-analytics-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId> <artifactId>dcae-analytics</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.1-SNAPSHOT</version> </parent> <artifactId>dcae-analytics-web</artifactId> 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" + "}"; |