X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fmr%2FdmaapMMAgent%2FMirrorMakerAgent.java;h=afab7f606165264346deb80aabda6a78b05e2ed8;hb=ebace6d7c84d05e70ddfafbaa816390814c6b0ed;hp=de1947475d489893021b46856af299c5f954422b;hpb=d9f5e7364845230e6aa53601383094556ccac1b3;p=dmaap%2Fmessagerouter%2Fmirroragent.git

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 de19474..afab7f6 100644
--- a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java
+++ b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java
@@ -21,23 +21,18 @@
  *******************************************************************************/
 package org.onap.dmaap.mr.dmaapMMAgent;
 
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Properties;
-import org.json.JSONObject;
+
 import org.apache.log4j.Logger;
 import org.jasypt.util.text.BasicTextEncryptor;
-
+import org.json.JSONObject;
 import org.onap.dmaap.mr.dmaapMMAgent.dao.CreateMirrorMaker;
 import org.onap.dmaap.mr.dmaapMMAgent.dao.DeleteMirrorMaker;
 import org.onap.dmaap.mr.dmaapMMAgent.dao.ListMirrorMaker;
@@ -45,13 +40,10 @@ import org.onap.dmaap.mr.dmaapMMAgent.dao.MirrorMaker;
 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.JsonArray;
 import com.google.gson.internal.LinkedTreeMap;
 
-import com.sun.org.apache.xerces.internal.impl.dtd.models.CMAny;
-import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
-
 public class MirrorMakerAgent {
 	static final Logger logger = Logger.getLogger(MirrorMakerAgent.class);
 	Properties mirrorMakerProperties = new Properties();
@@ -100,18 +92,17 @@ public class MirrorMakerAgent {
 	private boolean checkStartup() {
 		FileInputStream input = null;
 		try {
-			//this.mmagenthome = System.getProperty("MMAGENTHOME");
 			input = new FileInputStream(mmagenthome + "/etc/mmagent.config");
 			logger.info("mmagenthome is set :" + mmagenthome + " loading properties at /etc/mmagent.config");
 		} catch (IOException ex) {
-			logger.error(mmagenthome + "/etc/mmagent.config not found.  Set -DMMAGENTHOME and check the config file");
+			logger.error(mmagenthome + "/etc/mmagent.config not found.");
 			return false;
 		} finally {
 			if (input != null) {
 				try {
 					input.close();
 				} catch (IOException e) {
-					e.printStackTrace();
+					logger.error("exception occured in checkStartup "+e);
 				}
 			}
 		}
@@ -119,7 +110,7 @@ public class MirrorMakerAgent {
 		input = null;
 		try {
 			input = new FileInputStream(kafkahome + "/bin/kafka-run-class.sh");
-			logger.info("kakahome is set :" + kafkahome);
+			logger.info("kafkahome is set :" + kafkahome);
 		} catch (IOException ex) {
 			logger.error(kafkahome + "/bin/kafka-run-class.sh not found.  Make sure kafka home is set correctly");
 			return false;
@@ -128,7 +119,7 @@ public class MirrorMakerAgent {
 				try {
 					input.close();
 				} catch (IOException e) {
-					e.printStackTrace();
+					logger.error("exception occured in checkStartup "+e);
 				}
 			}
 		}
@@ -139,7 +130,7 @@ public class MirrorMakerAgent {
 			return false;
 		}
 		logger.info("Published to Topic :" + this.topicname + " Successfully");
-		response = topicUtil.subscribeTopic(topicURL, topicname, "1", response, response);
+		response = topicUtil.subscribeTopic(topicURL, topicname, "1", mechid, password);
 		if (response != null && response.startsWith("ERROR:")) {
 			logger.error("Problem subscribing to topic, please verify the config " + this.topicname + " MR URL is:"
 					+ this.topicURL + " Error is:  " + response);
@@ -176,7 +167,7 @@ public class MirrorMakerAgent {
 				prop.store(out, "");
 
 			} catch (Exception e) {
-				e.printStackTrace();
+				logger.error("exception occured in checkPropertiesFile "+e);
 			}
 		} finally {
 			if (input != null) {
@@ -190,7 +181,7 @@ public class MirrorMakerAgent {
 				try {
 					out.close();
 				} catch (IOException e) {
-					e.printStackTrace();
+					logger.error("exception occured in checkPropertiesFile "+e);
 				}
 			}
 		}