Reverting "Merge "fix try block"" 97/56397/2
authorJorge Hernandez <jh1730@att.com>
Fri, 13 Jul 2018 15:05:50 +0000 (10:05 -0500)
committerJorge Hernandez <jh1730@att.com>
Fri, 13 Jul 2018 15:08:19 +0000 (10:08 -0500)
This reverts commit 240bbdbdc76e0e91af9f18164eadb2708d14c6fb, reversing
changes made to 3ee69f1af0acddd1e06060ad88c0029fe7ceeaaf.

Change-Id: I61f07ead1d7d3e89c512a2224efecf9ac440df10
Issue-ID: POLICY-961
Signed-off-by: Jorge Hernandez <jh1730@att.com>
ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/PAPRestConfig.java
ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/ConfigPolicy.java
ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java
ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/PDPServices.java
POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyRestController.java
POLICY-SDK-APP/src/main/java/org/onap/policy/admin/RESTfulPAPEngine.java

index 7e514ef..1b9afe5 100644 (file)
@@ -57,8 +57,9 @@ public class PAPRestConfig extends WebMvcConfigurerAdapter {
        @PostConstruct
        public void init(){
                Properties prop = new Properties();
-
-               try(InputStream input = new FileInputStream("xacml.pap.properties")) {
+               InputStream input = null;
+               try {
+                       input = new FileInputStream("xacml.pap.properties");
                        // load a properties file
                        prop.load(input);
                        setDbDriver(prop.getProperty("javax.persistence.jdbc.driver"));
@@ -67,6 +68,14 @@ public class PAPRestConfig extends WebMvcConfigurerAdapter {
                        setDbPassword( CryptoUtils.decryptTxtNoExStr(prop.getProperty("javax.persistence.jdbc.password", "")));
                }catch(Exception e){
                        LOGGER.error("Exception Occured while loading properties file"+e);
+               }finally{
+                       if(input != null){
+                               try {
+                                       input.close();
+                               } catch (IOException e) {
+                                       LOGGER.error("Exception Occured while clsoing the stream"+e);
+                               }
+                       }
                }
        }
        
index b808e58..48eb784 100644 (file)
@@ -80,15 +80,24 @@ public class ConfigPolicy extends Policy {
        
        // Saving the Configurations file at server location for config policy.
        protected void saveConfigurations(String policyName) {
-
-               String fileName = getConfigFile(policyName);
-               try(BufferedWriter bw = new BufferedWriter(new FileWriter(CONFIG_HOME + File.separator + fileName))) {
+               BufferedWriter bw = null;
+               try {
+                       String fileName = getConfigFile(policyName);
+                       bw = new BufferedWriter(new FileWriter(CONFIG_HOME + File.separator + fileName));
                        bw.write(configBodyData);
                        if (LOGGER.isDebugEnabled()) {
                            LOGGER.debug("Configuration is succesfully saved");
                        }
                } catch (IOException e) {
                        LOGGER.error("Exception Occured while writing Configuration Data"+e);
+               } finally {
+                   if(bw != null){
+                    try {
+                        bw.close();
+                    } catch (Exception e) {
+                        LOGGER.error("Exception Occured while closing the BufferedWriter"+e);
+                    }
+               }
                }
        }
 
index 0679e79..7757c2f 100644 (file)
@@ -185,8 +185,9 @@ public class CreateNewMicroServiceModel {
            int BUFFER = 2048;
            File file = new File(zipFile);
 
-
-               try(ZipFile zip = new ZipFile("ExtractDir" + File.separator +file)) {
+           ZipFile zip = null;
+               try {
+                       zip = new ZipFile("ExtractDir" + File.separator +file);
                    String newPath =  zipFile.substring(0, zipFile.length() - 4);
                    new File(newPath).mkdir();
                    Enumeration zipFileEntries = zip.entries();
@@ -224,6 +225,14 @@ public class CreateNewMicroServiceModel {
                    }
            } catch (IOException e) {
                        logger.error("Failed to unzip model file " + zipFile + e);
+               }finally{
+                       if(zip != null){
+                               try {
+                                       zip.close();
+                               } catch (Exception e) {
+                                       logger.error("Exception Occured while closing the zip file"+e);
+                               }
+                       }
                }
        }
 
index 60b35fb..a8449e3 100644 (file)
@@ -1923,15 +1923,18 @@ public class PolicyDBDao {
                
                private String readConfigFile(String configPath){
                        String configDataString = null;
-
-                       try(InputStream configContentStream = new FileInputStream(configPath)) {
+                       InputStream configContentStream = null;
+                       try {
+                               configContentStream = new FileInputStream(configPath);
                                configDataString = IOUtils.toString(configContentStream);
                        } catch (FileNotFoundException e) {
                                logger.error("Caught FileNotFoundException on new FileInputStream("+configPath+")",e);
                                throw new IllegalArgumentException("The config file path does not exist");
                        } catch(IOException e2){
-                               logger.error("Caught IOException on newIOUtils.toString(configContentStream)",e2);
+                               logger.error("Caught IOException on newIOUtils.toString("+configContentStream+")",e2);
                                throw new IllegalArgumentException("The config file path cannot be read");
+                       } finally {
+                               IOUtils.closeQuietly(configContentStream);
                        }
                        if(configDataString == null){
                                throw new IllegalArgumentException("The config file path cannot be read");
index 8722de4..af7112e 100644 (file)
@@ -340,9 +340,10 @@ public class PDPServices {
         if(pdpConfigLocation.contains("/")){
             pdpConfigLocation = pdpConfigLocation.replace("/", File.separator);
         }
-
+        InputStream inputStream = null;
         JsonReader jsonReader = null;
-        try(InputStream inputStream = new FileInputStream(new File(pdpConfigLocation))) {
+        try {
+            inputStream = new FileInputStream(new File(pdpConfigLocation));
             try {
                 if (pdpConfigLocation.endsWith("json")) {
                     pdpResponse.setType(PolicyType.JSON);
@@ -412,6 +413,10 @@ public class PDPServices {
         } catch (FileNotFoundException e) {
             LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + e);
             throw new PDPException(XACMLErrorConstants.ERROR_DATA_ISSUE + "Error in ConfigURL", e);
+        }finally{
+               if(inputStream != null){
+               inputStream.close();
+               }
         }
     }
 
index 21f15bb..8df9d1b 100644 (file)
@@ -338,17 +338,10 @@ public class PolicyRestController extends RestrictedBaseController{
                                // get the response content into a String
                                String responseJson = null;
                                // read the inputStream into a buffer (trick found online scans entire input looking for end-of-file)
-                               try(java.util.Scanner scanner = new java.util.Scanner(connection.getInputStream())) {
-                                       scanner.useDelimiter("\\A");
-                                       responseJson = scanner.hasNext() ? scanner.next() : "";
-                               } catch (Exception e) {
-                                       //Reason for rethrowing the exception is if any exception occurs during reading of inputsteam
-                                       //then the exception handling is done by the outer block without returning the response immediately
-                                       //Also finally block is existing only in outer block and not here so all exception handling is
-                                       //done in only one place
-                                       policyLogger.error("Exception Occured"+e);
-                                       throw e;
-                               }
+                               java.util.Scanner scanner = new java.util.Scanner(connection.getInputStream());
+                               scanner.useDelimiter("\\A");
+                               responseJson =  scanner.hasNext() ? scanner.next() : "";
+                               scanner.close();
                                policyLogger.info("JSON response from PAP: " + responseJson);
                                return responseJson;
                        }
index b14a881..a8831ea 100644 (file)
@@ -455,13 +455,10 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP
                        // get the response content into a String
                        String json = null;
                                // read the inputStream into a buffer (trick found online scans entire input looking for end-of-file)
-                           try(java.util.Scanner scanner = new java.util.Scanner(connection.getInputStream())) {
-                                               scanner.useDelimiter("\\A");
-                                               json = scanner.hasNext() ? scanner.next() : "";
-                                       }catch(Exception e) {
-                                               LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Failed to read inputStream from connection: " + e, e);
-                               throw e;
-                                       }
+                           java.util.Scanner scanner = new java.util.Scanner(connection.getInputStream());
+                           scanner.useDelimiter("\\A");
+                           json =  scanner.hasNext() ? scanner.next() : "";
+                           scanner.close();
                            LOGGER.info("JSON response from PAP: " + json);
                        
                        // convert Object sent as JSON into local object