diff options
author | Kai <lukai@chinamobile.com> | 2020-04-23 13:38:24 +0800 |
---|---|---|
committer | Kai <lukai@chinamobile.com> | 2020-05-01 14:53:26 +0800 |
commit | 92f2ade3327391adfc7dcafd3e11cf4111d6691d (patch) | |
tree | fd4b6dfe62d30e181ab0cb55e4e3a5d5617ea38a /dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap | |
parent | 53292c2237225f7451557c7cbe72af836ffefa24 (diff) |
Enable TCAgen2 to policy flow
Issue-ID: DCAEGEN2-2198
Signed-off-by: Kai Lu <lukai@chinamobile.com>
Change-Id: I316f4e3ad8e11320dae7c5bfa29333b6a48c1eeb
Diffstat (limited to 'dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap')
-rw-r--r-- | dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/TcaAppProperties.java | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/TcaAppProperties.java b/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/TcaAppProperties.java index fe905f4..0214a3d 100644 --- a/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/TcaAppProperties.java +++ b/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/TcaAppProperties.java @@ -30,6 +30,11 @@ import org.onap.dcae.analytics.model.configbindingservice.BaseConfigBindingServi import org.onap.dcae.analytics.model.configbindingservice.ConfigBindingServiceConstants; import org.springframework.core.env.Environment; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + import lombok.Data; import lombok.ToString; @@ -78,7 +83,7 @@ public class TcaAppProperties extends BaseConfigBindingServiceProperties { public Tca getTca() { Tca tca = new Tca(); - tca.setPolicy(environment.getProperty(ConfigBindingServiceConstants.POLICY)); + tca.setPolicy(getPolicy()); tca.setProcessingBatchSize(environment.getProperty(ConfigBindingServiceConstants.PROCESSINGBATCHSIZE, Integer.class)); tca.setEnableAbatement(environment.getProperty(ConfigBindingServiceConstants.ENABLEABATEMENT, Boolean.class)); tca.setEnableEcompLogging(environment.getProperty(ConfigBindingServiceConstants.ENABLEECOMPLOGGING, Boolean.class)); @@ -95,6 +100,26 @@ public class TcaAppProperties extends BaseConfigBindingServiceProperties { return tca; } + /** + * Check policies items exist, and return policy. + * @return Policy policy + */ + private String getPolicy() { + + String policies = environment.getProperty(ConfigBindingServiceConstants.POLICIES); + if (policies == null) { + return environment.getProperty(ConfigBindingServiceConstants.POLICY); + } + JsonObject policiesObject = new JsonParser().parse(policies).getAsJsonObject(); + JsonArray items = policiesObject.get(ConfigBindingServiceConstants.ITEMS).getAsJsonArray(); + JsonElement policy = items.get(0) + .getAsJsonObject().get(ConfigBindingServiceConstants.CONFIG) + .getAsJsonObject().get(ConfigBindingServiceConstants.TCAPOLICY); + + return policy.toString(); + + } + @Override public Map<String, PublisherDetails> getStreamsPublishes() { DmaapInfo dmaapInfo = new DmaapInfo(); |