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 1845dd8 Use final.
1845dd8 is described below
commit 1845dd874d7b7fc89d32149991dbe603c8539630
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Sep 17 09:50:35 2020 -0400
Use final.
---
.../commons/configuration2/ImmutableConfiguration.java | 8 ++++----
.../commons/configuration2/PropertiesConfiguration.java | 2 +-
.../org/apache/commons/configuration2/YAMLConfiguration.java | 4 ++--
.../configuration2/builder/PropertiesBuilderProperties.java | 2 +-
.../configuration2/builder/fluent/Configurations.java | 2 +-
.../apache/commons/configuration2/TestBaseConfiguration.java | 4 ++--
.../commons/configuration2/TestPropertiesConfiguration.java | 6 +++---
.../configuration2/TestPropertiesConfigurationLayout.java | 2 +-
.../apache/commons/configuration2/TestXMLConfiguration.java | 12 ++++++------
.../apache/commons/configuration2/TestYAMLConfiguration.java | 4 ++--
.../configuration2/builder/fluent/TestConfigurations.java | 6 +++---
11 files changed, 26 insertions(+), 26 deletions(-)
diff --git
a/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java
b/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java
index a8bd411..98c795d 100644
---
a/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java
+++
b/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java
@@ -373,10 +373,10 @@ public interface ImmutableConfiguration
* is not a String.
* @since 2.8
*/
- default <T extends Enum<T>> T getEnum(String key, Class<T> enumType) {
+ default <T extends Enum<T>> T getEnum(final String key, final Class<T>
enumType) {
try {
return Enum.valueOf(enumType, getString(key));
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
throw new ConversionException(e);
}
}
@@ -395,14 +395,14 @@ public interface ImmutableConfiguration
* not a Enum.
* @since 2.8
*/
- default <T extends Enum<T>> T getEnum(String key, Class<T> enumType, T
defaultValue) {
+ default <T extends Enum<T>> T getEnum(final String key, final Class<T>
enumType, final T defaultValue) {
final String strValue = getString(key, null);
if (strValue == null) {
return defaultValue;
}
try {
return Enum.valueOf(enumType, strValue);
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
throw new ConversionException(e);
}
}
diff --git
a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
index 1d4599f..e3d6967 100644
---
a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
+++
b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
@@ -1897,7 +1897,7 @@ public class PropertiesConfiguration extends
BaseConfiguration
seenStack.pop();
}
}
- catch (ConfigurationException e)
+ catch (final ConfigurationException e)
{
getIncludeListener().accept(e);
}
diff --git
a/src/main/java/org/apache/commons/configuration2/YAMLConfiguration.java
b/src/main/java/org/apache/commons/configuration2/YAMLConfiguration.java
index 05df6e6..cd034d8 100644
--- a/src/main/java/org/apache/commons/configuration2/YAMLConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/YAMLConfiguration.java
@@ -152,7 +152,7 @@ public class YAMLConfiguration extends
AbstractYAMLBasedConfiguration
* @param options options for loading the file
* @return the {@code Yaml} instance for loading a file
*/
- private static Yaml createYamlForReading(LoaderOptions options)
+ private static Yaml createYamlForReading(final LoaderOptions options)
{
return new Yaml(createClassLoadingDisablingConstructor(), new
Representer(), new DumperOptions(), options);
}
@@ -169,7 +169,7 @@ public class YAMLConfiguration extends
AbstractYAMLBasedConfiguration
return new Constructor()
{
@Override
- protected Class<?> getClassForName(String name)
+ protected Class<?> getClassForName(final String name)
{
throw new ConfigurationRuntimeException("Class instantiation
is disabled.");
}
diff --git
a/src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderProperties.java
b/src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderProperties.java
index 62040ed..5e6ec59 100644
---
a/src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderProperties.java
+++
b/src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderProperties.java
@@ -47,7 +47,7 @@ public interface PropertiesBuilderProperties<T>
* @return a reference to this object for method chaining
* @since 2.6
*/
- default T setIncludeListener(ConfigurationConsumer<ConfigurationException>
includeListener)
+ default T setIncludeListener(final
ConfigurationConsumer<ConfigurationException> includeListener)
{
return (T) this;
}
diff --git
a/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java
b/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java
index 418a367..68c5b62 100644
---
a/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java
+++
b/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java
@@ -257,7 +257,7 @@ public class Configurations
* @since 2.6
*/
public FileBasedConfigurationBuilder<PropertiesConfiguration>
propertiesBuilder(
- PropertiesBuilderParameters parameters)
+ final PropertiesBuilderParameters parameters)
{
return propertiesBuilder().configure(parameters);
}
diff --git
a/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
index 0a44658..945c51e 100644
--- a/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
@@ -359,14 +359,14 @@ public class TestBaseConfiguration
try {
config.getEnum("testBadEnum", EnumFixture.class);
fail("Expected " + ConversionException.class);
- } catch (ConversionException e) {
+ } catch (final ConversionException e) {
// expected
}
//
try {
config.getEnum("testBadEnum", EnumFixture.class, defaultValue);
fail("Expected " + ConversionException.class);
- } catch (ConversionException e) {
+ } catch (final ConversionException e) {
// expected
}
}
diff --git
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
index 665c657..2b68473 100644
---
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
@@ -1157,7 +1157,7 @@ public class TestPropertiesConfiguration
try {
handler.load();
Assert.fail("Expected " + Configuration.class.getCanonicalName());
- } catch (ConfigurationException e) {
+ } catch (final ConfigurationException e) {
// expected
// e.printStackTrace();
}
@@ -1174,7 +1174,7 @@ public class TestPropertiesConfiguration
try {
handler.load();
Assert.fail("Expected " + Configuration.class.getCanonicalName());
- } catch (ConfigurationException e) {
+ } catch (final ConfigurationException e) {
// expected
// e.printStackTrace();
}
@@ -1203,7 +1203,7 @@ public class TestPropertiesConfiguration
try {
handler.load();
Assert.fail("Expected " + Configuration.class.getCanonicalName());
- } catch (ConfigurationException e) {
+ } catch (final ConfigurationException e) {
// expected
// e.printStackTrace();
}
diff --git
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java
index f5912ac..a152683 100644
---
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java
+++
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java
@@ -832,7 +832,7 @@ public class TestPropertiesConfigurationLayout
* load() call on the layout is invoked.
*/
@Override
- boolean propertyLoaded(final String key, final String value,
Deque<URL> seenStack)
+ boolean propertyLoaded(final String key, final String value, final
Deque<URL> seenStack)
throws ConfigurationException
{
if (builder == null)
diff --git
a/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
index ea8ffad..84d04b0 100644
--- a/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
@@ -1779,9 +1779,9 @@ public class TestXMLConfiguration
@Test
public void testWrite() throws Exception
{
- XMLConfiguration xmlConfig = new XMLConfiguration();
+ final XMLConfiguration xmlConfig = new XMLConfiguration();
xmlConfig.setRootElementName("IAmRoot");
- StringWriter sw = new StringWriter();
+ final StringWriter sw = new StringWriter();
xmlConfig.write(sw);
// Check that we can parse the XML.
Assert.assertNotNull(parseXml(sw.toString()));
@@ -1790,9 +1790,9 @@ public class TestXMLConfiguration
@Test
public void testWriteIndentSize() throws Exception
{
- XMLConfiguration xmlConfig = new XMLConfiguration();
+ final XMLConfiguration xmlConfig = new XMLConfiguration();
xmlConfig.setRootElementName("IAmRoot");
- StringWriter sw = new StringWriter();
+ final StringWriter sw = new StringWriter();
xmlConfig.setProperty("Child", "Alexander");
xmlConfig.write(sw);
// Check that we can parse the XML.
@@ -1805,10 +1805,10 @@ public class TestXMLConfiguration
@Test
public void testWriteWithTransformer() throws Exception
{
- XMLConfiguration xmlConfig = new XMLConfiguration();
+ final XMLConfiguration xmlConfig = new XMLConfiguration();
xmlConfig.setRootElementName("IAmRoot");
xmlConfig.setProperty("Child", "Alexander");
- StringWriter sw = new StringWriter();
+ final StringWriter sw = new StringWriter();
final Transformer transformer = xmlConfig.createTransformer();
final int indentSize = 8;
transformer.setOutputProperty(XMLConfiguration.INDENT_AMOUNT_PROPERTY,
Integer.toString(indentSize));
diff --git
a/src/test/java/org/apache/commons/configuration2/TestYAMLConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestYAMLConfiguration.java
index 0945a30..52bc471 100644
--- a/src/test/java/org/apache/commons/configuration2/TestYAMLConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestYAMLConfiguration.java
@@ -157,7 +157,7 @@ public class TestYAMLConfiguration
yamlConfiguration.read(new StringReader(yaml));
fail("Loading configuration did not cause an exception!");
}
- catch (ConfigurationException e)
+ catch (final ConfigurationException e)
{
//expected
}
@@ -175,7 +175,7 @@ public class TestYAMLConfiguration
yamlConfiguration.read(new
ByteArrayInputStream(yaml.getBytes(StandardCharsets.UTF_8)));
fail("Loading configuration did not cause an exception!");
}
- catch (ConfigurationException e)
+ catch (final ConfigurationException e)
{
//expected
}
diff --git
a/src/test/java/org/apache/commons/configuration2/builder/fluent/TestConfigurations.java
b/src/test/java/org/apache/commons/configuration2/builder/fluent/TestConfigurations.java
index d42c1a1..8af5171 100644
---
a/src/test/java/org/apache/commons/configuration2/builder/fluent/TestConfigurations.java
+++
b/src/test/java/org/apache/commons/configuration2/builder/fluent/TestConfigurations.java
@@ -278,7 +278,7 @@ public class TestConfigurations
builder.getConfiguration();
Assert.fail("Expected ConfigurationException");
}
- catch (ConfigurationException e) {
+ catch (final ConfigurationException e) {
// ignore
}
}
@@ -300,7 +300,7 @@ public class TestConfigurations
builderFail.getConfiguration();
Assert.fail("Expected ConfigurationException");
}
- catch (ConfigurationException e)
+ catch (final ConfigurationException e)
{
// Ignore
// e.printStackTrace();
@@ -310,7 +310,7 @@ public class TestConfigurations
{
configs.properties(absPath);
}
- catch (ConfigurationException e) {
+ catch (final ConfigurationException e) {
// Ignore
// e.printStackTrace();
}
