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 e611fbea0 Update from deprecated code
e611fbea0 is described below
commit e611fbea02a39c5b27ecb3ae495a0cef08a10536
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Nov 30 08:21:42 2025 -0500
Update from deprecated code
---
.../java/org/apache/commons/configuration2/XMLListReference.java | 4 ++--
.../apache/commons/configuration2/convert/PropertyConverter.java | 5 +++--
.../java/org/apache/commons/configuration2/interpol/ExprLookup.java | 4 ++--
.../org/apache/commons/configuration2/tree/NodeNameMatchers.java | 6 +++---
.../tree/xpath/ConfigurationNodeIteratorAttribute.java | 4 ++--
.../tree/xpath/ConfigurationNodeIteratorChildren.java | 6 +++---
6 files changed, 15 insertions(+), 14 deletions(-)
diff --git
a/src/main/java/org/apache/commons/configuration2/XMLListReference.java
b/src/main/java/org/apache/commons/configuration2/XMLListReference.java
index 93945967d..b923738e4 100644
--- a/src/main/java/org/apache/commons/configuration2/XMLListReference.java
+++ b/src/main/java/org/apache/commons/configuration2/XMLListReference.java
@@ -24,7 +24,7 @@ import
org.apache.commons.configuration2.convert.ListDelimiterHandler;
import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
import org.apache.commons.configuration2.tree.ImmutableNode;
import org.apache.commons.configuration2.tree.ReferenceNodeHandler;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.w3c.dom.Element;
/**
@@ -147,7 +147,7 @@ final class XMLListReference {
* @return a flag whether these nodes have equal names
*/
private static boolean nameEquals(final ImmutableNode n1, final
ImmutableNode n2) {
- return StringUtils.equals(n2.getNodeName(), n1.getNodeName());
+ return Strings.CS.equals(n2.getNodeName(), n1.getNodeName());
}
/** The wrapped XML element. */
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 83294648a..7865aaff6 100644
---
a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
+++
b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
@@ -45,6 +45,7 @@ import java.util.regex.PatternSyntaxException;
import org.apache.commons.configuration2.ex.ConversionException;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
/**
* A utility class to convert the configuration properties into any type.
@@ -606,7 +607,7 @@ public final class PropertyConverter {
return (Number) value;
}
final String str = Objects.toString(value, null);
- if (StringUtils.startsWithAny(str, HEX_PREFIX)) {
+ if (Strings.CS.startsWithAny(str, HEX_PREFIX)) {
try {
return new BigInteger(str.substring(HEX_PREFIX.length()),
HEX_RADIX);
} catch (final NumberFormatException nex) {
@@ -614,7 +615,7 @@ public final class PropertyConverter {
}
}
- if (StringUtils.startsWithAny(str, BIN_PREFIX)) {
+ if (Strings.CS.startsWithAny(str, BIN_PREFIX)) {
try {
return new BigInteger(str.substring(BIN_PREFIX.length()),
BIN_RADIX);
} catch (final NumberFormatException nex) {
diff --git
a/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java
b/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java
index 9d853a684..6ce3a5b8d 100644
--- a/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java
+++ b/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java
@@ -26,7 +26,7 @@ import org.apache.commons.jexl2.JexlContext;
import org.apache.commons.jexl2.JexlEngine;
import org.apache.commons.jexl2.MapContext;
import org.apache.commons.lang3.ClassUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.commons.text.StringSubstitutor;
import org.apache.commons.text.lookup.StringLookup;
@@ -130,7 +130,7 @@ public class ExprLookup implements Lookup {
return;
}
final String val = (String) value;
- final String name = StringUtils.removeStartIgnoreCase(val,
CLASS);
+ final String name = Strings.CI.removeStart(val, CLASS);
final Class<?> clazz = ClassUtils.getClass(name);
if (name.length() == val.length()) {
this.value = clazz.getConstructor().newInstance();
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/NodeNameMatchers.java
b/src/main/java/org/apache/commons/configuration2/tree/NodeNameMatchers.java
index c665dcd5e..5549102a6 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/NodeNameMatchers.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/NodeNameMatchers.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.configuration2.tree;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
/**
* <p>
@@ -38,7 +38,7 @@ public enum NodeNameMatchers implements NodeMatcher<String> {
EQUALS {
@Override
public <T> boolean matches(final T node, final NodeHandler<T> handler,
final String criterion) {
- return StringUtils.equals(criterion, handler.nodeName(node));
+ return Strings.CS.equals(criterion, handler.nodeName(node));
}
},
@@ -49,7 +49,7 @@ public enum NodeNameMatchers implements NodeMatcher<String> {
EQUALS_IGNORE_CASE {
@Override
public <T> boolean matches(final T node, final NodeHandler<T> handler,
final String criterion) {
- return StringUtils.equalsIgnoreCase(criterion,
handler.nodeName(node));
+ return Strings.CI.equals(criterion, handler.nodeName(node));
}
}
}
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java
b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java
index 47a4c0b97..039f77f09 100644
---
a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java
+++
b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java
@@ -23,7 +23,7 @@ import java.util.Set;
import org.apache.commons.jxpath.ri.QName;
import org.apache.commons.jxpath.ri.model.NodePointer;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
/**
* A specialized node iterator implementation that deals with attribute nodes.
@@ -80,7 +80,7 @@ final class ConfigurationNodeIteratorAttribute<T> extends
AbstractConfigurationN
final Set<String> names = new
LinkedHashSet<>(parent.getNodeHandler().getAttributes(parent.getConfigurationNode()));
final String prefix = qName.getPrefix() != null ?
prefixName(qName.getPrefix(), null) : null;
names.forEach(n -> {
- if (prefix == null || StringUtils.startsWith(n, prefix)) {
+ if (prefix == null || Strings.CS.startsWith(n, prefix)) {
addAttributeData(parent, result, n);
}
});
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java
b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java
index 5acf4b6db..cc6cf7f62 100644
---
a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java
+++
b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java
@@ -26,7 +26,7 @@ import org.apache.commons.jxpath.ri.compiler.NodeNameTest;
import org.apache.commons.jxpath.ri.compiler.NodeTest;
import org.apache.commons.jxpath.ri.compiler.NodeTypeTest;
import org.apache.commons.jxpath.ri.model.NodePointer;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
/**
* A specialized iterator implementation for the child nodes of a
configuration node.
@@ -109,7 +109,7 @@ final class ConfigurationNodeIteratorChildren<T> extends
AbstractConfigurationNo
final String compareName = qualifiedName(qName);
final List<T> result = new ArrayList<>();
getNodeHandler().getChildren(node).forEach(child -> {
- if (StringUtils.equals(compareName,
getNodeHandler().nodeName(child))) {
+ if (Strings.CS.equals(compareName,
getNodeHandler().nodeName(child))) {
result.add(child);
}
});
@@ -131,7 +131,7 @@ final class ConfigurationNodeIteratorChildren<T> extends
AbstractConfigurationNo
final List<T> prefixChildren = new ArrayList<>(children.size());
final String prefix = prefixName(qName.getPrefix(), null);
children.forEach(child -> {
- if (StringUtils.startsWith(getNodeHandler().nodeName(child),
prefix)) {
+ if (Strings.CS.startsWith(getNodeHandler().nodeName(child),
prefix)) {
prefixChildren.add(child);
}
});
