Migrate from deprecated APIs.

Author: garydgregory

src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java

@@ -508,7 +508,7 @@ private <T> T convert(final Class<T> cls, final String key, final T defValue, fi
      */
     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 <T> T get(final Class<T> cls, final String key, final T defaultValue) {
     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)),

src/main/java/org/apache/commons/configuration2/XMLConfiguration.java

@@ -583,7 +583,7 @@ private Map<String, String> constructHierarchy(final ImmutableNode.Builder node,
                 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 @@ private void initProperties(final XMLDocumentHelper docHelper, final boolean ele
         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);
     }
 

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);
     }
 
 }

src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java

@@ -412,7 +412,7 @@ static String getFileName(final URL url) {
      * @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 @@ static FileSystem getFileSystem(final FileLocator locator) {
      * @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;
     }
 
     /**

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);
     }
 

src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java

@@ -844,7 +844,7 @@ public Collection<NodeSelector> selectAndTrackNodes(final String key, final Node
             }
             done = structure.compareAndSet(current, createSelectorsForTrackedNodes(refSelectors, nodes, current, resolver));
         } while (!done);
-        return refSelectors.getValue();
+        return refSelectors.get();
     }
 
     /**
@@ -914,7 +914,7 @@ public Collection<NodeSelector> trackChildNodes(final String key, final NodeKeyR
                 done = true;
             }
         } while (!done);
-        return refSelectors.getValue();
+        return refSelectors.get();
     }
 
     /**
@@ -945,7 +945,7 @@ public NodeSelector trackChildNodeWithCreation(final String key, final String ch
             done = structure.compareAndSet(current, newData);
         } while (!done);
 
-        return refSelector.getValue();
+        return refSelector.get();
     }
 
     /**