From: Pamela Dragosh <pdragosh@research.att.com>
Date: Tue, 13 Mar 2018 13:22:23 +0000 (+0000)
Subject: Merge "Sonar Blocker"
X-Git-Tag: v1.2.0~66
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=1c08fcf5dab216ee18b8df116c2c8d7683745702;hp=eff3339eafcc4cb46b983ff1a7681ff8a4117d39;p=policy%2Fengine.git

Merge "Sonar Blocker"
---

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/FirewallConfigPolicy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/FirewallConfigPolicy.java
index d95b36709..6e46ab1c0 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/FirewallConfigPolicy.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/FirewallConfigPolicy.java
@@ -98,32 +98,21 @@ public class FirewallConfigPolicy extends Policy {
 	// Saving the Configurations file at server location for config policy.
 	protected void saveConfigurations(String policyName, String jsonBody) {
 		String configurationName = policyName;
-		FileWriter fw = null;
-		try{
-			if(configurationName.endsWith(".xml")){
-				configurationName = configurationName.replace(".xml", "");
-			}
-			fw = new FileWriter(CONFIG_HOME + File.separator + configurationName + ".json");
-			BufferedWriter bw = new BufferedWriter(fw);
-			bw.write(jsonBody);
-			bw.close();
+		if(configurationName.endsWith(".xml")){
+            configurationName = configurationName.replace(".xml", "");
+		}
+        String fileName = CONFIG_HOME + File.separator + configurationName + ".json";
+		try(BufferedWriter bw = new BufferedWriter(new FileWriter(fileName))){
+		    bw.write(jsonBody);
 			if (LOGGER.isDebugEnabled()) {
 				LOGGER.debug("Configuration is succesfully saved");
 			}
 		} catch (IOException e) {
-			LOGGER.error("Exception Occured"+e);
-		}finally{
-			try{
-				if(fw != null){
-					fw.close();
-				}
-			}catch(Exception e){
-				LOGGER.error("Exception Occured"+e);
-			}
+			LOGGER.error("Save of configuration to file" +fileName+ "failed",e);
 		}
 	}
-
-	//Utility to read json data from the existing file to a string
+	
+   //Utility to read json data from the existing file to a string
 	static String readFile(String path, Charset encoding) throws IOException {
 		byte[] encoded = Files.readAllBytes(Paths.get(path));
 		return new String(encoded, encoding);