Fix IQ Findings

Change-Id: I0ab0e2a9f5c3b7e3fa183ddbf7e4ecd2d4ed41ec
Issue-ID: HOLMES-116
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>

diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index f39f227..86c0433 100644 (file)
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -80,10 +80,6 @@
             <artifactId>poi</artifactId>\r
             <version>3.10.1</version>\r
         </dependency>\r
-        <dependency>\r
-            <groupId>org.jdom</groupId>\r
-            <artifactId>jdom</artifactId>\r
-        </dependency>\r
         <dependency>\r
             <groupId>org.easymock</groupId>\r
             <artifactId>easymock</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 be876e0..9822076 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,21 +16,12 @@
 \r
 package org.onap.holmes.common.api.stat;\r
 \r
-import java.io.Serializable;\r
-import java.io.StringReader;\r
-import java.lang.reflect.Field;\r
-import java.util.Date;\r
-import java.util.HashMap;\r
-import java.util.HashSet;\r
-import java.util.List;\r
-import java.util.Map;\r
-import java.util.Set;\r
 import lombok.Getter;\r
 import lombok.Setter;\r
-import org.jdom.Attribute;\r
-import org.jdom.Element;\r
-import org.jdom.input.SAXBuilder;\r
-import org.jdom.output.XMLOutputter;\r
+import net.sf.json.JSONObject;\r
+\r
+import java.io.Serializable;\r
+import java.util.*;\r
 \r
 \r
 @Getter\r
@@ -83,47 +74,6 @@ public class Alarm implements AplusData, Cloneable, Serializable {
     private int linkType = -1;\r
     private int centerType;\r
 \r
-    public static Alarm valueOf(String xmlString) {\r
-        Element element;\r
-        try {\r
-            StringReader sb = new StringReader(xmlString);\r
-            element = new SAXBuilder().build(sb).getRootElement();\r
-            sb.close();\r
-        } catch (Exception e) {\r
-            throw new RuntimeException(e);\r
-        }\r
-\r
-        Alarm alarm = new Alarm();\r
-        @SuppressWarnings("unchecked")\r
-        List<Attribute> list = element.getAttributes();\r
-        for (Attribute attr : list) {\r
-            String attrName = attr.getName();\r
-            try {\r
-                Field field = Alarm.class.getDeclaredField(attrName);\r
-                if (!attrName.endsWith("Time")) {\r
-                    String type = field.getType().getSimpleName();\r
-                    if ("byte".equals(type)) {\r
-                        field.set(alarm, Byte.parseByte(attr.getValue()));\r
-                    } else if ("long".equals(type)) {\r
-                        field.set(alarm, Long.parseLong(attr.getValue()));\r
-                    } else if ("String".equals(type)) {\r
-                        field.set(alarm, attr.getValue());\r
-                    } else {\r
-                        throw new RuntimeException("unknow attr type: " + type.toString());\r
-                    }\r
-                } else {\r
-                    Date date = new Date();\r
-                    date.setTime(Long.parseLong(attr.getValue()));\r
-                    field.set(alarm, date);\r
-                }\r
-            } catch (Exception e) {\r
-                throw new RuntimeException(e);\r
-            }\r
-        }\r
-\r
-        return alarm;\r
-    }\r
-\r
     public void addLinkIdNodeIdx(int linkId, int index) {\r
         linkIdNodeIdxMap.put(linkId, index);\r
     }\r
@@ -161,37 +111,8 @@ public class Alarm implements AplusData, Cloneable, Serializable {
 \r
     @Override\r
     public String toString() {\r
-        final String nullStr = "<null>";\r
-\r
-        Element el = new Element("Alarm");\r
-        el.setAttribute("id", String.valueOf(id));\r
-        el.setAttribute("aid", String.valueOf(aid));\r
-        el.setAttribute("alarmKey", String.valueOf(alarmKey));\r
-        el.setAttribute("eventType", String.valueOf(eventType));\r
-        el.setAttribute("region", region == null ? nullStr : region);\r
-        el.setAttribute("site", site == null ? nullStr : site);\r
-        el.setAttribute("network", network);\r
-        el.setAttribute("neType", neType);\r
-        el.setAttribute("equipType", equipType);\r
-        el.setAttribute("position1", position1);\r
-        el.setAttribute("subPosition1", subPosition1 == null ? nullStr : subPosition1);\r
-        el.setAttribute("position2", position2 == null ? nullStr : position2);\r
-        el.setAttribute("subPosition2", subPosition2 == null ? nullStr : subPosition2);\r
-        el.setAttribute("severity", String.valueOf(severity));\r
-        el.setAttribute("alarmType", String.valueOf(alarmType));\r
-        el.setAttribute("probableCause", String.valueOf(probableCause));\r
-        el.setAttribute("specificProblem", specificProblem == null ? nullStr : specificProblem);\r
-        el.setAttribute("additionalText", additionalText == null ? nullStr : additionalText);\r
-        el.setAttribute("raisedTime", String.valueOf(raisedTime.getTime()));\r
-        el.setAttribute("raisedServerTime", String.valueOf(raisedServerTime.getTime()));\r
-        if (clearedTime != null) {\r
-            el.setAttribute("clearedTime", String.valueOf(clearedTime.getTime()));\r
-        }\r
-        if (clearedServerTime != null) {\r
-            el.setAttribute("clearedServerTime", String.valueOf(clearedServerTime.getTime()));\r
-        }\r
 \r
-        return new XMLOutputter().outputString(el);\r
+        return JSONObject.fromObject(this).toString();\r
     }\r
 \r
     @Override\r

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dcae/DcaeConfigurationQuery.java b/holmes-actions/src/main/java/org/onap/holmes/common/dcae/DcaeConfigurationQuery.java
index 597e879..4f8a0a5 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dcae/DcaeConfigurationQuery.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dcae/DcaeConfigurationQuery.java
@@ -15,10 +15,6 @@
  */
 package org.onap.holmes.common.dcae;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import org.glassfish.jersey.client.ClientConfig;
 import org.onap.holmes.common.config.MicroServiceConfig;
 import org.onap.holmes.common.dcae.entity.DcaeConfigurations;
 import org.onap.holmes.common.dcae.utils.DcaeConfigurationParser;

diff --git a/pom.xml b/pom.xml
index 31e79e2..a87d1eb 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -103,11 +103,6 @@
                 <artifactId>quartz</artifactId>\r
                 <version>${quartz.version}</version>\r
             </dependency>\r
-            <dependency>\r
-                <groupId>org.jdom</groupId>\r
-                <artifactId>jdom</artifactId>\r
-                <version>1.1.3</version>\r
-            </dependency>\r
             <dependency>\r
                 <groupId>junit</groupId>\r
                 <artifactId>junit</artifactId>\r
@@ -159,7 +154,7 @@
             <dependency>\r
                 <groupId>org.apache.activemq</groupId>\r
                 <artifactId>activemq-broker</artifactId>\r
-                <version>5.10.1</version>\r
+                <version>5.11.3</version>\r
             </dependency>\r
             <dependency>\r
                 <groupId>org.apache.geronimo.specs</groupId>\r