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
commit e1a07d866fdae5371eecdc804349d8867ef04caf Author: Gary Gregory <[email protected]> AuthorDate: Wed Jun 29 17:42:21 2022 -0400 PMD rule UnnecessaryModifier --- .../apache/commons/configuration2/DatabaseConfiguration.java | 12 ++++++------ .../apache/commons/configuration2/io/DefaultFileSystem.java | 2 +- .../apache/commons/configuration2/TestINIConfiguration.java | 2 +- .../builder/TestFileBasedConfigurationBuilder.java | 2 +- .../reloading/TestVFSFileHandlerReloadingDetector.java | 2 +- .../java/org/apache/commons/configuration2/test/HsqlDB.java | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java b/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java index 91d414a9..20c4f5fc 100644 --- a/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java @@ -299,7 +299,7 @@ public class DatabaseConfiguration extends AbstractConfiguration { @Override protected Object performOperation() throws SQLException { final List<Object> results = new ArrayList<>(); - try (final ResultSet rs = openResultSet(String.format(SQL_GET_PROPERTY, table, keyColumn), true, key)) { + try (ResultSet rs = openResultSet(String.format(SQL_GET_PROPERTY, table, keyColumn), true, key)) { while (rs.next()) { final Object value = extractPropertyValue(rs); // Split value if it contains the list delimiter @@ -344,7 +344,7 @@ public class DatabaseConfiguration extends AbstractConfiguration { } query.append(")"); - try (final PreparedStatement pstmt = initStatement(query.toString(), false, key, String.valueOf(obj))) { + try (PreparedStatement pstmt = initStatement(query.toString(), false, key, String.valueOf(obj))) { if (configurationNameColumn != null) { pstmt.setString(3, configurationName); } @@ -389,7 +389,7 @@ public class DatabaseConfiguration extends AbstractConfiguration { final JdbcOperation<Integer> op = new JdbcOperation<Integer>(ConfigurationErrorEvent.READ, ConfigurationErrorEvent.READ, null, null) { @Override protected Integer performOperation() throws SQLException { - try (final ResultSet rs = openResultSet(String.format(SQL_IS_EMPTY, table), true)) { + try (ResultSet rs = openResultSet(String.format(SQL_IS_EMPTY, table), true)) { return rs.next() ? Integer.valueOf(rs.getInt(1)) : null; } } @@ -412,7 +412,7 @@ public class DatabaseConfiguration extends AbstractConfiguration { final JdbcOperation<Boolean> op = new JdbcOperation<Boolean>(ConfigurationErrorEvent.READ, ConfigurationErrorEvent.READ, key, null) { @Override protected Boolean performOperation() throws SQLException { - try (final ResultSet rs = openResultSet(String.format(SQL_GET_PROPERTY, table, keyColumn), true, key)) { + try (ResultSet rs = openResultSet(String.format(SQL_GET_PROPERTY, table, keyColumn), true, key)) { return rs.next(); } } @@ -434,7 +434,7 @@ public class DatabaseConfiguration extends AbstractConfiguration { new JdbcOperation<Void>(ConfigurationErrorEvent.WRITE, ConfigurationEvent.CLEAR_PROPERTY, key, null) { @Override protected Void performOperation() throws SQLException { - try (final PreparedStatement ps = initStatement(String.format(SQL_CLEAR_PROPERTY, table, keyColumn), true, key)) { + try (PreparedStatement ps = initStatement(String.format(SQL_CLEAR_PROPERTY, table, keyColumn), true, key)) { ps.executeUpdate(); return null; } @@ -471,7 +471,7 @@ public class DatabaseConfiguration extends AbstractConfiguration { new JdbcOperation<Collection<String>>(ConfigurationErrorEvent.READ, ConfigurationErrorEvent.READ, null, null) { @Override protected Collection<String> performOperation() throws SQLException { - try (final ResultSet rs = openResultSet(String.format(SQL_GET_KEYS, keyColumn, table), true)) { + try (ResultSet rs = openResultSet(String.format(SQL_GET_KEYS, keyColumn, table), true)) { while (rs.next()) { keys.add(rs.getString(1)); } 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 122b6591..e02d5128 100644 --- a/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java +++ b/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java @@ -179,7 +179,7 @@ public class DefaultFileSystem extends FileSystem { url = new URL(baseURL, fileName); // check if the file exists - try (final InputStream in = url.openStream()) { + try (InputStream in = url.openStream()) { // nothing in.available(); } diff --git a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java index 9a118a90..77fc5724 100644 --- a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java @@ -135,7 +135,7 @@ public class TestINIConfiguration { * @throws ConfigurationException if an error occurs */ private static void load(final INIConfiguration instance, final String data) throws ConfigurationException { - try (final StringReader reader = new StringReader(data)) { + try (StringReader reader = new StringReader(data)) { instance.read(reader); } catch (final IOException e) { throw new ConfigurationException(e); diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java b/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java index 828cf738..bd79d905 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java @@ -320,7 +320,7 @@ public class TestFileBasedConfigurationBuilder { final URL jarResourceUrl = getClass().getClassLoader().getResource("org/apache/commons/configuration2/test.jar"); assertNotNull(jarResourceUrl); final Path testJar = Paths.get(folder.getRoot().getAbsolutePath(), "test.jar"); - try (final InputStream inputStream = jarResourceUrl.openStream()) { + try (InputStream inputStream = jarResourceUrl.openStream()) { Files.copy(inputStream, testJar); } final URL url = new URL("jar:" + testJar.toUri() + "!/configuration.properties"); diff --git a/src/test/java/org/apache/commons/configuration2/reloading/TestVFSFileHandlerReloadingDetector.java b/src/test/java/org/apache/commons/configuration2/reloading/TestVFSFileHandlerReloadingDetector.java index 2e476946..6941f01a 100644 --- a/src/test/java/org/apache/commons/configuration2/reloading/TestVFSFileHandlerReloadingDetector.java +++ b/src/test/java/org/apache/commons/configuration2/reloading/TestVFSFileHandlerReloadingDetector.java @@ -148,7 +148,7 @@ public class TestVFSFileHandlerReloadingDetector { * @throws IOException if an error occurs */ private void writeTestFile(final File file, final String value) throws IOException { - try (final FileWriter out = new FileWriter(file)) { + try (FileWriter out = new FileWriter(file)) { out.write(String.format(FMT_XML, value)); } } diff --git a/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java b/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java index a15e5214..870c0621 100644 --- a/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java +++ b/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java @@ -59,7 +59,7 @@ public class HsqlDB { } private String getFileContents(final String fileName) throws Exception { - try (final FileReader fr = new FileReader(fileName)) { + try (FileReader fr = new FileReader(fileName)) { final char fileBuf[] = new char[1024]; final StringBuilder sb = new StringBuilder(1000);
