From d2ae13a03ef24fc87ae0a38e41da25bc6d1b192b Mon Sep 17 00:00:00 2001 From: Kai Date: Wed, 6 May 2020 16:08:24 +0800 Subject: Enable TCAgen2 to policy flow Issue-ID: DCAEGEN2-2198 Signed-off-by: Kai Lu Change-Id: I3b916ad11ab86c9e3e3528a2231bb723fca35053 --- .../web/spring/ConfigBindingServiceEnvironmentPostProcessor.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'dcae-analytics/dcae-analytics-web/src/main/java/org') 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 configServiceJsonOptional; JsonElement jsonConfig = jsonObject.get(ConfigBindingServiceConstants.CONFIG); - Optional 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 -- cgit 1.2.3-korg