From e3332f29723ffbdea6f20dacdc3743da23f81a79 Mon Sep 17 00:00:00 2001 From: Krishnajinka Date: Fri, 20 Jul 2018 14:35:25 +0900 Subject: FIX USING TRY WITH RESOURCES ISSUE RAISED BY SONAR ABOUT CLOSING RESOURCES OPENED EFFICIENTLY USING TRY WITH RES CONSTRUCT Issue-ID: VFC-966 Change-Id: I11d0bf12300fe6b47dd8ac63d03d32864de41808 Signed-off-by: Krishnajinka --- .../util/restclient/RestHttpContentExchange.java | 33 +++------------------- 1 file changed, 4 insertions(+), 29 deletions(-) (limited to 'ResmanagementService/service') diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestHttpContentExchange.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestHttpContentExchange.java index fa01516..0d8ec94 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestHttpContentExchange.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestHttpContentExchange.java @@ -79,40 +79,15 @@ 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(); -- cgit 1.2.3-korg