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 96766a86 Merge some string literals
96766a86 is described below
commit 96766a864cc648d6e1cea238bda8aa2c939b869b
Author: Gary D. Gregory <[email protected]>
AuthorDate: Sun Jul 20 17:32:54 2025 -0400
Merge some string literals
---
.../java/org/apache/commons/configuration2/AbstractConfiguration.java | 2 +-
.../commons/configuration2/PatternSubtreeConfigurationWrapper.java | 2 +-
.../org/apache/commons/configuration2/PropertiesConfiguration.java | 2 +-
src/main/java/org/apache/commons/configuration2/XMLConfiguration.java | 4 ++--
src/main/java/org/apache/commons/configuration2/XMLListReference.java | 2 +-
.../configuration2/builder/combined/CombinedConfigurationBuilder.java | 2 +-
.../org/apache/commons/configuration2/convert/PropertyConverter.java | 2 +-
.../java/org/apache/commons/configuration2/io/DefaultFileSystem.java | 2 +-
.../commons/configuration2/plist/XMLPropertyListConfiguration.java | 2 +-
.../apache/commons/configuration2/tree/DefaultExpressionEngine.java | 2 +-
src/main/java/org/apache/commons/configuration2/tree/QueryResult.java | 2 +-
.../commons/configuration2/tree/xpath/XPathExpressionEngine.java | 2 +-
.../java/org/apache/commons/configuration2/TestINIConfiguration.java | 2 +-
.../apache/commons/configuration2/TestPropertiesConfiguration.java | 2 +-
.../java/org/apache/commons/configuration2/TestXMLListHandling.java | 4 ++--
.../configuration2/convert/TestDefaultListDelimiterHandler.java | 2 +-
16 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
index f27693f9..3ac03f85 100644
--- a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
@@ -110,7 +110,7 @@ public abstract class AbstractConfiguration extends
BaseEventSource implements C
private static void checkDefaultValueArray(final Class<?> cls, final
Object defaultValue) {
if (defaultValue != null && (!defaultValue.getClass().isArray() ||
!cls.isAssignableFrom(defaultValue.getClass().getComponentType()))) {
throw new IllegalArgumentException(
- "The type of the default value (" + defaultValue.getClass() +
")" + " is not an array of the specified class (" + cls + ")");
+ "The type of the default value (" + defaultValue.getClass() +
") is not an array of the specified class (" + cls + ")");
}
}
diff --git
a/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java
b/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java
index 525acf4c..afaa6b87 100644
---
a/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java
+++
b/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java
@@ -149,7 +149,7 @@ public class PatternSubtreeConfigurationWrapper extends
BaseHierarchicalConfigur
*/
private FileBased fetchFileBased() throws ConfigurationException {
if (!(config instanceof FileBased)) {
- throw new ConfigurationException("Wrapped configuration does not
implement FileBased!" + " No I/O operations are supported.");
+ throw new ConfigurationException("Wrapped configuration does not
implement FileBased! No I/O operations are supported.");
}
return (FileBased) config;
}
diff --git
a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
index a0c01799..be86be86 100644
---
a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
+++
b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
@@ -1380,7 +1380,7 @@ public class PropertiesConfiguration extends
BaseConfiguration implements FileBa
private void loadIncludeFile(final String fileName, final boolean
optional, final Deque<URL> seenStack) throws ConfigurationException {
if (locator == null) {
throw new ConfigurationException(
- "Load operation not properly " + "initialized! Do not call
read(InputStream) directly," + " but use a FileHandler to load a
configuration.");
+ "Load operation not properly initialized! Do not call
read(InputStream) directly, but use a FileHandler to load a configuration.");
}
URL url = locateIncludeFile(locator.getBasePath(), fileName);
diff --git
a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
index 10c640d7..acee8b58 100644
--- a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
@@ -918,7 +918,7 @@ public class XMLConfiguration extends
BaseHierarchicalConfiguration implements F
private void load(final InputSource source) throws ConfigurationException {
if (locator == null) {
throw new ConfigurationException(
- "Load operation not properly " + "initialized! Do not call
read(InputStream) directly," + " but use a FileHandler to load a
configuration.");
+ "Load operation not properly initialized! Do not call
read(InputStream) directly, but use a FileHandler to load a configuration.");
}
try {
@@ -1012,7 +1012,7 @@ public class XMLConfiguration extends
BaseHierarchicalConfiguration implements F
beginRead(true);
try {
if (getDocument() != null) {
- throw new UnsupportedOperationException("The name of the root
element " + "cannot be changed when loaded from an XML document!");
+ throw new UnsupportedOperationException("The name of the root
element cannot be changed when loaded from an XML document!");
}
rootElementName = name;
} finally {
diff --git
a/src/main/java/org/apache/commons/configuration2/XMLListReference.java
b/src/main/java/org/apache/commons/configuration2/XMLListReference.java
index f9cf4cca..93945967 100644
--- a/src/main/java/org/apache/commons/configuration2/XMLListReference.java
+++ b/src/main/java/org/apache/commons/configuration2/XMLListReference.java
@@ -134,7 +134,7 @@ final class XMLListReference {
try {
return String.valueOf(delimiterHandler.escapeList(values,
ListDelimiterHandler.NOOP_TRANSFORMER));
} catch (final UnsupportedOperationException e) {
- throw new ConfigurationRuntimeException("List handling not
supported by " + "the current ListDelimiterHandler! Make sure that the same
delimiter "
+ throw new ConfigurationRuntimeException("List handling not
supported by the current ListDelimiterHandler! Make sure that the same
delimiter "
+ "handler is used for loading and saving the
configuration.", e);
}
}
diff --git
a/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
b/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
index 3d3ac7bf..24018cfa 100644
---
a/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
+++
b/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
@@ -904,7 +904,7 @@ public class CombinedConfigurationBuilder extends
BasicConfigurationBuilder<Comb
*/
public synchronized ConfigurationBuilder<? extends Configuration>
getNamedBuilder(final String name) throws ConfigurationException {
if (sourceData == null) {
- throw new ConfigurationException("Information about child
builders" + " has not been setup yet! Call getConfiguration() first.");
+ throw new ConfigurationException("Information about child builders
has not been setup yet! Call getConfiguration() first.");
}
final ConfigurationBuilder<? extends Configuration> builder =
sourceData.getNamedBuilder(name);
if (builder == null) {
diff --git
a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
index 4bdee41b..83294648 100644
---
a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
+++
b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
@@ -185,7 +185,7 @@ public final class PropertyConverter {
return toDuration(value);
}
- throw new ConversionException("The value '" + value + "' (" +
value.getClass() + ")" + " can't be converted to a " + cls.getName() + "
object");
+ throw new ConversionException("The value '" + value + "' (" +
value.getClass() + ") can't be converted to a " + cls.getName() + " object");
}
/**
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 85d4c937..650f4812 100644
--- a/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java
+++ b/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java
@@ -210,7 +210,7 @@ public class DefaultFileSystem extends FileSystem {
} catch (final Exception e) {
// simply ignore it and return null
if (getLogger().isDebugEnabled()) {
- getLogger().debug(String.format("Could not determine
URL for " + "basePath = %s, fileName = %s: %s", basePath, fileName, e));
+ getLogger().debug(String.format("Could not determine
URL for basePath = %s, fileName = %s: %s", basePath, fileName, e));
}
}
}
diff --git
a/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
b/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
index 353dda3f..abb932dc 100644
---
a/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
+++
b/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
@@ -695,7 +695,7 @@ public class XMLPropertyListConfiguration extends
BaseHierarchicalConfiguration
public void write(final Writer out) throws ConfigurationException {
if (locator == null) {
throw new ConfigurationException(
- "Save operation not properly " + "initialized! Do not call
write(Writer) directly," + " but use a FileHandler to save a configuration.");
+ "Save operation not properly initialized! Do not call
write(Writer) directly, but use a FileHandler to save a configuration.");
}
final PrintWriter writer = new PrintWriter(out);
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java
b/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java
index fa662fe7..2578fe3f 100644
---
a/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java
+++
b/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java
@@ -209,7 +209,7 @@ public class DefaultExpressionEngine implements
ExpressionEngine {
if (keyIt.hasNext()) {
if (!keyIt.isPropertyKey()) {
// Attribute keys can only appear as last elements of the path
- throw new IllegalArgumentException("Invalid path for add
operation: " + "Attribute key in the middle!");
+ throw new IllegalArgumentException("Invalid path for add
operation: Attribute key in the middle!");
}
final int idx = keyIt.hasIndex() ? keyIt.getIndex() :
handler.getMatchingChildrenCount(node, nameMatcher, keyPart) - 1;
if (idx < 0 || idx >= handler.getMatchingChildrenCount(node,
nameMatcher, keyPart)) {
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/QueryResult.java
b/src/main/java/org/apache/commons/configuration2/tree/QueryResult.java
index 1eb75e23..b9807afd 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/QueryResult.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/QueryResult.java
@@ -118,7 +118,7 @@ public final class QueryResult<T> {
*/
public Object getAttributeValue(final NodeHandler<T> handler) {
if (!isAttributeResult()) {
- throw new IllegalStateException("This is not an attribute result!
" + "Attribute value cannot be fetched.");
+ throw new IllegalStateException("This is not an attribute result!
Attribute value cannot be fetched.");
}
return handler.getAttributeValue(getNode(), getAttributeName());
}
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java
b/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java
index 1bc4fb30..5f993d4d 100644
---
a/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java
+++
b/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java
@@ -304,7 +304,7 @@ public class XPathExpressionEngine implements
ExpressionEngine {
final String token = tok.nextToken();
if (PATH_DELIMITER.equals(token)) {
if (attr) {
- invalidPath(path, " contains an attribute" + " delimiter
at a disallowed position.");
+ invalidPath(path, " contains an attribute delimiter at a
disallowed position.");
}
if (lastComponent == null) {
invalidPath(path, " contains a '/' at a disallowed
position.");
diff --git
a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
index 17265497..9b063035 100644
--- a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
@@ -1064,7 +1064,7 @@ public class TestINIConfiguration {
*/
@Test
void testValueWithSemicolon() throws ConfigurationException {
- final String path = "C:\\Program Files\\jar\\manage.jar;" +
"C:\\Program Files\\jar\\guiLauncher.jar";
+ final String path = "C:\\Program Files\\jar\\manage.jar;C:\\Program
Files\\jar\\guiLauncher.jar";
final String content = "[Environment]" + LINE_SEPARATOR + "Application
Type=any" + LINE_SEPARATOR + "Class Path=" + path + " ;comment" +
LINE_SEPARATOR
+ "Path=" + path + "\t; another comment";
final INIConfiguration config = setUpConfig(content);
diff --git
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
index c00aa0c9..c04c3e44 100644
---
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
@@ -1200,7 +1200,7 @@ public class TestPropertiesConfiguration {
@Test
void testMultilines() {
- final String property = "This is a value spread out across several
adjacent " + "natural lines by escaping the line terminator with "
+ final String property = "This is a value spread out across several
adjacent natural lines by escaping the line terminator with "
+ "a backslash character.";
assertEquals(property, conf.getString("test.multilines"));
diff --git
a/src/test/java/org/apache/commons/configuration2/TestXMLListHandling.java
b/src/test/java/org/apache/commons/configuration2/TestXMLListHandling.java
index 85d2eb94..5dc2fd28 100644
--- a/src/test/java/org/apache/commons/configuration2/TestXMLListHandling.java
+++ b/src/test/java/org/apache/commons/configuration2/TestXMLListHandling.java
@@ -39,8 +39,8 @@ import org.junit.jupiter.api.Test;
*/
public class TestXMLListHandling {
/** XML to be loaded by the configuration. */
- private static final String SOURCE = "<config>" + "<values>a,b,c</values>"
+ "<split><value>1</value><value>2</value></split>"
- + "<mixed><values>foo,blah</values><values>bar,baz</values></mixed>" +
"</config>";
+ private static final String SOURCE = "<config>" +
"<values>a,b,c</values><split><value>1</value><value>2</value></split>"
+ +
"<mixed><values>foo,blah</values><values>bar,baz</values></mixed></config>";
/** Key for the string property with multiple values. */
private static final String KEY_VALUES = "values";
diff --git
a/src/test/java/org/apache/commons/configuration2/convert/TestDefaultListDelimiterHandler.java
b/src/test/java/org/apache/commons/configuration2/convert/TestDefaultListDelimiterHandler.java
index d57282b7..05535fa1 100644
---
a/src/test/java/org/apache/commons/configuration2/convert/TestDefaultListDelimiterHandler.java
+++
b/src/test/java/org/apache/commons/configuration2/convert/TestDefaultListDelimiterHandler.java
@@ -69,7 +69,7 @@ public class TestDefaultListDelimiterHandler {
void testEscapeList() {
final ValueTransformer trans = value -> String.valueOf(value) +
"_trans";
final List<String> data = Arrays.asList("simple", "Hello,world!",
"\\,\\", "end");
- assertEquals("simple_trans,Hello\\,world!_trans," +
"\\\\\\,\\\\_trans,end_trans", handler.escapeList(data, trans));
+
assertEquals("simple_trans,Hello\\,world!_trans,\\\\\\,\\\\_trans,end_trans",
handler.escapeList(data, trans));
}
/**
