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 0dc7451e Use final Better lambdas Remove trailing whitespace Use else
Add missing @Override
0dc7451e is described below
commit 0dc7451e71f25de2d3476160d0f1c0eccc1fa02b
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed Sep 13 18:39:23 2023 -0400
Use final
Better lambdas
Remove trailing whitespace
Use else
Add missing @Override
---
.../commons/configuration2/builder/BasicBuilderParameters.java | 2 +-
.../apache/commons/configuration2/event/EventListenerList.java | 2 +-
.../configuration2/interpol/ConfigurationInterpolator.java | 3 ++-
.../apache/commons/configuration2/MockInitialContextFactory.java | 2 +-
.../org/apache/commons/configuration2/TestINIConfiguration.java | 8 ++++----
.../org/apache/commons/configuration2/TestXMLConfiguration.java | 2 +-
.../org/apache/commons/configuration2/TestXMLListHandling.java | 2 +-
.../configuration2/builder/TestFileBasedConfigurationBuilder.java | 2 +-
.../builder/combined/TestMultiFileConfigurationBuilder.java | 2 +-
.../configuration2/convert/TestDefaultConversionHandler.java | 2 +-
.../commons/configuration2/event/TestEventListenerList.java | 4 ++--
.../configuration2/interpol/TestConfigurationInterpolator.java | 2 +-
.../org/apache/commons/configuration2/io/TestFileHandler.java | 2 +-
.../configuration2/plist/TestPropertyListConfiguration.java | 2 +-
.../org/apache/commons/configuration2/tree/TestNodeSelector.java | 2 +-
.../configuration2/tree/xpath/TestXPathExpressionEngine.java | 4 ++--
.../commons/configuration2/web/TestServletConfiguration.java | 2 +-
.../configuration2/web/TestServletContextConfiguration.java | 2 +-
18 files changed, 24 insertions(+), 23 deletions(-)
diff --git
a/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
b/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
index 46d3e40e..98d59d48 100644
---
a/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
+++
b/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
@@ -458,7 +458,7 @@ public class BasicBuilderParameters implements Cloneable,
BuilderParameters, Bas
return null;
}
- if (col.stream().noneMatch(o -> o instanceof Lookup)) {
+ if (col.stream().noneMatch(Lookup.class::isInstance)) {
throw new IllegalArgumentException("Collection with default
lookups contains invalid data: " + col);
}
return fetchDefaultLookups(params);
diff --git
a/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java
b/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java
index 29ba5cc4..9a805e42 100644
---
a/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java
+++
b/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java
@@ -180,7 +180,7 @@ public class EventListenerList {
final List<EventListenerRegistrationData<? extends T>> results = new
LinkedList<>();
listeners.forEach(reg -> {
- Set<EventType<?>> base =
superTypes.computeIfAbsent(reg.getEventType(), EventType::fetchSuperEventTypes);
+ final Set<EventType<?>> base =
superTypes.computeIfAbsent(reg.getEventType(), EventType::fetchSuperEventTypes);
if (base.contains(eventType)) {
@SuppressWarnings("unchecked")
final
diff --git
a/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java
b/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java
index 49c6591f..2ba758c4 100644
---
a/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java
+++
b/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java
@@ -720,7 +720,8 @@ public class ConfigurationInterpolator {
if (!(obj instanceof String)) {
if (obj instanceof Iterable) {
return nextOrNull(((Iterable<?>) obj).iterator());
- } else if (obj instanceof Iterator) {
+ }
+ if (obj instanceof Iterator) {
return nextOrNull((Iterator<?>) obj);
} else if (obj.getClass().isArray()) {
return Array.getLength(obj) > 0
diff --git
a/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java
b/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java
index b4748f96..c9ce3462 100644
---
a/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java
+++
b/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java
@@ -44,7 +44,7 @@ public class MockInitialContextFactory implements
InitialContextFactory {
private final Iterator<NameClassPair> iterator;
- private ListBasedNamingEnumeration(List<NameClassPair> pairs) {
+ private ListBasedNamingEnumeration(final List<NameClassPair> pairs) {
this.iterator = pairs.iterator();
}
diff --git
a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
index 87133862..4438dab7 100644
--- a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
@@ -198,7 +198,7 @@ public class TestINIConfiguration {
* @return the initialized configuration
* @throws ConfigurationException if an error occurs
*/
- private static INIConfiguration setUpConfig(final String data, boolean
inLineCommentsAllowed) throws ConfigurationException {
+ private static INIConfiguration setUpConfig(final String data, final
boolean inLineCommentsAllowed) throws ConfigurationException {
// @formatter:off
final INIConfiguration instance = INIConfiguration.builder()
.setSectionInLineCommentsAllowed(inLineCommentsAllowed)
@@ -259,7 +259,7 @@ public class TestINIConfiguration {
*/
private void checkSectionNames(final INIConfiguration config, final
String[] expected) {
final Set<String> sectionNames = config.getSections();
- assertEquals(new HashSet<>(Arrays.asList(expected)), sectionNames);
+ assertEquals(new HashSet<>(Arrays.asList(expected)), sectionNames);
}
/**
@@ -1005,7 +1005,7 @@ public class TestINIConfiguration {
*/
@ParameterizedTest
@MethodSource("provideValuesWithComments")
- public void testValueWithComment(String source, String key, String value)
throws Exception {
+ public void testValueWithComment(final String source, final String key,
final String value) throws Exception {
final INIConfiguration config = setUpConfig(source);
assertEquals(value, config.getString(key));
}
@@ -1078,7 +1078,7 @@ public class TestINIConfiguration {
*/
@ParameterizedTest
@MethodSource("provideSectionsWithComments")
- public void testGetSectionsWithInLineComment(String source, boolean
allowComments, String[] results) throws ConfigurationException {
+ public void testGetSectionsWithInLineComment(final String source, final
boolean allowComments, final String[] results) throws ConfigurationException {
final INIConfiguration config = setUpConfig(source, allowComments);
checkSectionNames(config, results);
}
diff --git
a/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
index 4aa19873..0f43807c 100644
--- a/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
@@ -1264,7 +1264,7 @@ public class TestXMLConfiguration {
public void testSaveWithInvalidTransformerFactory() {
System.setProperty(PROP_FACTORY, "an.invalid.Class");
try {
- assertThrows(TransformerFactoryConfigurationError.class, () ->
saveTestConfig());
+ assertThrows(TransformerFactoryConfigurationError.class,
this::saveTestConfig);
} finally {
System.getProperties().remove(PROP_FACTORY);
}
diff --git
a/src/test/java/org/apache/commons/configuration2/TestXMLListHandling.java
b/src/test/java/org/apache/commons/configuration2/TestXMLListHandling.java
index 83c831f2..07492af4 100644
--- a/src/test/java/org/apache/commons/configuration2/TestXMLListHandling.java
+++ b/src/test/java/org/apache/commons/configuration2/TestXMLListHandling.java
@@ -143,7 +143,7 @@ public class TestXMLListHandling {
@Test
public void testIncompatibleListDelimiterOnSaving() {
config.setListDelimiterHandler(DisabledListDelimiterHandler.INSTANCE);
- assertThrows(ConfigurationRuntimeException.class, () ->
saveToString());
+ assertThrows(ConfigurationRuntimeException.class, this::saveToString);
}
/**
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 eb171acf..e01caaf4 100644
---
a/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java
+++
b/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java
@@ -93,7 +93,7 @@ public class TestFileBasedConfigurationBuilder {
*/
private File createTestFile(final int value) {
return assertDoesNotThrow(() -> {
- File file = newFile(tempFolder);
+ final File file = newFile(tempFolder);
try (Writer out = new FileWriter(file)) {
out.write(String.format("%s=%d", PROP, value));
}
diff --git
a/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java
b/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java
index 7c956f00..5b8c9155 100644
---
a/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java
+++
b/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java
@@ -336,7 +336,7 @@ public class TestMultiFileConfigurationBuilder extends
AbstractMultiFileConfigur
final MultiFileConfigurationBuilder<XMLConfiguration> builder =
createTestBuilder(
new
XMLBuilderParametersImpl().setValidating(true).setSchemaValidation(true));
switchToConfig("2001");
- ConfigurationException ex = assertThrows(ConfigurationException.class,
builder::getConfiguration);
+ final ConfigurationException ex =
assertThrows(ConfigurationException.class, builder::getConfiguration);
Throwable cause = ex.getCause();
while (cause != null && !(cause instanceof SAXParseException)) {
cause = cause.getCause();
diff --git
a/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.java
b/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.java
index 5c053ccf..84a65001 100644
---
a/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.java
+++
b/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.java
@@ -197,7 +197,7 @@ public class TestDefaultConversionHandler {
*/
@Test
public void testToCollectionNullCollection() {
- List<Integer> src = Arrays.asList(1, 2, 3);
+ final List<Integer> src = Arrays.asList(1, 2, 3);
assertThrows(IllegalArgumentException.class, () ->
handler.toCollection(src, Integer.class, null, null));
}
diff --git
a/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.java
b/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.java
index 5683b874..87d87604 100644
---
a/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.java
+++
b/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.java
@@ -356,7 +356,7 @@ public class TestEventListenerList {
@Test
public void testGetRegistrationsModify() {
final EventListenerRegistrationData<EventBase> registrationData = new
EventListenerRegistrationData<>(typeBase, new ListenerTestImpl());
- List<EventListenerRegistrationData<?>> registrations =
list.getRegistrations();
+ final List<EventListenerRegistrationData<?>> registrations =
list.getRegistrations();
assertThrows(UnsupportedOperationException.class, () ->
registrations.add(registrationData));
}
@@ -455,7 +455,7 @@ public class TestEventListenerList {
*/
@Test
public void testRegisterEventTypeNull() {
- ListenerTestImpl listener = new ListenerTestImpl();
+ final ListenerTestImpl listener = new ListenerTestImpl();
assertThrows(IllegalArgumentException.class, () ->
list.addEventListener(null, listener));
}
diff --git
a/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.java
b/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.java
index b2d4df9f..2641290f 100644
---
a/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.java
+++
b/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.java
@@ -812,7 +812,7 @@ public class TestConfigurationInterpolator {
final Properties props = new Properties();
props.setProperty(ConfigurationInterpolator.DEFAULT_PREFIX_LOOKUPS_PROPERTY,
"base64_encoder nope");
- Exception exc = assertThrows(Exception.class, () -> new
ConfigurationInterpolator.DefaultPrefixLookupsHolder(props));
+ final Exception exc = assertThrows(Exception.class, () -> new
ConfigurationInterpolator.DefaultPrefixLookupsHolder(props));
assertEquals("Invalid default lookups definition: base64_encoder
nope", exc.getMessage());
}
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 607b47b6..3646c258 100644
--- a/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java
+++ b/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java
@@ -1180,7 +1180,7 @@ public class TestFileHandler {
@Test
public void testSaveToWriterNoContent() {
final FileHandler handler = new FileHandler();
- StringWriter writer = new StringWriter();
+ final StringWriter writer = new StringWriter();
assertThrows(ConfigurationException.class, () -> handler.save(writer));
}
diff --git
a/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
b/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
index 298f7d0a..3d90533c 100644
---
a/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
@@ -127,7 +127,7 @@ public class TestPropertyListConfiguration {
@Test
public void testData() {
- byte[] bytes = assertInstanceOf(byte[].class,
config.getProperty("data"));
+ final byte[] bytes = assertInstanceOf(byte[].class,
config.getProperty("data"));
assertArrayEquals("foo bar".getBytes(), bytes);
}
diff --git
a/src/test/java/org/apache/commons/configuration2/tree/TestNodeSelector.java
b/src/test/java/org/apache/commons/configuration2/tree/TestNodeSelector.java
index 9a545cdd..fa530bc8 100644
--- a/src/test/java/org/apache/commons/configuration2/tree/TestNodeSelector.java
+++ b/src/test/java/org/apache/commons/configuration2/tree/TestNodeSelector.java
@@ -114,7 +114,7 @@ public class TestNodeSelector {
final ImmutableNode target = NodeStructureHelper.nodeForKey(root,
"tables/table(1)");
results.add(QueryResult.createNodeResult(target));
results.add(QueryResult.createAttributeResult(NodeStructureHelper.nodeForKey(root,
"tables/table(0)/fields/field(1)"), "type"));
-
+
when(resolverMock.resolveKey(root, KEY, handler)).thenReturn(results);
final NodeSelector selector = new NodeSelector(KEY);
diff --git
a/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathExpressionEngine.java
b/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathExpressionEngine.java
index cfc531cd..e5a9949b 100644
---
a/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathExpressionEngine.java
+++
b/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathExpressionEngine.java
@@ -109,7 +109,7 @@ public class TestXPathExpressionEngine {
*/
private JXPathContext expectSelect(final Object... results) {
final JXPathContext ctx = mock(JXPathContext.class);
-
+
when(ctx.selectNodes(TEST_KEY)).thenReturn(Arrays.asList(results));
return ctx;
@@ -123,7 +123,7 @@ public class TestXPathExpressionEngine {
*/
private XPathExpressionEngine setUpEngine(final JXPathContext ctx) {
final XPathContextFactory factory = mock(XPathContextFactory.class);
-
+
when(factory.createContext(root, handler)).thenReturn(ctx);
return new XPathExpressionEngine(factory);
diff --git
a/src/test/java/org/apache/commons/configuration2/web/TestServletConfiguration.java
b/src/test/java/org/apache/commons/configuration2/web/TestServletConfiguration.java
index 5666c642..0a2c65e8 100644
---
a/src/test/java/org/apache/commons/configuration2/web/TestServletConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/web/TestServletConfiguration.java
@@ -44,7 +44,7 @@ public class TestServletConfiguration extends
TestAbstractConfiguration {
* @param parameters the init parameters to use
* @return The created mock
*/
- private ServletConfig mockServletConfig(Properties parameters) {
+ private ServletConfig mockServletConfig(final Properties parameters) {
final ServletConfig config = mock(ServletConfig.class);
when(config.getInitParameterNames()).thenAnswer(invocation ->
parameters.keys());
when(config.getInitParameter(ArgumentMatchers.any())).thenAnswer(invocation -> {
diff --git
a/src/test/java/org/apache/commons/configuration2/web/TestServletContextConfiguration.java
b/src/test/java/org/apache/commons/configuration2/web/TestServletContextConfiguration.java
index 7b0aacf3..35bf5b15 100644
---
a/src/test/java/org/apache/commons/configuration2/web/TestServletContextConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/web/TestServletContextConfiguration.java
@@ -45,7 +45,7 @@ public class TestServletContextConfiguration extends
TestAbstractConfiguration {
* @param parameters the init parameters to use
* @return The created mock
*/
- private ServletContext mockServletConfig(Properties parameters) {
+ private ServletContext mockServletConfig(final Properties parameters) {
final ServletContext context = mock(ServletContext.class);
when(context.getInitParameterNames()).thenAnswer(invocation ->
parameters.keys());
when(context.getInitParameter(ArgumentMatchers.any())).thenAnswer(invocation ->
{
