refact props to try-with-resources

sbtqa · Dec 19, 2016 · 47b8fe0 · 47b8fe0
1 parent 757c259
commit 47b8fe0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 20 deletions.
diff --git a/src/main/java/ru/sbtqa/tag/qautils/properties/Props.java b/src/main/java/ru/sbtqa/tag/qautils/properties/Props.java
@@ -24,23 +24,19 @@ public class Props {
     public Props() throws IOException {
         System.setProperty("logback.configurationFile", "config/logback.xml");
         String sConfigFile = System.getProperty("BDDConfigFile", "config/application.properties");
-        log.info("Loading properties from: " + sConfigFile);
-        //first try to load properties from resources
-        InputStream in = Props.class.getClassLoader().getResourceAsStream(sConfigFile);
         properties = new Properties();
-        //if failed try to load from filesystem
-        try {
-            if (in == null) {
-                in = new FileInputStream(sConfigFile);
-            }
-            properties.load(in);
-        } finally {
-            if (in != null) {
-                in.close();
+        log.info("Loading properties from: " + sConfigFile);
+        try (InputStream streamFromResources = Props.class.getClassLoader().getResourceAsStream(sConfigFile);
+             InputStream streamFromFilesystem = new FileInputStream(sConfigFile)) {
+            //first try to load properties from resources. If failed try to load from filesystem
+            if (streamFromResources != null) {
+                properties.load(streamFromResources);
+            } else {
+                properties.load(streamFromFilesystem);
             }
         }
     }
-    
+
     /**
      * Creates single instance of Props class or returns already created
      *
@@ -100,7 +96,7 @@ public static String get(String prop, String defaultValue) {
             if (value.isEmpty()) {
                 return defaultValue;
             }
-            
+
             return value;
         } else {
             return null;

diff --git a/src/main/java/ru/sbtqa/tag/qautils/reflect/FieldUtilsExt.java b/src/main/java/ru/sbtqa/tag/qautils/reflect/FieldUtilsExt.java
@@ -12,9 +12,8 @@
 public class FieldUtilsExt extends org.apache.commons.lang3.reflect.FieldUtils {
 
     /**
-     * It is like
-     * {@link org.apache.commons.lang3.reflect.FieldUtils} getAllFieldsList but
-     * extended by inherited declared fields only. Very fast.
+     * It is like {@link org.apache.commons.lang3.reflect.FieldUtils}
+     * getAllFieldsList but extended by inherited declared fields only.
      *
      * @param clazz the class to reflect
      * @return {@link List} a list of fields
@@ -35,9 +34,9 @@ public static List<Field> getDeclaredFieldsWithInheritance(Class clazz) {
     }
 
     /**
-     * It is like
-     * {@link org.apache.commons.lang3.reflect.FieldUtils} getAllFieldsList but
-     * extended by inherited declared fields only. Very fast.
+     * It is like {@link org.apache.commons.lang3.reflect.FieldUtils}
+     * getAllFieldsList but extended by inherited declared fields only. Very
+     * fast.
      *
      * @param object the class to reflect
      * @return {@link List} a list of fields