[DMaap-msgrtr] Update Security Vulnerabilities

   - Log4j version 1.2.17 to 2.13.3
   - commons-codec version 1.11 to 1.15
   - jackson-databind version 2.8.11.1 to 2.11.2
   - grails-bootstrap version 2.5.4 to 4.0.1
   - httpclient version 4.5.3 to 4.5.13
   - Code Refactoring

Issue-ID: DMAAP-1515
Signed-off-by: ajay_dp001 <ajay.deep.singh@est.tech>
Change-Id: I6d52dd85e1ca82b5863815b26e4d521f9dac28b7

1 files changed, 55 insertions, 61 deletions

diff --git a/src/test/java/org/onap/dmaap/mr/test/dme2/DME2ConsumerFilterTest.java b/src/test/java/org/onap/dmaap/mr/test/dme2/DME2ConsumerFilterTest.java
index 59e1845..af1a43e 100644
--- a/src/test/java/org/onap/dmaap/mr/test/dme2/DME2ConsumerFilterTest.java
+++ b/src/test/java/org/onap/dmaap/mr/test/dme2/DME2ConsumerFilterTest.java
@@ -8,7 +8,7 @@
  *  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.
@@ -17,80 +17,74 @@
  *  ============LICENSE_END=========================================================
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
+ *
  *******************************************************************************/
 package org.onap.dmaap.mr.test.dme2;
 
+import com.att.aft.dme2.api.DME2Client;
+import com.att.aft.dme2.api.DME2Exception;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URLEncoder;
 import java.util.HashMap;
 import java.util.Properties;
-
-import org.apache.log4j.Logger;
-
 import junit.framework.TestCase;
-
-import com.att.aft.dme2.api.DME2Client;
-import com.att.aft.dme2.api.DME2Exception;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class DME2ConsumerFilterTest extends TestCase {
-	private static final Logger LOGGER = Logger.getLogger(DME2ConsumerFilterTest.class);
-
-	public void testConsumerFilter() {
-		LOGGER.info("Test case consumer filter initiated");
-		
-		Properties props = LoadPropertyFile.getPropertyFileDataProducer();
-		String latitude = props.getProperty("Latitude");
-		String longitude = props.getProperty("Longitude");
-		String version = props.getProperty("Version");
-		String serviceName = props.getProperty("ServiceName");
-		String env = props.getProperty("Environment");
-		String partner = props.getProperty("Partner");
-		String protocol = props.getProperty("Protocol");
-		String methodType = props.getProperty("MethodTypeGet");
-		String user = props.getProperty("user");
-		String password = props.getProperty("password");
-		String contenttype = props.getProperty("contenttype");
 
-		String url = protocol + "://DME2SEARCH/" + "service=" + serviceName + "/" + "version=" + version + "/"
-				+ "envContext=" + env + "/" + "partner=" + partner;
-		LoadPropertyFile.loadAFTProperties(latitude, longitude);
-		HashMap<String, String> hm = new HashMap<String, String>();
-		hm.put("AFT_DME2_EP_READ_TIMEOUT_MS", "50000");
-		hm.put("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000");
-		hm.put("AFT_DME2_EP_CONN_TIMEOUT", "5000");
+    private static final Logger LOGGER = LogManager.getLogger(DME2ConsumerFilterTest.class);
 
-		try {
-			// ..checking for topic exist is commented
-			// if (!topicTestObj.topicExist(url, props, hm)) {
-			// throw new Exception("Topic does not exist");
-			// } else {
-			DME2Client sender = new DME2Client(new URI(url), 5000L);
-			sender.setAllowAllHttpReturnCodes(true);
-			sender.setMethod(methodType);
-			String subContextPathConsumer = props.getProperty("SubContextPathConsumer") + props.getProperty("newTopic")
-					+ "/" + props.getProperty("group") + "/" + props.getProperty("id") + "?"
-					+ props.getProperty("filterType");
+    public void testConsumerFilter() {
+        LOGGER.info("Test case consumer filter initiated");
+        Properties props = LoadPropertyFile.getPropertyFileDataProducer();
+        String latitude = props.getProperty("Latitude");
+        String longitude = props.getProperty("Longitude");
+        String version = props.getProperty("Version");
+        String serviceName = props.getProperty("ServiceName");
+        String env = props.getProperty("Environment");
+        String partner = props.getProperty("Partner");
+        String protocol = props.getProperty("Protocol");
+        String methodType = props.getProperty("MethodTypeGet");
+        String user = props.getProperty("user");
+        String password = props.getProperty("password");
+        String contenttype = props.getProperty("contenttype");
+        String url =
+            protocol + "://DME2SEARCH/" + "service=" + serviceName + "/" + "version=" + version
+                + "/"
+                + "envContext=" + env + "/" + "partner=" + partner;
+        LoadPropertyFile.loadAFTProperties(latitude, longitude);
+        HashMap<String, String> hm = new HashMap<String, String>();
+        hm.put("AFT_DME2_EP_READ_TIMEOUT_MS", "50000");
+        hm.put("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000");
+        hm.put("AFT_DME2_EP_CONN_TIMEOUT", "5000");
 
-			sender.setSubContext(URLEncoder.encode(subContextPathConsumer, "UTF-8"));
-			sender.setPayload("");
+        try {
+            DME2Client sender = new DME2Client(new URI(url), 5000L);
+            sender.setAllowAllHttpReturnCodes(true);
+            sender.setMethod(methodType);
+            String subContextPathConsumer =
+                props.getProperty("SubContextPathConsumer") + props.getProperty("newTopic")
+                    + "/" + props.getProperty("group") + "/" + props.getProperty("id") + "?"
+                    + props.getProperty("filterType");
 
-			sender.addHeader("Content-Type", contenttype);
-			sender.setCredentials(user, password);
-			sender.setHeaders(hm);
+            sender.setSubContext(URLEncoder.encode(subContextPathConsumer, "UTF-8"));
+            sender.setPayload("");
 
-			LOGGER.info("Consuming Message for Filter");
-			String reply = sender.sendAndWait(5000L);
-			assertNotNull(reply);
-			LOGGER.info("Message received = " + reply);
-			// }
-		} catch (DME2Exception e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+            sender.addHeader("Content-Type", contenttype);
+            sender.setCredentials(user, password);
+            sender.setHeaders(hm);
+            LOGGER.info("Consuming Message for Filter");
+            String reply = sender.sendAndWait(5000L);
+            assertNotNull(reply);
+            LOGGER.info("Message received = " + reply);
+        } catch (DME2Exception e) {
+            e.printStackTrace();
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }