modify MQproducer

Issue-ID: HOLMES-47

Change-Id: I9224601a0d29986d0a7a7ebaaac6e6846d22ac7e
Signed-off-by: Shiwei Tian <tian.shiwei@zte.com.cn>

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/producer/MQProducer.java b/holmes-actions/src/main/java/org/onap/holmes/common/producer/MQProducer.java
index 6aaa860..9483bb6 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/producer/MQProducer.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/producer/MQProducer.java
@@ -29,6 +29,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.glassfish.hk2.api.IterableProvider;\r
 import org.jvnet.hk2.annotations.Service;\r
 import org.onap.holmes.common.api.stat.Alarm;\r
+import org.onap.holmes.common.api.stat.VesAlarm;\r
 import org.onap.holmes.common.constant.AlarmConst;\r
 import org.onap.holmes.common.api.entity.CorrelationResult;\r
 import org.onap.holmes.common.api.stat.AplusResult;\r
@@ -52,7 +53,7 @@ public class MQProducer {
             mqConfigProvider.get().brokerPassword, brokerURL);\r
     }\r
 \r
-    public void sendAlarmMQTopicMsg(Alarm alarm) {\r
+    public void sendAlarmMQTopicMsg(VesAlarm alarm) {\r
         sendMQTopicMsg(alarm);\r
     }\r
 \r
@@ -75,7 +76,7 @@ public class MQProducer {
             session = connection.createSession(true, Session.AUTO_ACKNOWLEDGE);\r
             if (t instanceof CorrelationResult) {\r
                 destination = session.createTopic(AlarmConst.MQ_TOPIC_NAME_ALARMS_CORRELATION);\r
-            } else if (t instanceof Alarm) {\r
+            } else if (t instanceof VesAlarm) {\r
                 destination = session.createTopic(AlarmConst.MQ_TOPIC_NAME_ALARM);\r
             }\r
             messageProducer = session.createProducer(destination);\r

diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/producer/MQProducerTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/producer/MQProducerTest.java
index 7c561b0..d9dffeb 100644 (file)
--- a/holmes-actions/src/test/java/org/onap/holmes/common/producer/MQProducerTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/producer/MQProducerTest.java
@@ -36,6 +36,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.onap.holmes.common.api.stat.Alarm;
 import org.onap.holmes.common.api.entity.CorrelationResult;
+import org.onap.holmes.common.api.stat.VesAlarm;
 import org.onap.holmes.common.config.MQConfig;
 import org.powermock.api.easymock.PowerMock;
 import org.powermock.modules.junit4.rule.PowerMockRule;
@@ -84,7 +85,7 @@ public class MQProducerTest {
 
     @Test
     public void sendAlarmMQTopicMsg() throws Exception {
-        Alarm alarm = new Alarm();
+        VesAlarm alarm = new VesAlarm();
         Connection connection = PowerMock.createMock(Connection.class);
         Session session = PowerMock.createMock(Session.class);
         Destination destination = PowerMock.createMock(Topic.class);
@@ -113,7 +114,7 @@ public class MQProducerTest {
     @Test
     public void sendAlarmMQTopicMsg_exception() throws Exception {
         thrown.expect(JMSException.class);
-        Alarm alarm = new Alarm();
+        VesAlarm alarm = new VesAlarm();
 
         expect(connectionFactory.createConnection()).andThrow(new JMSException(""));