import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
+import java.io.IOException;
public class MessageChannel {
public MessageChannel(int size) {
if (size > 0) {
- queue = new LinkedBlockingQueue<Object>(size);
+ queue = new LinkedBlockingQueue<>(size);
} else {
- queue = new LinkedBlockingQueue<Object>();
+ queue = new LinkedBlockingQueue<>();
}
}
public MessageChannel() {
- queue = new LinkedBlockingQueue<Object>();
+ queue = new LinkedBlockingQueue<>();
}
- public void put(Object msg) throws InterruptedException {
+ public void put(Object msg) throws IOException {
while (!queue.offer(msg)) {
queue.poll();
}
public class MessageChannelFactory {
- private static Map<String, MessageChannel> map = new HashMap<String, MessageChannel>();
+ private static Map<String, MessageChannel> map = new HashMap<>();
- public synchronized static MessageChannel getMessageChannel(String key, Integer size) {
+ public static synchronized MessageChannel getMessageChannel(String key, Integer size) {
if (map.get(key) != null) {
return map.get(key);
}
return mc;
}
- public synchronized static MessageChannel getMessageChannel(String key) {
+ public static synchronized MessageChannel getMessageChannel(String key) {
if (map.get(key) != null) {
return map.get(key);
}
return mc;
}
- public synchronized static boolean destroyMessageChannel(String key) {
+ public static synchronized boolean destroyMessageChannel(String key) {
if (map.get(key) != null) {
map.remove(key);
return true;
return false;
}
- public synchronized static void clean() {
+ public static synchronized void clean() {
map.clear();
}
}
}
}).build();
SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext);
- CloseableHttpClient httpclient = HttpClients.custom().setSSLSocketFactory(sslsf).build();
+ return HttpClients.custom().setSSLSocketFactory(sslsf).build();
- return httpclient;
}
}
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
-import java.io.IOException;
/*
* HttpClient post request
log.info("NorthMessageMgr Thread start threadStop=" + threadStop);
try {
Properties properties = configurationInterface.getProperties();
- String event_api_url = properties.getProperty("event_api_url");
+ String eventApiUrl = properties.getProperty("event_api_url");
String port = properties.getProperty("port");
String path = properties.getProperty("path");
String topic = properties.getProperty("topic");
}
//login north
- event_api_url = "http://" + event_api_url;
- log.info("AgentMain.evel_initialize start event_api_url=[" + event_api_url + "]port=[" + port + "]path=[" + path + "]"
+ eventApiUrl = "http://" + eventApiUrl;
+ log.info("AgentMain.evel_initialize start event_api_url=[" + eventApiUrl + "]port=[" + port + "]path=[" + path + "]"
+ "topic=[" + topic + "]username=[" + username + /*"]password=[" + password +*/ "]level=[" + level + "]");
try {
- EVEL_ERR_CODES evecode = AgentMain.evel_initialize(event_api_url, Integer.parseInt(port),
+ EVEL_ERR_CODES evecode = AgentMain.evel_initialize(eventApiUrl, Integer.parseInt(port),
path, topic,
username,
password,
log.info("AgentMain.evel_initialize sucess EVEL_ERR_CODES=" + evecode);
} catch (Exception e) {
log.error("AgentMain.evel_initialize fail ", e);
- }/* catch (Error e1) {
- log.error("AgentMain.evel_initialize Error ", e1);
- }*/
+ }
} catch (Exception e2) {
log.error("NorthMessageMgr start fail ", e2);
}
}
class HeatBeatTread extends Thread {
-
+ @Override
public void run() {
while (!threadStop) {
try {
Thread.sleep(60 * 1000L);//60 secs
} catch (Exception e) {
- // e.printStackTrace();
log.error("Unable to sleep the HB thread ", e);
}
} catch (Exception e) {
class AlarmMessageRecv extends Thread {
long timeStamp = System.currentTimeMillis();
+ @Override
public void run() {
while (!threadStop) {
class ResultMessageRecv extends Thread {
long timeStamp = System.currentTimeMillis();
+ @Override
public void run() {
while (!threadStop) {
class CollectMessageRecv extends Thread {
long timeStamp = System.currentTimeMillis();
+ @Override
public void run() {
log.info("CollectMessageRecv Thread is start threadStop=" + threadStop);
while (!threadStop) {
} catch (Exception e) {
log.error("CollectMessageRecv exception", e);
- } /*catch (Error e) {
- log.error("CollectMessageRecv Error", e);
- }*/
- }
+ }
+ }
}
private EvelScalingMeasurement resultEvelScalingMeasurement(Map<String, String> reMap) {
String evname = "Mfvs_" + reMap.get("ElementType") + reMap.get("ObjectType");
String evid = reMap.get("StartTime") + reMap.get("ObjectType") + reMap.get("rmUID");
- int Period = Integer.parseInt(reMap.get("Period") != null ? reMap.get("Period") : "15");
- EvelScalingMeasurement sm = new EvelScalingMeasurement(Period, evname, evid);
+ int period = Integer.parseInt(reMap.get("Period") != null ? reMap.get("Period") : "15");
+ EvelScalingMeasurement sm = new EvelScalingMeasurement(period, evname, evid);
for (String key : reMap.keySet()) {
sm.evel_measurement_custom_measurement_add(reMap.get("ElementType"), key, reMap.get(key));
sm.evel_header_type_set("applicationVnf");
String rmUID = reMap.get("rmUID");
sm.evel_reporting_entity_id_set(rmUID.substring(0, 9));//
- String Dn = reMap.get("Dn");
- if (Dn != null)
- sm.evel_reporting_entity_name_set(Dn.substring(0, Dn.indexOf(";") > -1 ? Dn.indexOf(";") : Dn.length()));//0 is valid index
+ String dn = reMap.get("Dn");
+ if (dn != null)
+ sm.evel_reporting_entity_name_set(dn.substring(0, dn.indexOf(";") > -1 ? dn.indexOf(";") : dn.length()));//0 is valid index
else {
// decide the flow if Dn is null
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
@Path("/ems-driver")
@Produces(MediaType.APPLICATION_JSON)
@Api(tags = {"ems-driver TestResource"})
public class CommandResource {
+ private Log log = LogFactory.getLog(CommandResource.class);
@GET
@Timed
@ApiOperation(value = "get ems-driver Info")
public String executeCommand(@QueryParam("command") String command) {
-
- System.out.println("receiver command = " + command);
+ log.info("receiver command = " + command);
return command;
}
String url = MsbConfiguration.getMsbAddress() + Constant.MSBAPIROOTDOMAIN;
String registerObj = JSON.toJSONString(registerInfo);
- String registerResponse = HttpClientUtil.doPost(url, registerObj, Constant.ENCODING_UTF8);
- return registerResponse;
+ return HttpClientUtil.doPost(url, registerObj, Constant.ENCODING_UTF8);
}
public static void unRegiserService(String serviceName, String version, String ip, String port) {
}
public static List<String> queryService(String serviceName, String version) {
- List<String> ipList = new ArrayList<String>();
+ List<String> ipList = new ArrayList<>();
String url = MsbConfiguration.getMsbAddress() + Constant.MSBAPIROOTDOMAIN + "/" + serviceName + "/version/" + version;
String response = HttpClientUtil.doGet(url, Constant.ENCODING_UTF8);
if (response != null && !"".equals(response)) {
-/*
+/**
* Copyright 2017 BOCO Corporation. CMCC Technologies Co., Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
public void dispose() {
if (configurationInterface != null) {
List<EMSInfo> emsInfos = configurationInterface.getAllEMSInfo();
- while (isRun() && emsInfos.size() == 0) {
+ while (isRun() && emsInfos.isEmpty()) {
emsInfos = configurationInterface.getAllEMSInfo();
- if (emsInfos.size() == 0) {
+ if (emsInfos.isEmpty()) {
try {
Thread.sleep(1000);
} catch (Exception e) {
}
- List<CollectVo> collectVos = new ArrayList<CollectVo>();
+ List<CollectVo> collectVos = new ArrayList<>();
for (EMSInfo emsInfo : emsInfos) {
//cm
- CollectVo CollectVoCm = emsInfo.getCollectVoByType(Constant.COLLECT_TYPE_CM);
- if (CollectVoCm != null) {
- CollectVoCm.setEmsName(emsInfo.getName());
- collectVos.add(CollectVoCm);
+ CollectVo collectVoCm = emsInfo.getCollectVoByType(Constant.COLLECT_TYPE_CM);
+ if (collectVoCm != null) {
+ collectVoCm.setEmsName(emsInfo.getName());
+ collectVos.add(collectVoCm);
}
//pm
- CollectVo CollectVoPm = emsInfo.getCollectVoByType(Constant.COLLECT_TYPE_PM);
- if (CollectVoPm != null) {
- CollectVoPm.setEmsName(emsInfo.getName());
- collectVos.add(CollectVoPm);
+ CollectVo collectVoPm = emsInfo.getCollectVoByType(Constant.COLLECT_TYPE_PM);
+ if (collectVoPm != null) {
+ collectVoPm.setEmsName(emsInfo.getName());
+ collectVos.add(collectVoPm);
}
}
- if (collectVos.size() > 0) {
+ if (!collectVos.isEmpty()) {
this.addCollectJob(collectVos);
log.info("1 addCollectJob is OK ");
} else {
for (CollectVo collectVo : collectVos) {
try {
String jobName = collectVo.getEmsName() + "_" + collectVo.getType() + collectVo.getIP();
- Job job = new CollectOderJob();
- String jobClass = job.getClass().getName();
+ String jobClass = CollectOderJob.class.getName();
String time = collectVo.getCrontab();
if (time != null && !"".equals(time)) {
QuartzManager.addJob(jobName, jobClass, time, collectVo);
private static Log log = LogFactory.getFactory().getInstance(QuartzManager.class);
private static SchedulerFactory gSchedulerFactory = new StdSchedulerFactory();
- private static String JOB_GROUP_NAME = "EXTJWEB_JOBGROUP_NAME";
- private static String TRIGGER_GROUP_NAME = "EXTJWEB_TRIGGERGROUP_NAME";
+ private static String jobGroupName = "EXTJWEB_JOBGROUP_NAME";
+ private static String triggerGroupName = "EXTJWEB_TRIGGERGROUP_NAME";
/**
* @param jobName
boolean sucess = false;
try {
Scheduler sched = gSchedulerFactory.getScheduler();
- JobDetail jobDetail = new JobDetail(jobName, JOB_GROUP_NAME, Class.forName(jobClass));
+ JobDetail jobDetail = new JobDetail(jobName, jobGroupName, Class.forName(jobClass));
- CronTrigger trigger = new CronTrigger(jobName, TRIGGER_GROUP_NAME);
+ CronTrigger trigger = new CronTrigger(jobName, triggerGroupName);
trigger.setCronExpression(time);
jobDetail.getJobDataMap().put("collectVo", collectVo);
boolean sucess = false;
try {
Scheduler sched = gSchedulerFactory.getScheduler();
- CronTrigger trigger = (CronTrigger) sched.getTrigger(jobName, TRIGGER_GROUP_NAME);
+ CronTrigger trigger = (CronTrigger) sched.getTrigger(jobName, triggerGroupName);
if (trigger == null) {
return false;
}
String oldTime = trigger.getCronExpression();
if (!oldTime.equalsIgnoreCase(time)) {
- JobDetail jobDetail = sched.getJobDetail(jobName, JOB_GROUP_NAME);
+ JobDetail jobDetail = sched.getJobDetail(jobName, jobGroupName);
Class<Job> objJobClass = jobDetail.getJobClass();
String jobClass = objJobClass.getName();
boolean sucess = false;
try {
Scheduler sched = gSchedulerFactory.getScheduler();
- sched.pauseTrigger(jobName, TRIGGER_GROUP_NAME);
- sched.unscheduleJob(jobName, TRIGGER_GROUP_NAME);
- sched.deleteJob(jobName, JOB_GROUP_NAME);
+ sched.pauseTrigger(jobName, triggerGroupName);
+ sched.unscheduleJob(jobName, triggerGroupName);
+ sched.deleteJob(jobName, jobGroupName);
sucess = true;
} catch (Exception e) {
sucess = false;
Code Review / vfc / nfvo / driver / ems.git / commitdiff