Fix few Blocker sonar issues

Fix few Blocker sonar issues in CCSDK SLI Northbound
https://sonar.onap.org/component_issues/index?id=org.onap.ccsdk.sli.northbound%3Accsdk-sli-northbound#resolved=false|severities=BLOCKER

Change-Id: I8a2f2e9f3bc5bc5c007076e42f77fbf5da1304ac
Issue-Id: CCSDK-67
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>
diff --git a/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncFlatJsonDmaapConsumer.java b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncFlatJsonDmaapConsumer.java
index abd395b..1754957 100644
--- a/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncFlatJsonDmaapConsumer.java
+++ b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncFlatJsonDmaapConsumer.java
@@ -164,10 +164,9 @@
 			return(null);
 		}
 
-		try {
-			BufferedReader mapReader = new BufferedReader(new FileReader(mapFile));
+		try (BufferedReader mapReader = new BufferedReader(new FileReader(mapFile))) {
 
-			String curLine = null;
+			String curLine;
 
 			while ((curLine = mapReader.readLine()) != null) {
 				curLine = curLine.trim();
diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncArtifactMap.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncArtifactMap.java
index 4c08949..dd9437c 100644
--- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncArtifactMap.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncArtifactMap.java
@@ -87,10 +87,7 @@
 
 		if (mapFile.exists() && mapFile.canRead()) {
 
-			BufferedReader rdr = null;
-			try {
-
-				rdr = new BufferedReader(new FileReader(mapFile));
+			try (BufferedReader rdr = new BufferedReader(new FileReader(mapFile))) {
 
 				for (String ln ; (ln = rdr.readLine()) != null ; ) {
 					String[] lnFields = ln.split(",");
@@ -107,14 +104,6 @@
 			} catch (Exception e) {
 				LOG.error("Caught exception reading artifact map", e);
 				return;
-			} finally {
-				if (rdr != null) {
-					try {
-						rdr.close();
-					} catch (IOException e) {
-
-					}
-				}
 			}
 		}
 	}