From a2a5c9db5025b2326ecf739de77a66f6a348a85d Mon Sep 17 00:00:00 2001 From: Kai Date: Fri, 24 Jul 2020 15:09:04 +0800 Subject: policy upgrade Issue-ID: DCAEGEN2-2198 Signed-off-by: Kai Lu Change-Id: Idfa56412268f7e7a4682cdbba5645832b0746952 --- .../web/spring/ConfigBindingServiceEnvironmentPostProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dcae-analytics/dcae-analytics-web/src/main/java/org/onap/dcae/analytics/web/spring/ConfigBindingServiceEnvironmentPostProcessor.java') 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 8798b4e..b809858 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 @@ -1,6 +1,7 @@ /* * ================================================================================ * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (c) 2019-2020 China Mobile. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -234,7 +235,6 @@ public class ConfigBindingServiceEnvironmentPostProcessor implements Environment configServiceJsonOptional = Optional.of(jsonConfig.toString()); policies = jsonConfig.getAsJsonObject().get(ConfigBindingServiceConstants.POLICIES) .getAsJsonObject().getAsJsonArray(ConfigBindingServiceConstants.ITEMS).get(0) - .getAsJsonObject().get(ConfigBindingServiceConstants.CONFIG) .getAsJsonObject().get(ConfigBindingServiceConstants.TCAPOLICY).toString(); } else { configServiceJsonOptional = Optional.of(jsonObject.toString()); @@ -245,7 +245,7 @@ public class ConfigBindingServiceEnvironmentPostProcessor implements Environment Map configPropertiesMap = configServiceJsonOptional .map(new JsonStringToMapFunction(configServicePropertiesKey)).orElse(Collections.emptyMap()); if (policies != null) { - configPropertiesMap.put(ConfigBindingServiceConstants.CONFIG_POLICIES, policies); + configPropertiesMap.put(ConfigBindingServiceConstants.POLICY, policies); } if (configPropertiesMap.isEmpty()) { -- cgit 1.2.3-korg