summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGaurav Agrawal <gaurav.agrawal@huawei.com>2017-09-08 19:28:18 +0530
committerGaurav Agrawal <gaurav.agrawal@huawei.com>2017-09-08 19:28:18 +0530
commitea0aabe54bc7b5d609b587e87ce85765f73fecbc (patch)
tree3957a3e83ae97a142a4b501df1f08f5966c47513
parent8881ebb497e9f35e5ea9d19923fd926db56e8f12 (diff)
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>
-rw-r--r--dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncFlatJsonDmaapConsumer.java5
-rw-r--r--ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncArtifactMap.java13
2 files changed, 3 insertions, 15 deletions
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 abd395bf..1754957d 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 @@ public class SdncFlatJsonDmaapConsumer extends SdncDmaapConsumer {
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 4c08949c..dd9437ce 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 @@ public class SdncArtifactMap {
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 @@ public class SdncArtifactMap {
} catch (Exception e) {
LOG.error("Caught exception reading artifact map", e);
return;
- } finally {
- if (rdr != null) {
- try {
- rdr.close();
- } catch (IOException e) {
-
- }
- }
}
}
}