Modify restructure

Change-Id: Ia5ffd78bf9a0b2dc0339d198362fc1e1bde7c93c
Issue-ID:HOLMES-51
Signed-off-by: FengLiang <feng.liang1@zte.com.cn>

diff --git a/holmes-actions/src/main/java/org/openo/holmes/common/api/stat/Alarm.java b/holmes-actions/src/main/java/org/openo/holmes/common/api/stat/Alarm.java
index 3ea3715..c12b549 100644 (file)
--- a/holmes-actions/src/main/java/org/openo/holmes/common/api/stat/Alarm.java
+++ b/holmes-actions/src/main/java/org/openo/holmes/common/api/stat/Alarm.java
@@ -201,7 +201,7 @@ public class Alarm implements AplusData, Cloneable, Serializable {
 \r
     @Override\r
     public boolean equals(Object arg0) {\r
-        if (arg0 == null) {\r
+        if (arg0 == null || !(arg0 instanceof Alarm)) {\r
             return false;\r
         }\r
         return this.alarmKey.equals(((Alarm) arg0).getAlarmKey());\r

diff --git a/holmes-actions/src/main/java/org/openo/holmes/common/producer/MQProducer.java b/holmes-actions/src/main/java/org/openo/holmes/common/producer/MQProducer.java
index 0de1289..d258695 100644 (file)
--- a/holmes-actions/src/main/java/org/openo/holmes/common/producer/MQProducer.java
+++ b/holmes-actions/src/main/java/org/openo/holmes/common/producer/MQProducer.java
@@ -24,6 +24,7 @@ import javax.jms.JMSException;
 import javax.jms.MessageProducer;\r
 import javax.jms.ObjectMessage;\r
 import javax.jms.Session;\r
+import lombok.NoArgsConstructor;\r
 import lombok.extern.slf4j.Slf4j;\r
 import org.glassfish.hk2.api.IterableProvider;\r
 import org.jvnet.hk2.annotations.Service;\r
@@ -36,16 +37,13 @@ import org.apache.activemq.ActiveMQConnectionFactory;
 \r
 @Service\r
 @Slf4j\r
+@NoArgsConstructor\r
 public class MQProducer {\r
 \r
     @Inject\r
     private IterableProvider<MQConfig> mqConfigProvider;\r
     private ConnectionFactory connectionFactory;\r
 \r
-    public MQProducer() {\r
-\r
-    }\r
-\r
     public void init() {\r
 \r
         String brokerURL =\r