You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2026/04/03 12:17:26 UTC
(commons-configuration) 02/02: Migrate from deprecated APIs.
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
commit 7c216c0d0337e29e9518e0c0abe3889be215ee64
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Apr 3 08:17:18 2026 -0400
Migrate from deprecated APIs.
---
.../org/apache/commons/configuration2/AbstractConfiguration.java | 4 ++--
.../java/org/apache/commons/configuration2/XMLConfiguration.java | 4 ++--
.../apache/commons/configuration2/interpol/StringLookupAdapter.java | 2 +-
.../java/org/apache/commons/configuration2/io/FileLocatorUtils.java | 4 ++--
.../commons/configuration2/reloading/PeriodicReloadingTrigger.java | 2 +-
.../org/apache/commons/configuration2/tree/InMemoryNodeModel.java | 6 +++---
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
index 03b45f49b..4dd19a7ac 100644
--- a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
@@ -508,7 +508,7 @@ public abstract class AbstractConfiguration extends BaseEventSource implements C
*/
private Object convertToArray(final Class<?> cls, final String key, final Object defaultValue) {
checkDefaultValueArray(cls, defaultValue);
- return ObjectUtils.defaultIfNull(getConversionHandler().toArray(getProperty(key), cls, getInterpolator()), defaultValue);
+ return ObjectUtils.getIfNull(getConversionHandler().toArray(getProperty(key), cls, getInterpolator()), defaultValue);
}
/**
@@ -621,7 +621,7 @@ public abstract class AbstractConfiguration extends BaseEventSource implements C
private <T> T getAndConvertProperty(final Class<T> cls, final String key, final T defaultValue) {
final Object value = getProperty(key);
try {
- return ObjectUtils.defaultIfNull(getConversionHandler().to(value, cls, getInterpolator()), defaultValue);
+ return ObjectUtils.getIfNull(getConversionHandler().to(value, cls, getInterpolator()), defaultValue);
} catch (final ConversionException cex) {
// improve error message
throw new ConversionException(String.format("Key '%s' cannot be converted to class %s. Value is: '%s'.", key, cls.getName(), String.valueOf(value)),
diff --git a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
index 7aafe9f33..cdd2fbb29 100644
--- a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
@@ -583,7 +583,7 @@ public class XMLConfiguration extends BaseHierarchicalConfiguration implements F
final Map<String, String> attrmap = constructHierarchy(childNode, refChildValue, child, elemRefs, trimFlag, level + 1);
final boolean childTrim = Boolean.parseBoolean(attrmap.remove(ATTR_SPACE_INTERNAL));
childNode.addAttributes(attrmap);
- final ImmutableNode newChild = createChildNodeWithValue(node, childNode, child, refChildValue.getValue(), childTrim, attrmap, elemRefs);
+ final ImmutableNode newChild = createChildNodeWithValue(node, childNode, child, refChildValue.get(), childTrim, attrmap, elemRefs);
if (elemRefs != null && !elemRefs.containsKey(newChild)) {
elemRefs.put(newChild, child);
}
@@ -859,7 +859,7 @@ public class XMLConfiguration extends BaseHierarchicalConfiguration implements F
final Map<ImmutableNode, Object> elemRefMap = elemRefs ? new HashMap<>() : null;
final Map<String, String> attributes = constructHierarchy(rootBuilder, rootValue, element, elemRefMap, true, 0);
attributes.remove(ATTR_SPACE_INTERNAL);
- final ImmutableNode top = rootBuilder.value(rootValue.getValue()).addAttributes(attributes).create();
+ final ImmutableNode top = rootBuilder.value(rootValue.get()).addAttributes(attributes).create();
getSubConfigurationParentModel().mergeRoot(top, element.getTagName(), elemRefMap, elemRefs ? docHelper : null, this);
}
diff --git a/src/main/java/org/apache/commons/configuration2/interpol/StringLookupAdapter.java b/src/main/java/org/apache/commons/configuration2/interpol/StringLookupAdapter.java
index 5a79c7c35..cf192bab4 100644
--- a/src/main/java/org/apache/commons/configuration2/interpol/StringLookupAdapter.java
+++ b/src/main/java/org/apache/commons/configuration2/interpol/StringLookupAdapter.java
@@ -38,7 +38,7 @@ final class StringLookupAdapter implements Lookup {
@Override
public Object lookup(final String key) {
- return stringLookup.lookup(key);
+ return stringLookup.apply(key);
}
}
diff --git a/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java b/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
index f2dcbae94..1354673e3 100644
--- a/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
+++ b/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
@@ -412,7 +412,7 @@ public final class FileLocatorUtils {
* @return the {@code FileSystem} to be used for this {@code FileLocator}
*/
static FileSystem getFileSystem(final FileLocator locator) {
- return locator != null ? ObjectUtils.defaultIfNull(locator.getFileSystem(), DEFAULT_FILE_SYSTEM) : DEFAULT_FILE_SYSTEM;
+ return locator != null ? ObjectUtils.getIfNull(locator.getFileSystem(), DEFAULT_FILE_SYSTEM) : DEFAULT_FILE_SYSTEM;
}
/**
@@ -424,7 +424,7 @@ public final class FileLocatorUtils {
* @return the {@code FileLocationStrategy} for this {@code FileLocator}
*/
static FileLocationStrategy getLocationStrategy(final FileLocator locator) {
- return locator != null ? ObjectUtils.defaultIfNull(locator.getLocationStrategy(), DEFAULT_LOCATION_STRATEGY) : DEFAULT_LOCATION_STRATEGY;
+ return locator != null ? ObjectUtils.getIfNull(locator.getLocationStrategy(), DEFAULT_LOCATION_STRATEGY) : DEFAULT_LOCATION_STRATEGY;
}
/**
diff --git a/src/main/java/org/apache/commons/configuration2/reloading/PeriodicReloadingTrigger.java b/src/main/java/org/apache/commons/configuration2/reloading/PeriodicReloadingTrigger.java
index 94f172081..6b6b2fd92 100644
--- a/src/main/java/org/apache/commons/configuration2/reloading/PeriodicReloadingTrigger.java
+++ b/src/main/java/org/apache/commons/configuration2/reloading/PeriodicReloadingTrigger.java
@@ -56,7 +56,7 @@ public class PeriodicReloadingTrigger {
* @return the default executor service
*/
private static ScheduledExecutorService createDefaultExecutorService() {
- final ThreadFactory factory = new BasicThreadFactory.Builder().namingPattern("ReloadingTrigger-%s").daemon(true).build();
+ final ThreadFactory factory = BasicThreadFactory.builder().namingPattern("ReloadingTrigger-%s").daemon(true).build();
return Executors.newScheduledThreadPool(1, factory);
}
diff --git a/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java b/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java
index 9a67aff43..3572925ef 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java
@@ -844,7 +844,7 @@ public class InMemoryNodeModel implements NodeModel<ImmutableNode> {
}
done = structure.compareAndSet(current, createSelectorsForTrackedNodes(refSelectors, nodes, current, resolver));
} while (!done);
- return refSelectors.getValue();
+ return refSelectors.get();
}
/**
@@ -914,7 +914,7 @@ public class InMemoryNodeModel implements NodeModel<ImmutableNode> {
done = true;
}
} while (!done);
- return refSelectors.getValue();
+ return refSelectors.get();
}
/**
@@ -945,7 +945,7 @@ public class InMemoryNodeModel implements NodeModel<ImmutableNode> {
done = structure.compareAndSet(current, newData);
} while (!done);
- return refSelector.getValue();
+ return refSelector.get();
}
/**