Merge "Fix sonar issues"

1 files changed, 9 insertions, 17 deletions

diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
index 866fd14d7..224a51998 100644
--- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
@@ -482,24 +482,19 @@ public class SdncUebCallback implements INotificationCallback {
         // Save zip if TOSCA_CSAR
         if (artifact.getArtifactType().contains("TOSCA_CSAR") || artifact.getArtifactName().contains(".csar")) {
 
-	        try {
-	        	
-				FileOutputStream outFile = new FileOutputStream(incomingDir.getAbsolutePath() + "/" + artifact.getArtifactName());
-				outFile.write(payloadBytes, 0, payloadBytes.length);
-				outFile.close();
-	            writeSucceeded = true;
-	        } catch (Exception e) {
-	            LOG.error("Unable to save downloaded zip file to spool directory ("+ incomingDir.getAbsolutePath() +")", e);
-	        }
+                try(FileOutputStream outFile = new FileOutputStream(incomingDir.getAbsolutePath() + "/" + artifact.getArtifactName())) {
+                    outFile.write(payloadBytes, 0, payloadBytes.length);
+                    writeSucceeded = true;
+                } catch (Exception e) {
+                    LOG.error("Unable to save downloaded zip file to spool directory ("+ incomingDir.getAbsolutePath() +")", e);
+                }
 
         } else {
 
 			String payload = new String(payloadBytes);
 	
-	        try {
-	            FileWriter spoolFileWriter = new FileWriter(spoolFile);
+	        try(FileWriter spoolFileWriter = new FileWriter(spoolFile)) {
 	            spoolFileWriter.write(payload);
-	            spoolFileWriter.close();
 	            writeSucceeded = true;
 	        } catch (Exception e) {
 	            LOG.error("Unable to save downloaded file to spool directory ("+ incomingDir.getAbsolutePath() +")", e);
@@ -943,9 +938,8 @@ public class SdncUebCallback implements INotificationCallback {
             msgBuffer.append("<artifact-version>"+artifact.getArtifactVersion()+"</artifact-version>\n");        	
         } 
         
-        try {
-            BufferedReader rdr = new BufferedReader(new FileReader(artifact.getFile()));
-
+        try(BufferedReader rdr = new BufferedReader(new FileReader(artifact.getFile()))) {
+            
             String curLine = rdr.readLine();
 
             while (curLine != null) {
@@ -966,8 +960,6 @@ public class SdncUebCallback implements INotificationCallback {
                 }
                 curLine = rdr.readLine();
             }
-            rdr.close();
-
         } catch (Exception e) {
             LOG.error("Could not process spool file "+artifact.getFile().getName(), e);
 			return(DistributionStatusEnum.DEPLOY_ERROR);