X-Git-Url: https://gerrit.onap.org/r/gitweb?p=holmes%2Fcommon.git;a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Fdcae%2Futils%2FDcaeConfigurationParser.java;h=377debb1e28ed58869ed0c3d300b273ea1660813;hp=c1eede7087dd490def90fc6ff72c4a906a5c3cb2;hb=ce0b806a18d8f370e1245c480836d18a04afa243;hpb=490fc3c1fafe50d5fb0e23db5cfd10730be96866

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 c1eede7..377debb 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
@@ -30,6 +30,8 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.Stream;
 
+import static org.onap.holmes.common.utils.GsonUtil.getAsString;
+
 public class DcaeConfigurationParser {
 
     private static final String RULE_CONTENT_SPLIT = "\\$\\$\\$";
@@ -85,15 +87,9 @@ public class DcaeConfigurationParser {
 
     private static SecurityInfo createSecurityInfo(String key, JsonObject entity) {
         SecurityInfo securityInfo = new SecurityInfo();
-        if (entity.has("type") && !entity.get("type").isJsonNull()) {
-            securityInfo.setType(entity.get("type").getAsString());
-        }
-        if (entity.has("aaf_password") && !entity.get("aaf_password").isJsonNull()) {
-            securityInfo.setAafPassword(entity.get("aaf_password").getAsString());
-        }
-        if (entity.has("aaf_username") && !entity.get("aaf_username").isJsonNull()) {
-            securityInfo.setAafUsername(entity.get("aaf_username").getAsString());
-        }
+        securityInfo.setType(getAsString(entity, "type"));
+        securityInfo.setAafPassword(getAsString(entity, "aaf_password"));
+        securityInfo.setAafUsername(getAsString(entity, "aaf_username"));
         securityInfo.setSecureTopic(!key.endsWith("unsecure"));
         fillInDmaapInfo(securityInfo, entity.get("dmaap_info").getAsJsonObject());
         return securityInfo;
@@ -101,21 +97,11 @@ public class DcaeConfigurationParser {
 
     private static void fillInDmaapInfo(SecurityInfo securityInfo, JsonObject jsonDmaapInfo) {
         SecurityInfo.DmaapInfo dmaapInfo = securityInfo.getDmaapInfo();
-        if (jsonDmaapInfo.has("location") && !jsonDmaapInfo.get("location").isJsonNull()){
-            dmaapInfo.setLocation(jsonDmaapInfo.get("location").getAsString());
-        }
-        if (jsonDmaapInfo.has("topic_url") && !jsonDmaapInfo.get("topic_url").isJsonNull()) {
-            dmaapInfo.setTopicUrl(jsonDmaapInfo.get("topic_url").getAsString());
-        }
-        if (jsonDmaapInfo.has("client_id") && !jsonDmaapInfo.get("client_id").isJsonNull()) {
-            dmaapInfo.setClientId(jsonDmaapInfo.get("client_id").getAsString());
-        }
-        if (jsonDmaapInfo.has("client_role") && !jsonDmaapInfo.get("client_role").isJsonNull()) {
-            dmaapInfo.setClientRole(jsonDmaapInfo.get("client_role").getAsString());
-        }
-        if (jsonDmaapInfo.has("type") && !jsonDmaapInfo.get("type").isJsonNull()) {
-            dmaapInfo.setType(jsonDmaapInfo.get("type").getAsString());
-        }
+        dmaapInfo.setLocation(getAsString(jsonDmaapInfo, "location"));
+        dmaapInfo.setTopicUrl(getAsString(jsonDmaapInfo, "topic_url"));
+        dmaapInfo.setClientId(getAsString(jsonDmaapInfo, "client_id"));
+        dmaapInfo.setClientRole(getAsString(jsonDmaapInfo, "client_role"));
+        dmaapInfo.setType(getAsString(jsonDmaapInfo, "type"));
     }
 
     private static void fillInRules(DcaeConfigurations ret, JsonObject jsonObject) {