X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fconfiguration%2FApplicationConfigParser.java;h=ae83bc05f620978c4983fd45656d3f4c1fc3412d;hb=7ff95e760df22a5b6e6a77b8f7b906ab0e2a55b6;hp=34d1d97aa1430622fd06a02f4b1ca86d29096391;hpb=d1b7bb42fe20c8c0131959f3e96668d8e6669d04;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 34d1d97a..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
@@ -25,13 +25,16 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map.Entry;
 import java.util.Properties;
 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;
@@ -44,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 {
@@ -68,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")) {
@@ -100,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();
@@ -122,9 +114,9 @@ public class ApplicationConfigParser {
             String urlPath = url.getPath();
             DmaapUrlPath path = parseDmaapUrlPath(urlPath);
 
-            dmaapProps.put("ServiceName", url.getHost()+":"+url.getPort()+"/events");
+            dmaapProps.put("ServiceName", url.getHost() + ":" + url.getPort() + "/events");
             dmaapProps.put("topic", path.dmaapTopicName);
-            dmaapProps.put("host", url.getHost()+":"+url.getPort());
+            dmaapProps.put("host", url.getHost() + ":" + url.getPort());
             dmaapProps.put("contenttype", MediaType.APPLICATION_JSON.toString());
             dmaapProps.put("userName", userName);
             dmaapProps.put("password", passwd);
@@ -162,7 +154,7 @@ public class ApplicationConfigParser {
             throw new ServiceException("The path has incorrect syntax: " + urlPath);
         }
 
-        final String dmaapTopicName =  tokens[2]; // /events/A1-P
+        final String dmaapTopicName = tokens[2]; // /events/A1-P
         String consumerGroup = ""; // users
         String consumerId = ""; // sdnc1
         if (tokens.length == 5) {