diff options
| author |   Kai <lukai@chinamobile.com> | 2020-05-06 16:08:24 +0800 |
|---|---|---|
| committer | LUKAI <lukai@chinamobile.com> | 2020-05-06 09:09:58 +0000 |
| commit | d2ae13a03ef24fc87ae0a38e41da25bc6d1b192b (patch) | |
| tree | 126ec182960e69e9f789c292d57dccdba17ee916 /dcae-analytics/dcae-analytics-web/src/main/java/org | |
| parent | 92f2ade3327391adfc7dcafd3e11cf4111d6691d (diff) | |
Enable TCAgen2 to policy flow
Issue-ID: DCAEGEN2-2198
Signed-off-by: Kai Lu <lukai@chinamobile.com>
Change-Id: I3b916ad11ab86c9e3e3528a2231bb723fca35053
Diffstat (limited to 'dcae-analytics/dcae-analytics-web/src/main/java/org')
| -rw-r--r-- | dcae-analytics/dcae-analytics-web/src/main/java/org/onap/dcae/analytics/web/spring/ConfigBindingServiceEnvironmentPostProcessor.java | 7 |
1 files changed, 6 insertions, 1 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 31c01b0..c41e416 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 @@ -223,9 +223,14 @@ public class ConfigBindingServiceEnvironmentPostProcessor implements Environment */ public String parseTcaConfig(JsonObject jsonObject) { + Optional<String> configServiceJsonOptional; JsonElement jsonConfig = jsonObject.get(ConfigBindingServiceConstants.CONFIG); - Optional<String> configServiceJsonOptional = Optional.of(jsonConfig.toString()); + if (jsonConfig.getAsJsonObject().get(ConfigBindingServiceConstants.CONFIG) != null) { + configServiceJsonOptional = Optional.of(jsonConfig.toString()); + } else { + configServiceJsonOptional = Optional.of(jsonObject.toString()); + } // convert fetch config binding service json string to Map of property key and // values |