X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fconfiguration%2FApplicationConfigParser.java;h=ae83bc05f620978c4983fd45656d3f4c1fc3412d;hb=7ff95e760df22a5b6e6a77b8f7b906ab0e2a55b6;hp=807b12f590e6919cdb49351b2e9ab374ed1ece3d;hpb=9fb9f6e4fe8eb9425d848ae576c0e755dfca22df;p=nonrtric.git

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java b/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java
index 807b12f5..ae83bc05 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java
@@ -34,7 +34,7 @@ import java.util.Set;
 import java.util.Vector;
 
 import javax.validation.constraints.NotNull;
-
+import lombok.Getter;
 import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants;
 import org.oransc.policyagent.exceptions.ServiceException;
 import org.springframework.http.MediaType;
@@ -47,23 +47,23 @@ public class ApplicationConfigParser {
         .serializeNulls() //
         .create(); //
 
-    private Vector<RicConfig> ricConfig;
+    @Getter
+    private Vector<RicConfig> ricConfigs;
+    @Getter
     private Properties dmaapPublisherConfig;
+    @Getter
     private Properties dmaapConsumerConfig;
 
-    public ApplicationConfigParser() {
-    }
-
     public void parse(JsonObject root) throws ServiceException {
-        JsonObject ricConfigJson = root.getAsJsonObject(CONFIG);
-        ricConfig = parseRics(ricConfigJson);
-        JsonObject dmaapPublisherConfigJson = root.getAsJsonObject("streams_publishes");
+        JsonObject agentConfigJson = root.getAsJsonObject(CONFIG);
+        ricConfigs = parseRics(agentConfigJson);
+        JsonObject dmaapPublisherConfigJson = agentConfigJson.getAsJsonObject("streams_publishes");
         if (dmaapPublisherConfigJson == null) {
             dmaapPublisherConfig = new Properties();
         } else {
             dmaapPublisherConfig = parseDmaapConfig(dmaapPublisherConfigJson);
         }
-        JsonObject dmaapConsumerConfigJson = root.getAsJsonObject("streams_subscribes");
+        JsonObject dmaapConsumerConfigJson = agentConfigJson.getAsJsonObject("streams_subscribes");
         if (dmaapConsumerConfigJson == null) {
             dmaapConsumerConfig = new Properties();
         } else {
@@ -71,18 +71,6 @@ public class ApplicationConfigParser {
         }
     }
 
-    public Vector<RicConfig> getRicConfigs() {
-        return this.ricConfig;
-    }
-
-    public Properties getDmaapPublisherConfig() {
-        return dmaapPublisherConfig;
-    }
-
-    public Properties getDmaapConsumerConfig() {
-        return dmaapConsumerConfig;
-    }
-
     private Vector<RicConfig> parseRics(JsonObject config) throws ServiceException {
         Vector<RicConfig> result = new Vector<RicConfig>();
         for (JsonElement ricElem : getAsJsonArray(config, "ric")) {
@@ -103,13 +91,14 @@ public class ApplicationConfigParser {
         return get(obj, memberName).getAsJsonArray();
     }
 
-    private Properties parseDmaapConfig(JsonObject consumerCfg) throws ServiceException {
-        Set<Entry<String, JsonElement>> topics = consumerCfg.entrySet();
-        if (topics.size() != 1) {
-            throw new ServiceException("Invalid configuration, number of topic must be one, config: " + topics);
+    private Properties parseDmaapConfig(JsonObject streamCfg) throws ServiceException {
+        Set<Entry<String, JsonElement>> streamConfigEntries = streamCfg.entrySet();
+        if (streamConfigEntries.size() != 1) {
+            throw new ServiceException(
+                "Invalid configuration. Number of streams must be one, config: " + streamConfigEntries);
         }
-        JsonObject topic = topics.iterator().next().getValue().getAsJsonObject();
-        JsonObject dmaapInfo = get(topic, "dmaap_info").getAsJsonObject();
+        JsonObject streamConfigEntry = streamConfigEntries.iterator().next().getValue().getAsJsonObject();
+        JsonObject dmaapInfo = get(streamConfigEntry, "dmaap_info").getAsJsonObject();
         String topicUrl = getAsString(dmaapInfo, "topic_url");
 
         Properties dmaapProps = new Properties();