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 989e6aa24 Update from deprecated code
989e6aa24 is described below
commit 989e6aa241528fb831c630b5ac34d4949b2cfe44
Author: Gary Gregory <[email protected]>
AuthorDate: Sat Nov 29 17:54:32 2025 -0500
Update from deprecated code
---
.../commons/configuration2/PropertiesConfigurationLayout.java | 3 ++-
.../commons/configuration2/convert/LegacyListDelimiterHandler.java | 6 +++---
.../commons/configuration2/tree/DefaultConfigurationKey.java | 7 ++++---
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git
a/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java
b/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java
index 77397081e..76e756625 100644
---
a/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java
+++
b/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java
@@ -34,6 +34,7 @@ import org.apache.commons.configuration2.event.EventListener;
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
/**
* <p>
@@ -357,7 +358,7 @@ public class PropertiesConfigurationLayout implements
EventListener<Configuratio
*/
private static void writeComment(final
PropertiesConfiguration.PropertiesWriter writer, final String comment) throws
IOException {
if (comment != null) {
- writer.writeln(StringUtils.replace(comment, CR,
writer.getLineSeparator()));
+ writer.writeln(Strings.CS.replace(comment, CR,
writer.getLineSeparator()));
}
}
diff --git
a/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java
b/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java
index 61804304c..acad6d3f9 100644
---
a/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java
+++
b/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java
@@ -22,7 +22,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
/**
* <p>
@@ -105,7 +105,7 @@ public class LegacyListDelimiterHandler extends
AbstractListDelimiterHandler {
String strValue = String.valueOf(value);
if (inList && strValue.contains(DOUBLE_ESC)) {
- strValue = StringUtils.replace(strValue, DOUBLE_ESC, QUAD_ESC);
+ strValue = Strings.CS.replace(strValue, DOUBLE_ESC, QUAD_ESC);
}
return strValue;
@@ -158,7 +158,7 @@ public class LegacyListDelimiterHandler extends
AbstractListDelimiterHandler {
protected String escapeValue(final Object value, final boolean inList,
final ValueTransformer transformer) {
String escapedValue =
String.valueOf(transformer.transformValue(escapeBackslashs(value, inList)));
if (getDelimiter() != 0) {
- escapedValue = StringUtils.replace(escapedValue,
String.valueOf(getDelimiter()), ESCAPE + getDelimiter());
+ escapedValue = Strings.CS.replace(escapedValue,
String.valueOf(getDelimiter()), ESCAPE + getDelimiter());
}
return escapedValue;
}
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java
b/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java
index a30c59bb0..23b783d8c 100644
---
a/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java
+++
b/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java
@@ -20,6 +20,7 @@ import java.util.Iterator;
import java.util.NoSuchElementException;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
/**
* <p>
@@ -264,7 +265,7 @@ public class DefaultConfigurationKey {
* @return a flag if attributes and normal property keys are treated
the same way
*/
private boolean isAttributeEmulatingMode() {
- return getSymbols().getAttributeEnd() == null &&
StringUtils.equals(getSymbols().getPropertyDelimiter(),
getSymbols().getAttributeStart());
+ return getSymbols().getAttributeEnd() == null &&
Strings.CS.equals(getSymbols().getPropertyDelimiter(),
getSymbols().getAttributeStart());
}
/**
@@ -610,7 +611,7 @@ public class DefaultConfigurationKey {
*/
private String escapeDelimiters(final String key) {
return getSymbols().getEscapedDelimiter() == null ||
!key.contains(getSymbols().getPropertyDelimiter()) ? key
- : StringUtils.replace(key, getSymbols().getPropertyDelimiter(),
getSymbols().getEscapedDelimiter());
+ : Strings.CS.replace(key, getSymbols().getPropertyDelimiter(),
getSymbols().getEscapedDelimiter());
}
/**
@@ -779,6 +780,6 @@ public class DefaultConfigurationKey {
*/
private String unescapeDelimiters(final String key) {
return getSymbols().getEscapedDelimiter() == null ? key
- : StringUtils.replace(key, getSymbols().getEscapedDelimiter(),
getSymbols().getPropertyDelimiter());
+ : Strings.CS.replace(key, getSymbols().getEscapedDelimiter(),
getSymbols().getPropertyDelimiter());
}
}