Resources handling multivimproxy

common/util/restclient/RestfulConfigure.java
file name: RestHttpContentExchange.java

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

diff --git a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/RestHttpContentExchange.java b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/RestHttpContentExchange.java
index d6e4643..f5a59cb 100644 (file)
--- a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/RestHttpContentExchange.java
+++ b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/RestHttpContentExchange.java
@@ -79,41 +79,16 @@ public class RestHttpContentExchange extends ContentExchange {
         if(data == null) {
             return "";
         }
-        ByteArrayInputStream input = null;
-        GZIPInputStream gzis = null;
-        InputStreamReader reader = null;
         final StringBuilder out = new StringBuilder();
-        try {
-            input = new ByteArrayInputStream(data);
-            gzis = new GZIPInputStream(input);
-            reader = new InputStreamReader(gzis, Charset.forName(RestfulClientConst.ENCODING));
+        try (
+            ByteArrayInputStream input = new ByteArrayInputStream(data);
+            GZIPInputStream gzis = new GZIPInputStream(input);
+            InputStreamReader reader = new InputStreamReader(gzis, Charset.forName(RestfulClientConst.ENCODING))){
             final char[] buff = new char[1024];
             for(int n; (n = reader.read(buff)) != -1;) {
                 out.append(new String(buff, 0, n));
             }
-        } finally {
-            if(reader != null) {
-                try {
-                    reader.close();
-                } catch(final IOException e) {
-                    LOGGER.error("decompress Gzip reader exception:", e);
-                }
-            }
-            if(gzis != null) {
-                try {
-                    gzis.close();
-                } catch(final IOException e) {
-                    LOGGER.error("decompress Gzip exception:", e);
-                }
-            }
-            if(input != null) {
-                try {
-                    input.close();
-                } catch(final IOException e) {
-                    LOGGER.error("decompress Gzip input exception:", e);
-                }
-            }
-        }
+        } 
         return out.toString();
 
     }

diff --git a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/RestfulConfigure.java b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/RestfulConfigure.java
index 6bb383f..ad186c9 100644 (file)
--- a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/RestfulConfigure.java
+++ b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/RestfulConfigure.java
@@ -134,28 +134,15 @@ public class RestfulConfigure {
             LOG.error(filePath + "isn't exist.");
             return null;
         }
-        BufferedReader reader = null;
         final StringBuilder jsonstr = new StringBuilder();
-        JSONObject jo = null;
-        try {
-            reader = new BufferedReader(new FileReader(file));
+        try (BufferedReader reader = new BufferedReader(new FileReader(file))){
             final ReaderHelper rHelpper = new ReaderHelper(reader);
-            String tempString = null;
-            while((tempString = rHelpper.getLine()) != null) {
-                jsonstr.append(tempString);
+            while(null != rHelpper.getLine()) {
+                jsonstr.append(rHelpper.getLine());
             }
-            jo = JSONObject.fromObject(jsonstr.toString());
         } catch(final IOException e) {
             LOG.error("load file exception:" + e);
-        } finally {
-            if(reader != null) {
-                try {
-                    reader.close();
-                } catch(final IOException e) {
-                    LOG.error("close error.", e);
-                }
-            }
-        }
-        return jo;
+        } 
+        return JSONObject.fromObject(jsonstr.toString());
     }
 }