diff options
| author |   Kai <lukai@chinamobile.com> | 2020-07-24 15:09:04 +0800 |
|---|---|---|
| committer | Kai <lukai@chinamobile.com> | 2020-08-04 10:00:03 +0800 |
| commit | a2a5c9db5025b2326ecf739de77a66f6a348a85d (patch) | |
| tree | 4262f74a9d9dca348a39beb1db34917abc1ecf68 /dcae-analytics/dcae-analytics-web/src/main/java | |
| parent | 7198347a41ef8c77c9008195df84d1dfd26872a7 (diff) | |
policy upgrade
Issue-ID: DCAEGEN2-2198
Signed-off-by: Kai Lu <lukai@chinamobile.com>
Change-Id: Idfa56412268f7e7a4682cdbba5645832b0746952
Diffstat (limited to 'dcae-analytics/dcae-analytics-web/src/main/java')
| -rw-r--r-- | dcae-analytics/dcae-analytics-web/src/main/java/org/onap/dcae/analytics/web/spring/ConfigBindingServiceEnvironmentPostProcessor.java | 4 |
1 files changed, 2 insertions, 2 deletions
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<String, Object> 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()) { |