X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Fdcae%2Futils%2FDcaeConfigurationParser.java;h=1143263bd581dd8b9a9504b028c709382c85f24f;hb=e8643ee7b7fb72f55df742dd7e075469fbca43c8;hp=e4899d3018da99da2c199b5effc9000a7223ef23;hpb=d8dd1b86833125a348c274b9dd62b0ff2ca64f19;p=holmes%2Fcommon.git

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dcae/utils/DcaeConfigurationParser.java b/holmes-actions/src/main/java/org/onap/holmes/common/dcae/utils/DcaeConfigurationParser.java
index e4899d3..1143263 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dcae/utils/DcaeConfigurationParser.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dcae/utils/DcaeConfigurationParser.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.onap.holmes.common.dcae.utils;
 
 import java.util.Arrays;
@@ -30,13 +29,15 @@ import org.onap.holmes.common.exception.CorrelationException;
 
 public class DcaeConfigurationParser {
 
+    private static final String RULE_CONTENT_SPLIT = "\\$\\$\\$";
+
     private static final List<String> OBJECT_ATTRS = Arrays
             .asList(new String[]{"streams_subscribes", "streams_publishes", "services_calls", "services_provides"});
 
     public static DcaeConfigurations parse(String jsonStr) throws CorrelationException {
         if (StringUtils.isEmpty(jsonStr)) {
             throw new CorrelationException(
-                    "Can not resolve configurations from DCAE. The configuration string is empty");
+                    "Can not resolve configurations from DCAE. The configuration string is empty.");
         }
 
         DcaeConfigurations ret = new DcaeConfigurations();
@@ -50,10 +51,7 @@ public class DcaeConfigurationParser {
 
         fillInRules(ret, jsonObject);
         fillInPublishesInfo(ret, jsonObject);
-
-        if (jsonObject.containsKey("streams_subscribes")) {
-
-        }
+        fillInSubscribesInfo(ret, jsonObject);
 
         JSONObject finalJsonObject = jsonObject;
         Stream.of(jsonObject.keySet().toArray(new String[0]))
@@ -72,13 +70,25 @@ public class DcaeConfigurationParser {
         }
     }
 
+    private static void fillInSubscribesInfo(DcaeConfigurations ret, JSONObject jsonObject) {
+        if (jsonObject.containsKey("streams_subscribes")) {
+            JSONObject subscribes = jsonObject.getJSONObject("streams_subscribes");
+            for (Object key : subscribes.keySet()) {
+                ret.addSubSecInfo((String) key,
+                        createSecurityInfo((String) key, subscribes.getJSONObject((String) key)));
+            }
+        }
+    }
+
     private static SecurityInfo createSecurityInfo(String key, JSONObject entity) {
         SecurityInfo securityInfo = new SecurityInfo();
-        securityInfo.setType(entity.getString("type"));
-        if (!entity.get("aaf_password").equals("null")) {
+        if (entity.containsKey("type")) {
+            securityInfo.setType(entity.getString("type"));
+        }
+        if (entity.containsKey("aaf_password")) {
             securityInfo.setAafPassword(entity.getString("aaf_password"));
         }
-        if (!entity.get("aaf_username").equals("null")) {
+        if (entity.containsKey("aaf_username")) {
             securityInfo.setAafUsername(entity.getString("aaf_username"));
         }
         securityInfo.setSecureTopic(!key.endsWith("unsecure"));
@@ -88,21 +98,30 @@ public class DcaeConfigurationParser {
 
     private static void fillInDmaapInfo(SecurityInfo securityInfo, JSONObject jsonDmaapInfo) {
         SecurityInfo.DmaapInfo dmaapInfo = securityInfo.getDmaapInfo();
-        dmaapInfo.setLocation(jsonDmaapInfo.getString("location"));
-        dmaapInfo.setTopicUrl(jsonDmaapInfo.getString("topic_url"));
-        if (!jsonDmaapInfo.get("client_id").equals("null")) {
+        if (jsonDmaapInfo.containsKey("location")){
+            dmaapInfo.setLocation(jsonDmaapInfo.getString("location"));
+        }
+        if (jsonDmaapInfo.containsKey("topic_url")) {
+            dmaapInfo.setTopicUrl(jsonDmaapInfo.getString("topic_url"));
+        }
+        if (jsonDmaapInfo.containsKey("client_id")) {
             dmaapInfo.setClientId(jsonDmaapInfo.getString("client_id"));
         }
-        if (!jsonDmaapInfo.get("client_role").equals("null")) {
+        if (jsonDmaapInfo.containsKey("client_role")) {
             dmaapInfo.setClientRole(jsonDmaapInfo.getString("client_role"));
         }
+        if (jsonDmaapInfo.containsKey("type")) {
+            dmaapInfo.setType(jsonDmaapInfo.getString("type"));
+        }
     }
 
     private static void fillInRules(DcaeConfigurations ret, JSONObject jsonObject) {
         Set<Entry<String, Object>> entries = jsonObject.entrySet();
         for (Entry<String, Object> entry : entries) {
             if (entry.getKey().startsWith("holmes.default.rule")) {
-                ret.addDefaultRule(new Rule(entry.getKey(), (String) entry.getValue(), 1));
+                String value = (String) entry.getValue();
+                String[] contents = value.split(RULE_CONTENT_SPLIT);
+                ret.addDefaultRule(new Rule(entry.getKey(), contents[0], contents[1], 1));
             }
         }
     }