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 9a828da1 Use System.lineSeparator()
9a828da1 is described below
commit 9a828da194ad82c250b8af6d2c7f7b4fba1d0cbd
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed Jun 15 16:11:40 2022 -0400
Use System.lineSeparator()
---
.../apache/commons/configuration2/INIConfiguration.java | 14 +++++++-------
.../commons/configuration2/PropertiesConfiguration.java | 10 ++++------
.../apache/commons/configuration2/XMLConfiguration.java | 11 +++++------
.../commons/configuration2/TestConfigurationUtils.java | 2 +-
.../commons/configuration2/TestINIConfiguration.java | 2 +-
.../configuration2/TestPropertiesConfiguration.java | 4 ++--
.../configuration2/TestPropertiesConfigurationLayout.java | 2 +-
7 files changed, 21 insertions(+), 24 deletions(-)
diff --git
a/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
b/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
index 5a9c4bdd..54eab0bf 100644
--- a/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
@@ -210,7 +210,7 @@ public class INIConfiguration extends
BaseHierarchicalConfiguration implements F
/**
* Constant for the line separator.
*/
- private static final String LINE_SEPARATOR =
System.getProperty("line.separator");
+ private static final String LINE_SEPARATOR = System.lineSeparator();
/**
* The characters used for quoting values.
@@ -540,15 +540,15 @@ public class INIConfiguration extends
BaseHierarchicalConfiguration implements F
escape = true;
} else if (!escape && quote == c) {
stop = true;
- } else if (escape && quote == c) {
- escape = false;
- result.append(c);
} else {
- if (escape) {
+ if (escape && quote == c) {
escape = false;
- result.append('\\');
+ } else {
+ if (escape) {
+ escape = false;
+ result.append('\\');
+ }
}
-
result.append(c);
}
} else if (isCommentChar(c) &&
Character.isWhitespace(lastChar)) {
diff --git
a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
index 67ef6d81..b83e9a94 100644
---
a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
+++
b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
@@ -1029,7 +1029,7 @@ public class PropertiesConfiguration extends
BaseConfiguration implements FileBa
private static final char[] WHITE_SPACE = {' ', '\t', '\f'};
/** Constant for the platform specific line separator. */
- private static final String LINE_SEPARATOR =
System.getProperty("line.separator");
+ private static final String LINE_SEPARATOR = System.lineSeparator();
/** Constant for the radix of hex numbers. */
private static final int HEX_RADIX = 16;
@@ -1228,11 +1228,9 @@ public class PropertiesConfiguration extends
BaseConfiguration implements FileBa
// uh-oh, we're in unicode country....
inUnicode = true;
} else {
- if (!needsUnescape(ch)) {
- // JUP simply throws away the \ of unknown escape
sequences
- if (!jupCompatible) {
- out.append('\\');
- }
+ // JUP simply throws away the \ of unknown escape
sequences
+ if (!needsUnescape(ch) && !jupCompatible) {
+ out.append('\\');
}
out.append(ch);
}
diff --git
a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
index 0658eb30..36875e5b 100644
--- a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
@@ -614,13 +614,12 @@ public class XMLConfiguration extends
BaseHierarchicalConfiguration implements F
parent.addChild(newChild);
XMLListReference.assignListReference(refs, newChild, null);
}
- } else if (values.size() == 1) {
- // we will have to replace the value because it might
- // contain escaped delimiters
- child.value(values.iterator().next());
- addedChildNode = child.create();
- parent.addChild(addedChildNode);
} else {
+ if (values.size() == 1) {
+ // we will have to replace the value because it might
+ // contain escaped delimiters
+ child.value(values.iterator().next());
+ }
addedChildNode = child.create();
parent.addChild(addedChildNode);
}
diff --git
a/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
b/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
index 7a685d3f..bbbeebb4 100644
---
a/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
+++
b/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
@@ -520,7 +520,7 @@ public class TestConfigurationUtils {
@Test
public void testToString() {
final Configuration config = new BaseConfiguration();
- final String lineSeparator = System.getProperty("line.separator");
+ final String lineSeparator = System.lineSeparator();
assertEquals("String representation of an empty configuration", "",
ConfigurationUtils.toString(config));
diff --git
a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
index e74107d6..9a118a90 100644
--- a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
@@ -96,7 +96,7 @@ public class TestINIConfiguration {
}
}
- private static final String LINE_SEPARATOR =
System.getProperty("line.separator");
+ private static final String LINE_SEPARATOR = System.lineSeparator();
/** Constant for the content of an ini file. */
private static final String INI_DATA = "[section1]" + LINE_SEPARATOR +
"var1 = foo" + LINE_SEPARATOR + "var2 = 451" + LINE_SEPARATOR + LINE_SEPARATOR
diff --git
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
index 53a6a96e..3cffd371 100644
---
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
@@ -215,7 +215,7 @@ public class TestPropertiesConfiguration {
/** Constant for a test property value. */
private static final String PROP_VALUE = "value";
/** Constant for the line break character. */
- private static final String CR = System.getProperty("line.separator");
+ private static final String CR = System.lineSeparator();
/** The File that we test with */
private static final String testProperties =
ConfigurationAssert.getTestFile("test.properties").getAbsolutePath();
@@ -928,7 +928,7 @@ public class TestPropertiesConfiguration {
*/
@Test
public void testLineSeparator() throws ConfigurationException {
- final String EOL = System.getProperty("line.separator");
+ final String EOL = System.lineSeparator();
conf = new PropertiesConfiguration();
conf.setHeader("My header");
conf.setProperty("prop", "value");
diff --git
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java
index 398eebab..3d431fd9 100644
---
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java
+++
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java
@@ -134,7 +134,7 @@ public class TestPropertiesConfigurationLayout {
}
/** Constant for the line break character. */
- private static final String CR = System.getProperty("line.separator");
+ private static final String CR = System.lineSeparator();
/** Constant for the normalized line break character. */
private static final String CRNORM = "\n";
