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=c21af83981088c2b53164bcf53adf72ef6e7aea7;hb=cb664741dd930583931d44d980f77f5b17a762bf;hp=102d5c49011d9bf22a5494c6b55c7b5bf459bc7e;hpb=0b2f51f6215dad3fc93d74572ad23f950ad8ae98;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 102d5c49..c21af839 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
@@ -52,25 +52,24 @@ public class ApplicationConfigParser {
     @Getter
     private Vector<RicConfig> ricConfigs;
     @Getter
-    private Properties dmaapPublisherConfig;
+    private Properties dmaapPublisherConfig = new Properties();
     @Getter
-    private Properties dmaapConsumerConfig;
+    private Properties dmaapConsumerConfig = new Properties();
 
     public void parse(JsonObject root) throws ServiceException {
         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 json = agentConfigJson.getAsJsonObject("streams_publishes");
+        if (json != null) {
+            this.dmaapPublisherConfig = parseDmaapConfig(json);
         }
-        JsonObject dmaapConsumerConfigJson = agentConfigJson.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);
         }
+
     }
 
     private Vector<RicConfig> parseRics(JsonObject config) throws ServiceException {
@@ -103,8 +102,8 @@ public class ApplicationConfigParser {
         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 = "";
@@ -126,12 +125,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("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 {