Fix Sonar Issues in sli/adapter module

one major issue
* Use try with resources instead of try

Issue-Id: CCSDK-87
Change-Id: Iff46703282a6b9ccb3b61c29495c81a49aaed5da
Signed-off-by: surya-huawei <a.u.surya@huawei.com>

diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceActivator.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceActivator.java
index ef1bc02..e1fa907 100644 (file)
--- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceActivator.java
+++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceActivator.java
@@ -76,7 +76,6 @@ public class AAIServiceActivator implements BundleActivator {
                }
 
                Properties properties = new Properties();
-               InputStream input = null;
 
                // find aaiclient config file
                File[] files = findFiles(configDirectory, DEFAULT_CONFIG_FILE_NAME);
@@ -84,20 +83,12 @@ public class AAIServiceActivator implements BundleActivator {
                // read the aai config data
                if(files != null && files.length > 0) {
                        LOG.debug("AAIService config file exists and it is named :" + files[0].getAbsolutePath() );
-                       try {
-                               input = new FileInputStream(files[0]);
+                       try ( InputStream input = new FileInputStream(files[0])) {
                                properties.load(input);
                                LOG.debug("Loaded AAI Client properties from " + files[0].getAbsolutePath());
                        } catch (IOException exc) {
                                LOG.warn("Problem loading AAI Client properties from " + files[0].getAbsolutePath(), exc);
                        } finally {
-                               if(input != null ) {
-                                       try {
-                                               input.close();
-                                       } catch(Exception exc) {
-                                               // ignore
-                                       }
-                               }
                                int size = properties.keySet().size() ;
                                if(size == 0) {
                                        LOG.debug(files[0].getAbsolutePath() + " contained no entries. Adding the default entry");