Fixed concurrency problems

[nonrtric.git] / policy-agent / src / main / java / org / oransc / policyagent / configuration / ApplicationConfigParser.java

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 d32db7a..c69c39d 100644 (file)
--- a/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java
@@ -20,21 +20,23 @@
 
 package org.oransc.policyagent.configuration;
 
-import com.google.gson.Gson;
-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.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 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;
@@ -43,52 +45,51 @@ public class ApplicationConfigParser {
 
     private static final String CONFIG = "config";
 
-    private static Gson gson = new GsonBuilder() //
-        .serializeNulls() //
-        .create(); //
-
-    private Vector<RicConfig> ricConfig;
-    private Properties dmaapPublisherConfig;
-    private Properties dmaapConsumerConfig;
-
-    public ApplicationConfigParser() {
-    }
+    @Getter
+    private List<RicConfig> ricConfigs;
+    @Getter
+    private Properties dmaapPublisherConfig = new Properties();
+    @Getter
+    private Properties dmaapConsumerConfig = new Properties();
 
     public void parse(JsonObject root) throws ServiceException {
-        JsonObject ricConfigJson = root.getAsJsonObject(CONFIG);
-        ricConfig = parseRics(ricConfigJson);
-        JsonObject dmaapPublisherConfigJson = root.getAsJsonObject("streams_publishes");
-        if (dmaapPublisherConfigJson == null) {
-            dmaapPublisherConfig = new Properties();
-        } else {
-            dmaapPublisherConfig = parseDmaapConfig(dmaapPublisherConfigJson);
+        JsonObject agentConfigJson = root.getAsJsonObject(CONFIG);
+        ricConfigs = parseRics(agentConfigJson);
+
+        JsonObject json = agentConfigJson.getAsJsonObject("streams_publishes");
+        if (json != null) {
+            this.dmaapPublisherConfig = parseDmaapConfig(json);
         }
-        JsonObject dmaapConsumerConfigJson = root.getAsJsonObject("streams_subscribes");
-        if (dmaapConsumerConfigJson == null) {
-            dmaapConsumerConfig = new Properties();
-        } else {
-            dmaapConsumerConfig = parseDmaapConfig(dmaapConsumerConfigJson);
+
+        json = agentConfigJson.getAsJsonObject("streams_subscribes");
+        if (json != null) {
+            this.dmaapConsumerConfig = parseDmaapConfig(json);
         }
-    }
 
-    public Vector<RicConfig> getRicConfigs() {
-        return this.ricConfig;
     }
 
-    public Properties getDmaapPublisherConfig() {
-        return dmaapPublisherConfig;
+    private List<RicConfig> parseRics(JsonObject config) throws ServiceException {
+        List<RicConfig> result = new ArrayList<>();
+        for (JsonElement ricElem : getAsJsonArray(config, "ric")) {
+            JsonObject ricAsJson = ricElem.getAsJsonObject();
+            ImmutableRicConfig ricConfig = ImmutableRicConfig.builder() //
+                .name(ricAsJson.get("name").getAsString()) //
+                .baseUrl(ricAsJson.get("baseUrl").getAsString()) //
+                .managedElementIds(parseManagedElementIds(ricAsJson.get("managedElementIds").getAsJsonArray())) //
+                .build();
+            result.add(ricConfig);
+        }
+        return result;
     }
 
-    public Properties getDmaapConsumerConfig() {
-        return dmaapConsumerConfig;
-    }
+    private List<String> parseManagedElementIds(JsonArray asJsonObject) {
+        Iterator<JsonElement> iterator = asJsonObject.iterator();
+        List<String> managedElementIds = new ArrayList<>();
+        while (iterator.hasNext()) {
+            managedElementIds.add(iterator.next().getAsString());
 
-    private Vector<RicConfig> parseRics(JsonObject config) throws ServiceException {
-        Vector<RicConfig> result = new Vector<RicConfig>();
-        for (JsonElement ricElem : getAsJsonArray(config, "ric")) {
-            result.add(gson.fromJson(ricElem.getAsJsonObject(), ImmutableRicConfig.class));
         }
-        return result;
+        return managedElementIds;
     }
 
     private static JsonElement get(JsonObject obj, String memberName) throws ServiceException {
@@ -103,17 +104,18 @@ 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();
         try {
+            Properties dmaapProps = new Properties();
             URL url = new URL(topicUrl);
             String passwd = "";
             String userName = "";
@@ -125,9 +127,9 @@ public class ApplicationConfigParser {
             String urlPath = url.getPath();
             DmaapUrlPath path = parseDmaapUrlPath(urlPath);
 
-            dmaapProps.put("ServiceName", url.getHost());
+            dmaapProps.put("ServiceName", url.getHost() + ":" + url.getPort() + "/events");
             dmaapProps.put("topic", path.dmaapTopicName);
-            dmaapProps.put("host", url.getHost());
+            dmaapProps.put("host", url.getHost() + ":" + url.getPort());
             dmaapProps.put("contenttype", MediaType.APPLICATION_JSON.toString());
             dmaapProps.put("userName", userName);
             dmaapProps.put("password", passwd);
@@ -135,13 +137,16 @@ public class ApplicationConfigParser {
             dmaapProps.put("id", path.consumerId);
             dmaapProps.put("TransportType", ProtocolTypeConstants.HTTPNOAUTH.toString());
             dmaapProps.put("timeout", 15000);
-            dmaapProps.put("limit", 1000);
-            dmaapProps.put("port", url.getPort());
+            dmaapProps.put("limit", 100);
+            dmaapProps.put("maxBatchSize", "10");
+            dmaapProps.put("maxAgeMs", "10000");
+            dmaapProps.put("compress", true);
+            dmaapProps.put("MessageSentThreadOccurance", "2");
+            return dmaapProps;
         } catch (MalformedURLException e) {
             throw new ServiceException("Could not parse the URL", e);
         }
 
-        return dmaapProps;
     }
 
     private static @NotNull String getAsString(JsonObject obj, String memberName) throws ServiceException {
@@ -166,7 +171,7 @@ public class ApplicationConfigParser {
             throw new ServiceException("The path has incorrect syntax: " + urlPath);
         }
 
-        final String dmaapTopicName = tokens[1] + "/" + tokens[2]; // /events/A1-P
+        final String dmaapTopicName = tokens[2]; // /events/A1-P
         String consumerGroup = ""; // users
         String consumerId = ""; // sdnc1
         if (tokens.length == 5) {