X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fopeno%2Fholmes%2Fcommon%2Fproducer%2FMQProducer.java;h=e9c38b90f082b292873a7a08339ac6db1e88e74d;hb=189aa621be296963eb0b8b8891d4cea44cf4ede5;hp=826a56592d664dfc6c6a3a90c7d08aafa00265be;hpb=677b825b6d3228d4593a1e7313e7c45705af65a9;p=holmes%2Fcommon.git

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 826a565..e9c38b9 100644
--- 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
@@ -1,122 +1,106 @@
-/**
- * Copyright 2017 ZTE Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openo.holmes.common.producer;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.glassfish.hk2.api.IterableProvider;
-import org.jvnet.hk2.annotations.Service;
-import org.openo.holmes.common.api.entity.CorrelationResult;
-import org.openo.holmes.common.api.stat.Alarm;
-import org.openo.holmes.common.api.stat.AplusResult;
-import org.openo.holmes.common.config.MQConfig;
-import org.openo.holmes.common.constant.AlarmConst;
-
-@Service
-@Slf4j
-public class MQProducer {
-
-    @Inject
-    private IterableProvider<MQConfig> mqConfigProvider;
-    private ConnectionFactory connectionFactory;
-
-    @PostConstruct
-    public void init() {
-
-        String brokerURL =
-            "tcp://" + mqConfigProvider.get().brokerIp + ":" + mqConfigProvider.get().brokerPort;
-        connectionFactory = new ActiveMQConnectionFactory(mqConfigProvider.get().brokerUsername,
-            mqConfigProvider.get().brokerPassword, brokerURL);
-    }
-
-    public void sendAlarmMQTopicMsg(Alarm alarm) {
-
-        Connection connection = null;
-        Session session;
-        Destination destination;
-        MessageProducer messageProducer;
-
-        try {
-
-            connection = connectionFactory.createConnection();
-            connection.start();
-            session = connection.createSession(true, Session.AUTO_ACKNOWLEDGE);
-            destination = session.createTopic(AlarmConst.MQ_TOPIC_NAME_ALARM);
-            messageProducer = session.createProducer(destination);
-            ObjectMessage message = session.createObjectMessage(alarm);
-            messageProducer.send(message);
-            session.commit();
-
-        } catch (Exception e) {
-            log.error("Failed send alarm." + e.getMessage(), e);
-        } finally {
-            if (connection != null) {
-                try {
-                    connection.close();
-                } catch (JMSException e) {
-                    log.error("Failed close connection." + e.getMessage(), e);
-                }
-            }
-        }
-    }
-
-    public void sendCorrelationMQTopicMsg(String ruleId, long createTimeL, Alarm parentAlarm,
-        Alarm childAlarm) {
-
-        CorrelationResult correlationResult = new CorrelationResult();
-        correlationResult.setRuleId(ruleId);
-        correlationResult.setCreateTimeL(createTimeL);
-        correlationResult.setResultType(AplusResult.APLUS_CORRELATION);
-        correlationResult.setAffectedAlarms(new Alarm[]{parentAlarm, childAlarm});
-
-        Connection connection = null;
-        Session session;
-        Destination destination;
-        MessageProducer messageProducer;
-
-        try {
-
-            connection = connectionFactory.createConnection();
-            connection.start();
-            session = connection.createSession(true, Session.AUTO_ACKNOWLEDGE);
-            destination = session.createTopic(AlarmConst.MQ_TOPIC_NAME_ALARMS_CORRELATION);
-            messageProducer = session.createProducer(destination);
-            ObjectMessage message = session.createObjectMessage(correlationResult);
-            messageProducer.send(message);
-            session.commit();
-
-        } catch (Exception e) {
-            log.error("Failed send correlation." + e.getMessage(), e);
-        } finally {
-            if (connection != null) {
-                try {
-                    connection.close();
-                } catch (JMSException e) {
-                    log.error("Failed close connection." + e.getMessage(), e);
-                }
-            }
-        }
-    }
-}
+/**
+ * Copyright 2017 ZTE Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openo.holmes.common.producer;
+
+import javax.inject.Inject;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.MessageProducer;
+import javax.jms.ObjectMessage;
+import javax.jms.Session;
+import lombok.extern.slf4j.Slf4j;
+import org.glassfish.hk2.api.IterableProvider;
+import org.jvnet.hk2.annotations.Service;
+import org.openo.holmes.common.api.entity.CorrelationResult;
+import org.openo.holmes.common.api.stat.Alarm;
+import org.openo.holmes.common.api.stat.AplusResult;
+import org.openo.holmes.common.config.MQConfig;
+import org.openo.holmes.common.constant.AlarmConst;
+
+@Service
+@Slf4j
+public class MQProducer {
+
+    @Inject
+    private IterableProvider<MQConfig> mqConfigProvider;
+    private ConnectionFactory connectionFactory;
+
+    public void sendAlarmMQTopicMsg(Alarm alarm) {
+
+        Connection connection = null;
+        Session session;
+        Destination destination;
+        MessageProducer messageProducer;
+        try {
+            connection = connectionFactory.createConnection();
+            connection.start();
+            session = connection.createSession(true, Session.AUTO_ACKNOWLEDGE);
+            destination = session.createTopic(AlarmConst.MQ_TOPIC_NAME_ALARM);
+            messageProducer = session.createProducer(destination);
+            ObjectMessage message = session.createObjectMessage(alarm);
+            messageProducer.send(message);
+            session.commit();
+        } catch (Exception e) {
+            log.error("Failed send alarm." + e.getMessage(), e);
+        } finally {
+            if (connection != null) {
+                try {
+                    connection.close();
+                } catch (JMSException e) {
+                    log.error("Failed close connection." + e.getMessage(), e);
+                }
+            }
+        }
+    }
+
+    public void sendCorrelationMQTopicMsg(String ruleId, long createTimeL, Alarm parentAlarm,
+            Alarm childAlarm) {
+
+        CorrelationResult correlationResult = new CorrelationResult();
+        correlationResult.setRuleId(ruleId);
+        correlationResult.setCreateTimeL(createTimeL);
+        correlationResult.setResultType(AplusResult.APLUS_CORRELATION);
+        correlationResult.setAffectedAlarms(new Alarm[]{parentAlarm, childAlarm});
+
+        Connection connection = null;
+        Session session;
+        Destination destination;
+        MessageProducer messageProducer;
+
+        try {
+            connection = connectionFactory.createConnection();
+            connection.start();
+            session = connection.createSession(true, Session.AUTO_ACKNOWLEDGE);
+            destination = session.createTopic(AlarmConst.MQ_TOPIC_NAME_ALARMS_CORRELATION);
+            messageProducer = session.createProducer(destination);
+            ObjectMessage message = session.createObjectMessage(correlationResult);
+            messageProducer.send(message);
+            session.commit();
+        } catch (Exception e) {
+            log.error("Failed send correlation." + e.getMessage(), e);
+        } finally {
+            if (connection != null) {
+                try {
+                    connection.close();
+                } catch (JMSException e) {
+                    log.error("Failed close connection." + e.getMessage(), e);
+                }
+            }
+        }
+    }
+}