Added Some Tools to GsonUtil

[holmes/common.git] / holmes-actions / src / main / java / org / onap / holmes / common / dcae / utils / DcaeConfigurationParser.java

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