FIX SONAR ISSUE USING TRY WITH RES

[holmes/rule-management.git] / rulemgt / src / main / java / org / onap / holmes / rulemgt / resources / SwaggerResource.java

diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/SwaggerResource.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/SwaggerResource.java
index df5a8f1..83555b2 100644 (file)
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/SwaggerResource.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/SwaggerResource.java
@@ -18,11 +18,8 @@ package org.onap.holmes.rulemgt.resources;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.SwaggerDefinition;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
+
+import java.io.*;
 import java.net.URL;
 import java.net.URLDecoder;
 import javax.ws.rs.GET;
@@ -43,11 +40,16 @@ public class SwaggerResource {
     public String getSwaggerJson() {
         URL url = SwaggerResource.class.getResource("/swagger.json");
         String ret = "{}";
+
+        File file;
         try {
             System.out.println(URLDecoder.decode(url.getPath(), "UTF-8"));
-            File file = new File(URLDecoder.decode(url.getPath(), "UTF-8"));
-
-            BufferedReader br = new BufferedReader(new FileReader(file));
+            file = new File(URLDecoder.decode(url.getPath(), "UTF-8"));
+        } catch(IOException e) {
+            log.warn("An error occurred while reading swagger.json.", e);
+            return ret;
+        }
+        try(BufferedReader br = new BufferedReader(new FileReader(file));)  {
             StringBuffer buffer = new StringBuffer();
             String line = " ";
             while ((line = br.readLine()) != null) {
@@ -55,9 +57,9 @@ public class SwaggerResource {
             }
             ret = buffer.toString();
         } catch (FileNotFoundException e) {
-            log.warn("Failed to read the API description file.");
+            log.warn("Failed to read the API description file.", e);
         } catch (IOException e) {
-            log.warn("An error occurred while reading swagger.json.");
+            log.warn("An error occurred while reading swagger.json.", e);
         }
         return ret;
     }