Test Replace Jackson with GSON

Change-Id: I359884ca228d6191b95770952d5684cef101cdee
Issue-ID: HOLMES-115
Signed-off-by: YiLi <li.yi101@zte.com.cn>

diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index 7551cda..3e35e33 100644 (file)
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -175,11 +175,6 @@
             <artifactId>commons-collections</artifactId>\r
             <version>3.2.2</version>\r
         </dependency>\r
-        <dependency>\r
-            <groupId>commons-beanutils</groupId>\r
-            <artifactId>commons-beanutils</artifactId>\r
-            <version>1.9.2</version>\r
-        </dependency>\r
         <dependency>\r
             <groupId>com.google.code.gson</groupId>\r
             <artifactId>gson</artifactId>\r

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/api/stat/Alarm.java b/holmes-actions/src/main/java/org/onap/holmes/common/api/stat/Alarm.java
index 9822076..4046307 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/api/stat/Alarm.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/api/stat/Alarm.java
@@ -16,9 +16,9 @@
 \r
 package org.onap.holmes.common.api.stat;\r
 \r
+import com.alibaba.fastjson.JSONObject;\r
 import lombok.Getter;\r
 import lombok.Setter;\r
-import net.sf.json.JSONObject;\r
 \r
 import java.io.Serializable;\r
 import java.util.*;\r
@@ -112,7 +112,7 @@ public class Alarm implements AplusData, Cloneable, Serializable {
     @Override\r
     public String toString() {\r
 \r
-        return JSONObject.fromObject(this).toString();\r
+        return JSONObject.toJSONString(this);\r
     }\r
 \r
     @Override\r

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java b/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
index 9a1b0ea..f74d1b2 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
@@ -15,12 +15,12 @@
  */\r
 package org.onap.holmes.common.config;\r
 \r
+import com.alibaba.fastjson.JSON;\r
+import com.alibaba.fastjson.JSONObject;\r
 import javax.ws.rs.client.Client;\r
 import javax.ws.rs.client.ClientBuilder;\r
 import javax.ws.rs.core.Response;\r
 import lombok.extern.slf4j.Slf4j;\r
-import net.sf.json.JSONArray;\r
-import net.sf.json.JSONObject;\r
 import org.onap.holmes.common.constant.AlarmConst;\r
 \r
 @Slf4j\r
@@ -50,9 +50,11 @@ public class MicroServiceConfig {
         String queryString = getConsulAddrInfo() + hostname;\r
         log.info("Query the " + hostname + " address using the URL: " + queryString);\r
         try {\r
-            JSONObject addrJson = (JSONObject) JSONArray.fromObject(execQuery(queryString)).get(0);\r
-            if (addrJson.has("ServiceAddress") && addrJson.has("ServicePort")) {\r
-                ret = "http://" + addrJson.getString("ServiceAddress") + ":" + addrJson.getString("ServicePort");\r
+            JSONObject addrJson = (JSONObject) JSON.parseArray(execQuery(queryString)).get(0);\r
+            if (addrJson != null && addrJson.get("ServiceAddress") != null\r
+                    && addrJson.get("ServicePort") != null) {\r
+                ret = "http://" + addrJson.getString("ServiceAddress") + ":" + addrJson\r
+                        .getString("ServicePort");\r
             }\r
         } catch (Exception e) {\r
             log.warn(e.getMessage(), e);\r

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 1143263..092e478 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
@@ -15,12 +15,13 @@
  */\r
 package org.onap.holmes.common.dcae.utils;\r
 \r
+import com.alibaba.fastjson.JSON;\r
+import com.alibaba.fastjson.JSONObject;\r
 import java.util.Arrays;\r
 import java.util.List;\r
 import java.util.Map.Entry;\r
 import java.util.Set;\r
 import java.util.stream.Stream;\r
-import net.sf.json.JSONObject;\r
 import org.apache.commons.lang3.StringUtils;\r
 import org.onap.holmes.common.dcae.entity.DcaeConfigurations;\r
 import org.onap.holmes.common.dcae.entity.Rule;\r
@@ -44,7 +45,7 @@ public class DcaeConfigurationParser {
 \r
         JSONObject jsonObject = null;\r
         try {\r
-            jsonObject = JSONObject.fromObject(jsonStr);\r
+            jsonObject = JSON.parseObject(jsonStr);\r
         } catch (Exception e) {\r
             throw new CorrelationException(e.getMessage(), e);\r
         }\r