summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java11
-rw-r--r--src/main/java/org/onap/dmaap/mr/dmaapMMAgent/TopicUtil.java11
-rw-r--r--src/main/java/org/onap/dmaap/mr/dmaapMMAgent/utils/MirrorMakerProcessHandler.java6
3 files changed, 13 insertions, 15 deletions
diff --git a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java
index 9af3809..f47adfb 100644
--- a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java
+++ b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java
@@ -21,6 +21,8 @@
*******************************************************************************/
package org.onap.dmaap.mr.dmaapMMAgent;
+import com.google.gson.Gson;
+import com.google.gson.internal.LinkedTreeMap;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -29,8 +31,8 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Properties;
-
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.jasypt.util.text.BasicTextEncryptor;
import org.json.JSONObject;
import org.onap.dmaap.mr.dmaapMMAgent.dao.CreateMirrorMaker;
@@ -41,11 +43,8 @@ import org.onap.dmaap.mr.dmaapMMAgent.dao.UpdateMirrorMaker;
import org.onap.dmaap.mr.dmaapMMAgent.dao.UpdateWhiteList;
import org.onap.dmaap.mr.dmaapMMAgent.utils.MirrorMakerProcessHandler;
-import com.google.gson.Gson;
-import com.google.gson.internal.LinkedTreeMap;
-
public class MirrorMakerAgent {
- static final Logger logger = Logger.getLogger(MirrorMakerAgent.class);
+ private static final Logger logger = LogManager.getLogger(MirrorMakerAgent.class);
Properties mirrorMakerProperties = new Properties();
ListMirrorMaker mirrorMakers = null;
String mmagenthome = "/opt";
diff --git a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/TopicUtil.java b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/TopicUtil.java
index e2dc0ef..85a6bcd 100644
--- a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/TopicUtil.java
+++ b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/TopicUtil.java
@@ -22,21 +22,20 @@
package org.onap.dmaap.mr.dmaapMMAgent;
+import com.google.gson.Gson;
+import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
import java.io.BufferedReader;
import java.io.DataOutputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
-
-import org.apache.log4j.Logger;
-
-import com.google.gson.Gson;
-import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class TopicUtil {
- static final Logger logger = Logger.getLogger(TopicUtil.class);
+ private static final Logger logger = LogManager.getLogger(TopicUtil.class);
public String publishTopic(String topicURL, String topicname, String mechid, String password, String message) {
try {
diff --git a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/utils/MirrorMakerProcessHandler.java b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/utils/MirrorMakerProcessHandler.java
index 883d151..625fbc8 100644
--- a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/utils/MirrorMakerProcessHandler.java
+++ b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/utils/MirrorMakerProcessHandler.java
@@ -24,11 +24,11 @@ package org.onap.dmaap.mr.dmaapMMAgent.utils;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
-
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class MirrorMakerProcessHandler {
- static final Logger logger = Logger.getLogger(MirrorMakerProcessHandler.class);
+ private static final Logger logger = LogManager.getLogger(MirrorMakerProcessHandler.class);
static String mmagenthome = "/opt";
public static boolean checkMirrorMakerProcess(String agentname, boolean enablelogCheck, String grepLog) throws Exception {