Merge "update the credentials in subscribe call"

diff --git a/.gitignore b/.gitignore
index b83d222..0f63015 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /target/
+/bin/

diff --git a/INFO.yaml b/INFO.yaml
new file mode 100644 (file)
index 0000000..b7236d8
--- /dev/null
+++ b/INFO.yaml
@@ -0,0 +1,42 @@
+---
+project: 'dmaap-messagerouter-mirroragent'
+project_creation_date: '2017-08-29'
+lifecycle_state: 'Incubation'
+project_lead: &onap_releng_ptl
+    name: 'Ram Koya'
+    email: 'rk541m@att.com'
+    id: 'rampi_k'
+    company: 'ATT'
+    timezone: 'America/Dallas'
+primary_contact: *onap_releng_ptl
+issue_tracking:
+    type: 'jira'
+    url: 'https://jira.onap.org/projects/DMAAP'
+    key: 'DMAAP'
+meetings:
+    - type: 'zoom'
+        agenda: ''
+        url: 'https://wiki.onap.org/pages/viewpage.action?pageId=13599275'
+        server: 'n/a'
+        channel: 'n/a'
+        repeats: 'weekly'
+        time: '13:00 UTC'
+committers:
+    - <<: *onap_releng_ptl
+    - name: 'Ramdas Sawant'
+        email: 'rs873m@att.com'
+        company: 'ATT'
+        id: 'rs873m'
+        timezone: 'America/Dallas'
+    - name: 'Varun Gudisena'
+        email: 'vg411h@att.com'
+        company: 'ATT'
+        id: 'vg411h'
+        timezone: 'America/Dallas'
+tsc:
+    approval: 'https://lists.onap.org/pipermail/onap-tsc'
+    changes:
+        - type: 'Removal'
+          name: 'Habib Madani'
+          name: 'Xinhui Li'
+          name: 'Jing Wang'

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 61515bc..c205440 100644 (file)
--- 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();

diff --git a/src/test/resources/logs/mmagent.log b/src/test/resources/logs/mmagent.log
deleted file mode 100644 (file)
index 3484430..0000000
--- a/src/test/resources/logs/mmagent.log
+++ /dev/null
@@ -1,4 +0,0 @@
-2017-10-02 21:46:17 INFO  - Mirror Maker agentName Started WhiteListing:whitelist  
-2017-10-02 21:46:17 INFO  - Mirror Maker AgentName Stopped  
-2017-10-02 22:19:07 INFO  - Mirror Maker AgentName Stopped  
-2017-10-02 22:19:07 INFO  - Mirror Maker agentName Started WhiteListing:whitelist