This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git
The following commit(s) were added to refs/heads/master by this push:
new 9633f81 Use try-with-resource.
9633f81 is described below
commit 9633f81fdd49b464b4c2206e16405b6045ac24fb
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Nov 21 10:34:25 2020 -0500
Use try-with-resource.
---
.../commons/configuration2/io/DefaultFileSystem.java | 16 +++++-----------
.../commons/configuration2/TestINIConfiguration.java | 7 +------
.../configuration2/TestPropertiesConfiguration.java | 16 +++-------------
.../commons/configuration2/TestXMLConfiguration.java | 11 +----------
...stReloadingCombinedConfigurationBuilderFileBased.java | 11 +----------
.../commons/configuration2/io/TestFileHandler.java | 14 ++------------
.../plist/TestXMLPropertyListConfiguration.java | 7 +------
7 files changed, 14 insertions(+), 68 deletions(-)
diff --git
a/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java
b/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java
index c8fa13c..7e19c27 100644
--- a/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java
+++ b/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java
@@ -44,7 +44,8 @@ public class DefaultFileSystem extends FileSystem
}
@Override
- public InputStream getInputStream(final URL url, final
URLConnectionOptions urlConnectionOptions) throws ConfigurationException
+ public InputStream getInputStream(final URL url, final
URLConnectionOptions urlConnectionOptions)
+ throws ConfigurationException
{
// throw an exception if the target URL is a directory
final File file = FileLocatorUtils.fileFromURL(url);
@@ -228,17 +229,10 @@ public class DefaultFileSystem extends FileSystem
url = new URL(baseURL, fileName);
// check if the file exists
- InputStream in = null;
- try
+ try (InputStream in = url.openStream())
{
- in = url.openStream();
- }
- finally
- {
- if (in != null)
- {
- in.close();
- }
+ // nothing
+
}
return url;
}
diff --git
a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
index 568e852..0676542 100644
--- a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
@@ -197,15 +197,10 @@ public class TestINIConfiguration
private File writeTestFile(final String content) throws IOException
{
final File file = folder.newFile();
- final PrintWriter out = new PrintWriter(new FileWriter(file));
- try
+ try (PrintWriter out = new PrintWriter(new FileWriter(file)))
{
out.println(content);
}
- finally
- {
- out.close();
- }
return file;
}
diff --git
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
index 2b68473..7b6c693 100644
---
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
@@ -905,9 +905,8 @@ public class TestPropertiesConfiguration
"test.separator.no.space=foo"
};
final Set<String> foundLines = new HashSet<>();
- final BufferedReader in = new BufferedReader(new FileReader(
- testSavePropertiesFile));
- try
+ try (BufferedReader in = new BufferedReader(new FileReader(
+ testSavePropertiesFile)))
{
String s;
while ((s = in.readLine()) != null)
@@ -920,10 +919,6 @@ public class TestPropertiesConfiguration
}
}
}
- finally
- {
- in.close();
- }
assertEquals("No all separators were found: " + foundLines,
separatorTests.length, foundLines.size());
}
@@ -1349,8 +1344,7 @@ public class TestPropertiesConfiguration
public void testReadCalledDirectly() throws IOException
{
conf = new PropertiesConfiguration();
- final Reader in = new
FileReader(ConfigurationAssert.getTestFile("test.properties"));
- try
+ try (Reader in = new
FileReader(ConfigurationAssert.getTestFile("test.properties")))
{
conf.read(in);
fail("No exception thrown!");
@@ -1359,10 +1353,6 @@ public class TestPropertiesConfiguration
{
assertThat(e.getMessage(), containsString("FileHandler"));
}
- finally
- {
- in.close();
- }
}
/**
diff --git
a/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
index 5912cad..60c4bb5 100644
--- a/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
@@ -1351,19 +1351,10 @@ public class TestXMLConfiguration
{
final FileHandler handler = new FileHandler(conf);
handler.setEncoding("UTF8");
- FileOutputStream out = null;
- try
+ try (FileOutputStream out = new FileOutputStream(testSaveConf))
{
- out = new FileOutputStream(testSaveConf);
handler.save(out);
}
- finally
- {
- if(out != null)
- {
- out.close();
- }
- }
checkSavedConfig(testSaveConf);
}
diff --git
a/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
b/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
index b0914ff..35ac8eb 100644
---
a/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
+++
b/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
@@ -107,19 +107,10 @@ public class
TestReloadingCombinedConfigurationBuilderFileBased
*/
private static void writeFile(final File file, final String content)
throws IOException
{
- PrintWriter out = null;
- try
+ try (PrintWriter out = new PrintWriter(new FileWriter(file)))
{
- out = new PrintWriter(new FileWriter(file));
out.print(content);
}
- finally
- {
- if (out != null)
- {
- out.close();
- }
- }
}
/**
diff --git
a/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java
b/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java
index ee4c8d6..fcda843 100644
--- a/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java
+++ b/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java
@@ -606,15 +606,10 @@ public class TestFileHandler
final File file = createTestFile();
final FileBasedTestImpl content = new FileBasedTestImpl();
final FileHandler handler = new FileHandler(content);
- final FileInputStream in = new FileInputStream(file);
- try
+ try (FileInputStream in = new FileInputStream(file))
{
handler.load(in);
}
- finally
- {
- in.close();
- }
assertEquals("Wrong content", CONTENT, content.getContent());
}
@@ -627,15 +622,10 @@ public class TestFileHandler
final File file = createTestFile();
final FileBasedTestImpl content = new FileBasedTestImpl();
final FileHandler handler = new FileHandler(content);
- final Reader in = new FileReader(file);
- try
+ try (Reader in = new FileReader(file))
{
handler.load(in);
}
- finally
- {
- in.close();
- }
assertEquals("Wrong content", CONTENT, content.getContent());
}
diff --git
a/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
b/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
index 5420391..7b1a9e7 100644
---
a/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
@@ -552,8 +552,7 @@ public class TestXMLPropertyListConfiguration
config = new XMLPropertyListConfiguration();
config.addProperty("foo", "bar");
- final Writer out = new FileWriter(folder.newFile());
- try
+ try (Writer out = new FileWriter(folder.newFile()))
{
config.write(out);
fail("No exception thrown!");
@@ -562,9 +561,5 @@ public class TestXMLPropertyListConfiguration
{
assertThat(e.getMessage(), containsString("FileHandler"));
}
- finally
- {
- out.close();
- }
}
}
