Made Fields Private
[holmes/common.git] / holmes-actions / src / main / java / org / onap / holmes / common / producer / MQProducer.java
index 6aaa860..4bbffac 100644 (file)
@@ -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
@@ -47,12 +48,12 @@ public class MQProducer {
     public void init() {\r
 \r
         String brokerURL =\r
-            "tcp://" + mqConfigProvider.get().brokerIp + ":" + mqConfigProvider.get().brokerPort;\r
-        connectionFactory = new ActiveMQConnectionFactory(mqConfigProvider.get().brokerUsername,\r
-            mqConfigProvider.get().brokerPassword, brokerURL);\r
+            "tcp://" + mqConfigProvider.get().getBrokerIp() + ":" + mqConfigProvider.get().getBrokerPort();\r
+        connectionFactory = new ActiveMQConnectionFactory(mqConfigProvider.get().getBrokerUsername(),\r
+            mqConfigProvider.get().getBrokerPassword(), 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
@@ -83,13 +84,13 @@ public class MQProducer {
             messageProducer.send(message);\r
             session.commit();\r
         } catch (Exception e) {\r
-            log.error("Failed send correlation." + e.getMessage(), e);\r
+            log.error("Failed send correlation. " + e.getMessage(), e);\r
         } finally {\r
             if (connection != null) {\r
                 try {\r
                     connection.close();\r
                 } catch (JMSException e) {\r
-                    log.error("Failed close connection." + e.getMessage(), e);\r
+                    log.error("Failed close connection. " + e.getMessage(), e);\r
                 }\r
             }\r
         }\r