Refactor AbstractPropertiesFactory.load(File|String) to use NIO

garydgregory · garydgregory · commit 7d15275d74b7 · 2025-03-15T15:38:05.000-04:00
- Refactor AbstractPropertiesFactory.load(File) to use NIO
- Refactor AbstractPropertiesFactory.load(String) to use NIO
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -24,6 +24,8 @@
   <body>
   <release version="4.5.0-M4" date="YYYY-MM-DD" description="This is a feature and maintenance release. Java 8 or later is required.">
     <!-- FIX -->
+    <action type="fix" dev="ggregory" due-to="Gary Gregory">Refactor AbstractPropertiesFactory.load(File) to use NIO.</action>
+    <action type="fix" dev="ggregory" due-to="Gary Gregory">Refactor AbstractPropertiesFactory.load(String) to use NIO.</action>
     <!-- ADD -->
     <!-- UPDATE -->
     <action type="update" dev="ggregory" due-to="Gary Gregory">Bump commons-codec:commons-codec from 1.17.1 to 1.18.0 #591.</action>
diff --git a/src/main/java/org/apache/commons/collections4/properties/AbstractPropertiesFactory.java b/src/main/java/org/apache/commons/collections4/properties/AbstractPropertiesFactory.java
@@ -18,7 +18,6 @@
 package org.apache.commons.collections4.properties;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -100,9 +99,7 @@ public T load(final ClassLoader classLoader, final String name) throws IOExcepti
      *                                  the file.
      */
     public T load(final File file) throws FileNotFoundException, IOException {
-        try (FileInputStream inputStream = new FileInputStream(file)) {
-            return load(inputStream, PropertyFormat.toPropertyFormat(file.getName()));
-        }
+        return load(file.toPath());
     }
 
     /**
@@ -182,9 +179,7 @@ public T load(final Reader reader) throws IOException {
      * @throws IllegalArgumentException Thrown if the input contains a malformed Unicode escape sequence.
      */
     public T load(final String name) throws IOException {
-        try (FileInputStream inputStream = new FileInputStream(name)) {
-            return load(inputStream, PropertyFormat.toPropertyFormat(name));
-        }
+        return load(Paths.get(name));
     }
 
     /**
