diff options
author | 2020-06-24 10:52:42 +0800 | |
---|---|---|
committer | 2020-06-24 10:52:42 +0800 | |
commit | 3e5ddaee6984869b67dda89b7f8e1932a2b27045 (patch) | |
tree | 229f4df8a1f47e44167ade01545bae1c5dc0b0ae /holmes-actions/src/main/java/org/onap | |
parent | b6bcfbcc8b7445a953b4d5963dc4ff93028362c5 (diff) |
Upgraded to Java 11
Change-Id: Iee2bce6fad2076b1df093f1f978b2e78a64c6492
Issue-ID: HOLMES-302
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
Diffstat (limited to 'holmes-actions/src/main/java/org/onap')
3 files changed, 9 insertions, 117 deletions
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 deleted file mode 100644 index 4bbffac..0000000 --- a/holmes-actions/src/main/java/org/onap/holmes/common/producer/MQProducer.java +++ /dev/null @@ -1,108 +0,0 @@ -/**
- * 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.onap.holmes.common.producer;
-
-import java.io.Serializable;
-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.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.glassfish.hk2.api.IterableProvider;
-import org.jvnet.hk2.annotations.Service;
-import org.onap.holmes.common.api.stat.Alarm;
-import org.onap.holmes.common.api.stat.VesAlarm;
-import org.onap.holmes.common.constant.AlarmConst;
-import org.onap.holmes.common.api.entity.CorrelationResult;
-import org.onap.holmes.common.api.stat.AplusResult;
-import org.onap.holmes.common.config.MQConfig;
-import org.apache.activemq.ActiveMQConnectionFactory;
-
-@Service
-@Slf4j
-@NoArgsConstructor
-public class MQProducer {
-
- @Inject
- private IterableProvider<MQConfig> mqConfigProvider;
- private ConnectionFactory connectionFactory;
-
- public void init() {
-
- String brokerURL =
- "tcp://" + mqConfigProvider.get().getBrokerIp() + ":" + mqConfigProvider.get().getBrokerPort();
- connectionFactory = new ActiveMQConnectionFactory(mqConfigProvider.get().getBrokerUsername(),
- mqConfigProvider.get().getBrokerPassword(), brokerURL);
- }
-
- public void sendAlarmMQTopicMsg(VesAlarm alarm) {
- sendMQTopicMsg(alarm);
- }
-
- public void sendCorrelationMQTopicMsg(String ruleId, long createTimeL, Alarm parentAlarm,
- Alarm childAlarm) {
- CorrelationResult correlationResult = getCorrelationResult(ruleId, createTimeL, parentAlarm, childAlarm);
- sendMQTopicMsg(correlationResult);
- }
-
- private <T> void sendMQTopicMsg(T t) {
- Serializable msgEntity = (Serializable) t;
- Connection connection = null;
- Session session;
- Destination destination = null;
- MessageProducer messageProducer;
-
- try {
- connection = connectionFactory.createConnection();
- connection.start();
- session = connection.createSession(true, Session.AUTO_ACKNOWLEDGE);
- if (t instanceof CorrelationResult) {
- destination = session.createTopic(AlarmConst.MQ_TOPIC_NAME_ALARMS_CORRELATION);
- } else if (t instanceof VesAlarm) {
- destination = session.createTopic(AlarmConst.MQ_TOPIC_NAME_ALARM);
- }
- messageProducer = session.createProducer(destination);
- ObjectMessage message = session.createObjectMessage(msgEntity);
- 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);
- }
- }
- }
- }
-
- private CorrelationResult getCorrelationResult(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});
- return correlationResult;
- }
-}
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/DbDaoUtil.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/DbDaoUtil.java index a88519a..05792c5 100644 --- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/DbDaoUtil.java +++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/DbDaoUtil.java @@ -18,10 +18,11 @@ package org.onap.holmes.common.utils; import io.dropwizard.db.DataSourceFactory;
import io.dropwizard.jdbi.DBIFactory;
import io.dropwizard.setup.Environment;
-import lombok.extern.slf4j.Slf4j;
import org.jvnet.hk2.annotations.Service;
import org.skife.jdbi.v2.DBI;
import org.skife.jdbi.v2.Handle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
@@ -29,9 +30,10 @@ import javax.inject.Singleton; @Singleton
@Service
-@Slf4j
public class DbDaoUtil {
+ private Logger log = LoggerFactory.getLogger(DbDaoUtil.class);
+
private DBI jdbi;
@Inject
private Environment environmentProvider;
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/MSBRegisterUtil.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/MSBRegisterUtil.java index 877a824..a849ab8 100644 --- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/MSBRegisterUtil.java +++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/MSBRegisterUtil.java @@ -1,12 +1,12 @@ /**
- * Copyright 2017 ZTE Corporation.
- *
+ * Copyright 2017-2020 ZTE Corporation.
+ * <p>
* 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
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
* 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.
@@ -16,8 +16,6 @@ package org.onap.holmes.common.utils;
-import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
-
import lombok.extern.slf4j.Slf4j;
import org.jvnet.hk2.annotations.Service;
import org.onap.holmes.common.config.MicroServiceConfig;
|