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 f98129e8 Merge some string literals
f98129e8 is described below
commit f98129e83b8e309346f6f012366aa1003546f8c9
Author: Gary D. Gregory <[email protected]>
AuthorDate: Mon Jul 21 07:10:06 2025 -0400
Merge some string literals
---
.../apache/commons/configuration2/TestINIConfiguration.java | 6 +++++-
.../apache/commons/configuration2/TestXMLListHandling.java | 4 ++--
.../spring/TestConfigurationPropertiesFactoryBean.java | 6 +++++-
.../tree/xpath/TestXPathExpressionEngineInConfig.java | 11 ++++++++---
4 files changed, 20 insertions(+), 7 deletions(-)
diff --git
a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
index 9b063035..827efd50 100644
--- a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
@@ -798,7 +798,11 @@ public class TestINIConfiguration {
*/
@Test
void testMergeDuplicateSection() throws ConfigurationException,
IOException {
- final String data = "[section]\nvar1 = sec1\n\n" + "[section]\nvar2 =
sec2\n";
+ // @formatter:off
+ final String data =
+ "[section]\nvar1 = sec1\n\n"
+ + "[section]\nvar2 = sec2\n";
+ // @formatter:on
final INIConfiguration config = setUpConfig(data);
assertEquals("sec1", config.getString("section.var1"));
assertEquals("sec2", config.getString("section.var2"));
diff --git
a/src/test/java/org/apache/commons/configuration2/TestXMLListHandling.java
b/src/test/java/org/apache/commons/configuration2/TestXMLListHandling.java
index 5dc2fd28..dbbdf0db 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/spring/TestConfigurationPropertiesFactoryBean.java
b/src/test/java/org/apache/commons/configuration2/spring/TestConfigurationPropertiesFactoryBean.java
index ed0d1295..6b9c9e07 100644
---
a/src/test/java/org/apache/commons/configuration2/spring/TestConfigurationPropertiesFactoryBean.java
+++
b/src/test/java/org/apache/commons/configuration2/spring/TestConfigurationPropertiesFactoryBean.java
@@ -101,7 +101,11 @@ public class TestConfigurationPropertiesFactoryBean {
void testMergeConfigurations() throws Exception {
final Configuration one = new BaseConfiguration();
one.setProperty("foo", "bar");
- final String properties = "## some header \n" + "foo = bar1\n" + "bar
= foo\n";
+ // @formatter:off
+ final String properties = "## some header \n"
+ + "foo = bar1\n"
+ + "bar = foo\n";
+ // @formatter:on
final PropertiesConfiguration two = new PropertiesConfiguration();
final PropertiesConfigurationLayout layout = new
PropertiesConfigurationLayout();
diff --git
a/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathExpressionEngineInConfig.java
b/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathExpressionEngineInConfig.java
index 490b0bd2..21621d12 100644
---
a/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathExpressionEngineInConfig.java
+++
b/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathExpressionEngineInConfig.java
@@ -67,10 +67,15 @@ public class TestXPathExpressionEngineInConfig {
*/
@Test
void testPropertiesWithNamespace() throws ConfigurationException {
- final String xml = "<Config>\n" + "<dsig:Transforms
xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\";>\n"
+ // @formatter:off
+ final String xml = "<Config>\n"
+ + "<dsig:Transforms
xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\";>\n"
+ " <dsig:Transform
Algorithm=\"http://www.w3.org/TR/1999/REC-xpath-19991116\";>\n"
- + " <dsig:XPath xmlns:ietf=\"http://www.ietf.org\";
xmlns:pl=\"http://test.test\";>self::pl:policy1</dsig:XPath>\n" + "
</dsig:Transform>\n"
- + " <dsig:Transform
Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\"/>\n" +
"</dsig:Transforms>" + "</Config>";
+ + " <dsig:XPath xmlns:ietf=\"http://www.ietf.org\";
xmlns:pl=\"http://test.test\";>self::pl:policy1</dsig:XPath>\n"
+ + " </dsig:Transform>\n"
+ + " <dsig:Transform
Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\"/>\n"
+ + "</dsig:Transforms></Config>";
+ // @formatter:on
final FileHandler handler = new FileHandler(config);
handler.load(new StringReader(xml));
