From: ajay priyadarshi <ajay.priyadarshi@ril.com>
Date: Mon, 12 Mar 2018 12:30:54 +0000 (+0530)
Subject: sonar fix: Rsrc handling in JujuClientManager
X-Git-Tag: v1.1.0~33
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7fc1dd800318077f95e59b2c6a4b6ca14399a09b;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fgvnfm.git

sonar fix: Rsrc handling in JujuClientManager

try-with resource issues fixed
file name: JujuClientManager.java

Change-Id: Id547af46419cc0bb75ca29af324ffff2570d83b4
Issue-ID: VFC-805
Signed-off-by: ajay priyadarshi <ajay.priyadarshi@ril.com>
---

diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuClientManager.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuClientManager.java
index fee0f28..6753108 100644
--- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuClientManager.java
+++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuClientManager.java
@@ -167,16 +167,13 @@ public class JujuClientManager implements IJujuClientManager {
      * @since  NFVO 0.5
      */
     public static String readJujuConfigInfo() {
-        InputStream ins = null;
-
-        BufferedInputStream bins = null;
         String fileContent = null;
         String fileName = SystemEnvVariablesFactory.getInstance().getAppRoot() + System.getProperty("file.separator")
                 + "etc" + System.getProperty("file.separator") + "conf" + System.getProperty("file.separator")
                 + "juju_conf.json";
-        try {
-            ins = new FileInputStream(fileName);
-            bins = new BufferedInputStream(ins);
+        try (
+            InputStream ins = new FileInputStream(fileName);
+            BufferedInputStream bins = new BufferedInputStream(ins)){
 
             byte[] contentByte = new byte[ins.available()];
             int num = bins.read(contentByte);
@@ -186,17 +183,7 @@ public class JujuClientManager implements IJujuClientManager {
             }
         } catch (Exception e) {
             LOG.error(fileName + "is not found!", e);
-        } finally {
-            try {
-                if (ins != null) {
-                    ins.close();
-                }
-                if (bins != null) {
-                    bins.close();
-                }
-            } catch (IOException e) {
-            }
-        }
+        } 
         return fileContent;
     }
     private JSONObject changeDir(String charmPath) {