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 2018/09/27 22:24:26 UTC
svn commit: r1842194 [2/34] - in /commons/proper/configuration/trunk/src:
main/java/org/apache/commons/configuration2/
main/java/org/apache/commons/configuration2/beanutils/
main/java/org/apache/commons/configuration2/builder/
main/java/org/apache/comm...
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java Thu Sep 27 22:24:23 2018
@@ -188,7 +188,7 @@ public abstract class AbstractHierarchic
*
* @param nodeModel the {@code NodeModel}
*/
- protected AbstractHierarchicalConfiguration(NodeModel<T> nodeModel)
+ protected AbstractHierarchicalConfiguration(final NodeModel<T> nodeModel)
{
model = nodeModel;
}
@@ -221,7 +221,7 @@ public abstract class AbstractHierarchic
*/
protected String getRootElementNameInternal()
{
- NodeHandler<T> nodeHandler = getModel().getNodeHandler();
+ final NodeHandler<T> nodeHandler = getModel().getNodeHandler();
return nodeHandler.nodeName(nodeHandler.getRootNode());
}
@@ -268,7 +268,7 @@ public abstract class AbstractHierarchic
* @since 1.3
*/
@Override
- public void setExpressionEngine(ExpressionEngine expressionEngine)
+ public void setExpressionEngine(final ExpressionEngine expressionEngine)
{
this.expressionEngine = expressionEngine;
}
@@ -281,19 +281,19 @@ public abstract class AbstractHierarchic
* @return the found value
*/
@Override
- protected Object getPropertyInternal(String key)
+ protected Object getPropertyInternal(final String key)
{
- List<QueryResult<T>> results = fetchNodeList(key);
+ final List<QueryResult<T>> results = fetchNodeList(key);
if (results.isEmpty())
{
return null;
}
- NodeHandler<T> handler = getModel().getNodeHandler();
- List<Object> list = new ArrayList<>();
- for (QueryResult<T> result : results)
+ final NodeHandler<T> handler = getModel().getNodeHandler();
+ final List<Object> list = new ArrayList<>();
+ for (final QueryResult<T> result : results)
{
- Object value = valueFromResult(result, handler);
+ final Object value = valueFromResult(result, handler);
if (value != null)
{
list.add(value);
@@ -316,7 +316,7 @@ public abstract class AbstractHierarchic
* @param obj the value of the new property
*/
@Override
- protected void addPropertyInternal(String key, Object obj)
+ protected void addPropertyInternal(final String key, final Object obj)
{
addPropertyToModel(key, getListDelimiterHandler().parse(obj));
}
@@ -330,7 +330,7 @@ public abstract class AbstractHierarchic
* is not parsed as a list, but passed directly as only value to the model.
*/
@Override
- protected void addPropertyDirect(String key, Object value)
+ protected void addPropertyDirect(final String key, final Object value)
{
addPropertyToModel(key, Collections.singleton(value));
}
@@ -341,7 +341,7 @@ public abstract class AbstractHierarchic
* @param key the key of the new property
* @param values the values to be added for this property
*/
- private void addPropertyToModel(String key, Iterable<?> values)
+ private void addPropertyToModel(final String key, final Iterable<?> values)
{
getModel().addProperty(key, values, this);
}
@@ -364,7 +364,7 @@ public abstract class AbstractHierarchic
* added
*/
@Override
- public final void addNodes(String key, Collection<? extends T> nodes)
+ public final void addNodes(final String key, final Collection<? extends T> nodes)
{
if (nodes == null || nodes.isEmpty())
{
@@ -394,7 +394,7 @@ public abstract class AbstractHierarchic
* @param nodes a collection with the {@code Node} objects to be added
* @since 2.0
*/
- protected void addNodesInternal(String key, Collection<? extends T> nodes)
+ protected void addNodesInternal(final String key, final Collection<? extends T> nodes)
{
getModel().addNodes(key, nodes, this);
}
@@ -422,7 +422,7 @@ public abstract class AbstractHierarchic
* @return a flag if this key is contained in this configuration
*/
@Override
- protected boolean containsKeyInternal(String key)
+ protected boolean containsKeyInternal(final String key)
{
return getPropertyInternal(key) != null;
}
@@ -434,7 +434,7 @@ public abstract class AbstractHierarchic
* @param value the new value of this property
*/
@Override
- protected void setPropertyInternal(String key, Object value)
+ protected void setPropertyInternal(final String key, final Object value)
{
getModel().setProperty(key, value, this);
}
@@ -443,8 +443,8 @@ public abstract class AbstractHierarchic
* {@inheritDoc} This implementation delegates to the expression engine.
*/
@Override
- public List<QueryResult<T>> resolveKey(T root, String key,
- NodeHandler<T> handler)
+ public List<QueryResult<T>> resolveKey(final T root, final String key,
+ final NodeHandler<T> handler)
{
return getExpressionEngine().query(root, key, handler);
}
@@ -454,11 +454,11 @@ public abstract class AbstractHierarchic
* then filters out attribute results.
*/
@Override
- public List<T> resolveNodeKey(T root, String key, NodeHandler<T> handler)
+ public List<T> resolveNodeKey(final T root, final String key, final NodeHandler<T> handler)
{
- List<QueryResult<T>> results = resolveKey(root, key, handler);
- List<T> targetNodes = new LinkedList<>();
- for (QueryResult<T> result : results)
+ final List<QueryResult<T>> results = resolveKey(root, key, handler);
+ final List<T> targetNodes = new LinkedList<>();
+ for (final QueryResult<T> result : results)
{
if (!result.isAttributeResult())
{
@@ -472,8 +472,8 @@ public abstract class AbstractHierarchic
* {@inheritDoc} This implementation delegates to the expression engine.
*/
@Override
- public NodeAddData<T> resolveAddKey(T root, String key,
- NodeHandler<T> handler)
+ public NodeAddData<T> resolveAddKey(final T root, final String key,
+ final NodeHandler<T> handler)
{
return getExpressionEngine().prepareAdd(root, key, handler);
}
@@ -485,12 +485,12 @@ public abstract class AbstractHierarchic
* added or existing ones need to be removed.
*/
@Override
- public NodeUpdateData<T> resolveUpdateKey(T root, String key,
- Object newValue, NodeHandler<T> handler)
+ public NodeUpdateData<T> resolveUpdateKey(final T root, final String key,
+ final Object newValue, final NodeHandler<T> handler)
{
- Iterator<QueryResult<T>> itNodes = fetchNodeList(key).iterator();
- Iterator<?> itValues = getListDelimiterHandler().parse(newValue).iterator();
- Map<QueryResult<T>, Object> changedValues =
+ final Iterator<QueryResult<T>> itNodes = fetchNodeList(key).iterator();
+ final Iterator<?> itValues = getListDelimiterHandler().parse(newValue).iterator();
+ final Map<QueryResult<T>, Object> changedValues =
new HashMap<>();
Collection<Object> additionalValues = null;
Collection<QueryResult<T>> removedItems = null;
@@ -531,9 +531,9 @@ public abstract class AbstractHierarchic
* for nodes encountered on the path.
*/
@Override
- public String nodeKey(T node, Map<T, String> cache, NodeHandler<T> handler)
+ public String nodeKey(final T node, final Map<T, String> cache, final NodeHandler<T> handler)
{
- List<T> path = new LinkedList<>();
+ final List<T> path = new LinkedList<>();
T currentNode = node;
String key = cache.get(node);
while (key == null && currentNode != null)
@@ -543,9 +543,9 @@ public abstract class AbstractHierarchic
key = cache.get(currentNode);
}
- for (T n : path)
+ for (final T n : path)
{
- String currentKey = getExpressionEngine().canonicalKey(n, key, handler);
+ final String currentKey = getExpressionEngine().canonicalKey(n, key, handler);
cache.put(n, currentKey);
key = currentKey;
}
@@ -572,13 +572,13 @@ public abstract class AbstractHierarchic
* @param key the key of the property to be removed
*/
@Override
- public final void clearTree(String key)
+ public final void clearTree(final String key)
{
beginWrite(false);
try
{
fireEvent(ConfigurationEvent.CLEAR_TREE, key, null, true);
- Object nodes = clearTreeInternal(key);
+ final Object nodes = clearTreeInternal(key);
fireEvent(ConfigurationEvent.CLEAR_TREE, key, nodes, false);
}
finally
@@ -599,7 +599,7 @@ public abstract class AbstractHierarchic
* CLEAR_TREE)
* @since 2.0
*/
- protected Object clearTreeInternal(String key)
+ protected Object clearTreeInternal(final String key)
{
return getModel().clearTree(key, this);
}
@@ -613,7 +613,7 @@ public abstract class AbstractHierarchic
* @param key the key of the property to be removed
*/
@Override
- protected void clearPropertyDirect(String key)
+ protected void clearPropertyDirect(final String key)
{
getModel().clearProperty(key, this);
}
@@ -650,8 +650,8 @@ public abstract class AbstractHierarchic
*/
private DefinedKeysVisitor visitDefinedKeys()
{
- DefinedKeysVisitor visitor = new DefinedKeysVisitor();
- NodeHandler<T> nodeHandler = getModel().getNodeHandler();
+ final DefinedKeysVisitor visitor = new DefinedKeysVisitor();
+ final NodeHandler<T> nodeHandler = getModel().getNodeHandler();
NodeTreeWalker.INSTANCE.walkDFS(nodeHandler.getRootNode(), visitor,
nodeHandler);
return visitor;
@@ -669,23 +669,23 @@ public abstract class AbstractHierarchic
* @return an iterator with the found keys
*/
@Override
- protected Iterator<String> getKeysInternal(String prefix)
+ protected Iterator<String> getKeysInternal(final String prefix)
{
- DefinedKeysVisitor visitor = new DefinedKeysVisitor(prefix);
+ final DefinedKeysVisitor visitor = new DefinedKeysVisitor(prefix);
if (containsKey(prefix))
{
// explicitly add the prefix
visitor.getKeyList().add(prefix);
}
- List<QueryResult<T>> results = fetchNodeList(prefix);
- NodeHandler<T> handler = getModel().getNodeHandler();
+ final List<QueryResult<T>> results = fetchNodeList(prefix);
+ final NodeHandler<T> handler = getModel().getNodeHandler();
- for (QueryResult<T> result : results)
+ for (final QueryResult<T> result : results)
{
if (!result.isAttributeResult())
{
- for (T c : handler.getChildren(result.getNode()))
+ for (final T c : handler.getChildren(result.getNode()))
{
NodeTreeWalker.INSTANCE.walkDFS(c, visitor, handler);
}
@@ -707,7 +707,7 @@ public abstract class AbstractHierarchic
* @return the maximum defined index for this key
*/
@Override
- public final int getMaxIndex(String key)
+ public final int getMaxIndex(final String key)
{
beginRead(false);
try
@@ -729,7 +729,7 @@ public abstract class AbstractHierarchic
* @return the maximum defined index for this key
* @since 2.0
*/
- protected int getMaxIndexInternal(String key)
+ protected int getMaxIndexInternal(final String key)
{
return fetchNodeList(key).size() - 1;
}
@@ -749,6 +749,7 @@ public abstract class AbstractHierarchic
try
{
@SuppressWarnings("unchecked") // clone returns the same type
+ final
AbstractHierarchicalConfiguration<T> copy =
(AbstractHierarchicalConfiguration<T>) super.clone();
copy.setSynchronizer(NoOpSynchronizer.INSTANCE);
@@ -758,7 +759,7 @@ public abstract class AbstractHierarchic
return copy;
}
- catch (CloneNotSupportedException cex)
+ catch (final CloneNotSupportedException cex)
{
// should not happen
throw new ConfigurationRuntimeException(cex);
@@ -784,9 +785,9 @@ public abstract class AbstractHierarchic
* @param key the key
* @return a list with all results selected by this key
*/
- protected List<QueryResult<T>> fetchNodeList(String key)
+ protected List<QueryResult<T>> fetchNodeList(final String key)
{
- NodeHandler<T> nodeHandler = getModel().getNodeHandler();
+ final NodeHandler<T> nodeHandler = getModel().getNodeHandler();
return resolveKey(nodeHandler.getRootNode(), key, nodeHandler);
}
@@ -796,9 +797,9 @@ public abstract class AbstractHierarchic
* @param node the node to be checked
* @return a flag if this node is defined
*/
- protected boolean nodeDefined(T node)
+ protected boolean nodeDefined(final T node)
{
- DefinedVisitor<T> visitor = new DefinedVisitor<>();
+ final DefinedVisitor<T> visitor = new DefinedVisitor<>();
NodeTreeWalker.INSTANCE.walkBFS(node, visitor, getModel().getNodeHandler());
return visitor.isDefined();
}
@@ -824,7 +825,7 @@ public abstract class AbstractHierarchic
* @param handler the {@code NodeHandler}
* @return the value of this result (may be <b>null</b>)
*/
- private Object valueFromResult(QueryResult<T> result, NodeHandler<T> handler)
+ private Object valueFromResult(final QueryResult<T> result, final NodeHandler<T> handler)
{
return result.isAttributeResult() ? result.getAttributeValue(handler)
: handler.getValue(result.getNode());
@@ -861,7 +862,7 @@ public abstract class AbstractHierarchic
* @param node the actual node
*/
@Override
- public void visitBeforeChildren(T node, NodeHandler<T> handler)
+ public void visitBeforeChildren(final T node, final NodeHandler<T> handler)
{
defined =
handler.getValue(node) != null
@@ -907,7 +908,7 @@ public abstract class AbstractHierarchic
*
* @param prefix the prefix
*/
- public DefinedKeysVisitor(String prefix)
+ public DefinedKeysVisitor(final String prefix)
{
this();
parentKeys.push(prefix);
@@ -928,7 +929,7 @@ public abstract class AbstractHierarchic
* node's key from the stack.
*/
@Override
- public void visitAfterChildren(T node, NodeHandler<T> handler)
+ public void visitAfterChildren(final T node, final NodeHandler<T> handler)
{
parentKeys.pop();
}
@@ -938,11 +939,11 @@ public abstract class AbstractHierarchic
* to the internal list.
*/
@Override
- public void visitBeforeChildren(T node, NodeHandler<T> handler)
+ public void visitBeforeChildren(final T node, final NodeHandler<T> handler)
{
- String parentKey = parentKeys.isEmpty() ? null
+ final String parentKey = parentKeys.isEmpty() ? null
: parentKeys.peek();
- String key = getExpressionEngine().nodeKey(node, parentKey, handler);
+ final String key = getExpressionEngine().nodeKey(node, parentKey, handler);
parentKeys.push(key);
if (handler.getValue(node) != null)
{
@@ -958,10 +959,10 @@ public abstract class AbstractHierarchic
* @param node the current node
* @param handler the {@code NodeHandler}
*/
- public void handleAttributeKeys(String parentKey, T node,
- NodeHandler<T> handler)
+ public void handleAttributeKeys(final String parentKey, final T node,
+ final NodeHandler<T> handler)
{
- for (String attr : handler.getAttributes(node))
+ for (final String attr : handler.getAttributes(node))
{
keyList.add(getExpressionEngine().attributeKey(parentKey, attr));
}
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.java Thu Sep 27 22:24:23 2018
@@ -58,7 +58,7 @@ public class AbstractYAMLBasedConfigurat
* @param c the configuration to be copied
*/
protected AbstractYAMLBasedConfiguration(
- HierarchicalConfiguration<ImmutableNode> c)
+ final HierarchicalConfiguration<ImmutableNode> c)
{
super(c);
initLogger(new ConfigurationLogger(getClass()));
@@ -71,9 +71,9 @@ public class AbstractYAMLBasedConfigurat
*
* @param map the map to be processed
*/
- protected void load(Map<String, Object> map)
+ protected void load(final Map<String, Object> map)
{
- List<ImmutableNode> roots = constructHierarchy("", map);
+ final List<ImmutableNode> roots = constructHierarchy("", map);
getNodeModel().setRootNode(roots.get(0));
}
@@ -84,12 +84,12 @@ public class AbstractYAMLBasedConfigurat
* @param node The configuration node to create a map from.
* @return A Map that contains the configuration node information.
*/
- protected Map<String, Object> constructMap(ImmutableNode node)
+ protected Map<String, Object> constructMap(final ImmutableNode node)
{
- Map<String, Object> map = new HashMap<>(node.getChildren().size());
- for (ImmutableNode cNode : node.getChildren())
+ final Map<String, Object> map = new HashMap<>(node.getChildren().size());
+ for (final ImmutableNode cNode : node.getChildren())
{
- Object value = cNode.getChildren().isEmpty() ? cNode.getValue()
+ final Object value = cNode.getChildren().isEmpty() ? cNode.getValue()
: constructMap(cNode);
addEntry(map, cNode.getNodeName(), value);
}
@@ -105,10 +105,10 @@ public class AbstractYAMLBasedConfigurat
* @param key the key
* @param value the value
*/
- private static void addEntry(Map<String, Object> map, String key,
- Object value)
+ private static void addEntry(final Map<String, Object> map, final String key,
+ final Object value)
{
- Object oldValue = map.get(key);
+ final Object oldValue = map.get(key);
if (oldValue == null)
{
map.put(key, value);
@@ -117,12 +117,13 @@ public class AbstractYAMLBasedConfigurat
{
// safe case because the collection was created by ourselves
@SuppressWarnings("unchecked")
+ final
Collection<Object> values = (Collection<Object>) oldValue;
values.add(value);
}
else
{
- Collection<Object> values = new ArrayList<>();
+ final Collection<Object> values = new ArrayList<>();
values.add(oldValue);
values.add(value);
map.put(key, values);
@@ -139,8 +140,8 @@ public class AbstractYAMLBasedConfigurat
* @param elem the element to be processed
* @return a list with configuration nodes representing the element
*/
- private static List<ImmutableNode> constructHierarchy(String key,
- Object elem)
+ private static List<ImmutableNode> constructHierarchy(final String key,
+ final Object elem)
{
if (elem instanceof Map)
{
@@ -165,14 +166,14 @@ public class AbstractYAMLBasedConfigurat
* @param key the key under which this map is to be stored
* @return a node representing this map
*/
- private static List<ImmutableNode> parseMap(Map<String, Object> map, String key)
+ private static List<ImmutableNode> parseMap(final Map<String, Object> map, final String key)
{
- ImmutableNode.Builder subtree = new ImmutableNode.Builder().name(key);
- for (Map.Entry<String, Object> entry : map.entrySet())
+ final ImmutableNode.Builder subtree = new ImmutableNode.Builder().name(key);
+ for (final Map.Entry<String, Object> entry : map.entrySet())
{
- List<ImmutableNode> children =
+ final List<ImmutableNode> children =
constructHierarchy(entry.getKey(), entry.getValue());
- for (ImmutableNode child : children)
+ for (final ImmutableNode child : children)
{
subtree.addChild(child);
}
@@ -188,10 +189,10 @@ public class AbstractYAMLBasedConfigurat
* @param key the key under which this collection is to be stored
* @return a node representing this collection
*/
- private static List<ImmutableNode> parseCollection(Collection<Object> col, String key)
+ private static List<ImmutableNode> parseCollection(final Collection<Object> col, final String key)
{
- List<ImmutableNode> nodes = new ArrayList<>(col.size());
- for (Object elem : col)
+ final List<ImmutableNode> nodes = new ArrayList<>(col.size());
+ for (final Object elem : col)
{
nodes.addAll(constructHierarchy(key, elem));
}
@@ -204,7 +205,7 @@ public class AbstractYAMLBasedConfigurat
* @param e the exception to be wrapped
* @throws ConfigurationException the resulting exception
*/
- static void rethrowException(Exception e) throws ConfigurationException
+ static void rethrowException(final Exception e) throws ConfigurationException
{
if (e instanceof ClassCastException)
{
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java Thu Sep 27 22:24:23 2018
@@ -62,9 +62,9 @@ public class BaseConfiguration extends A
* @param value object to store
*/
@Override
- protected void addPropertyDirect(String key, Object value)
+ protected void addPropertyDirect(final String key, final Object value)
{
- Object previousValue = getPropertyInternal(key);
+ final Object previousValue = getPropertyInternal(key);
if (previousValue == null)
{
@@ -74,6 +74,7 @@ public class BaseConfiguration extends A
{
// safe to case because we have created the lists ourselves
@SuppressWarnings("unchecked")
+ final
List<Object> valueList = (List<Object>) previousValue;
// the value is added to the existing list
valueList.add(value);
@@ -81,7 +82,7 @@ public class BaseConfiguration extends A
else
{
// the previous value is replaced by a list containing the previous value and the new value
- List<Object> list = new ArrayList<>();
+ final List<Object> list = new ArrayList<>();
list.add(previousValue);
list.add(value);
@@ -97,7 +98,7 @@ public class BaseConfiguration extends A
* @return object associated with the given configuration key.
*/
@Override
- protected Object getPropertyInternal(String key)
+ protected Object getPropertyInternal(final String key)
{
return store.get(key);
}
@@ -123,7 +124,7 @@ public class BaseConfiguration extends A
* {@code false} otherwise.
*/
@Override
- protected boolean containsKeyInternal(String key)
+ protected boolean containsKeyInternal(final String key)
{
return store.containsKey(key);
}
@@ -134,7 +135,7 @@ public class BaseConfiguration extends A
* @param key the key to remove along with corresponding value.
*/
@Override
- protected void clearPropertyDirect(String key)
+ protected void clearPropertyDirect(final String key)
{
store.remove(key);
}
@@ -180,13 +181,13 @@ public class BaseConfiguration extends A
{
try
{
- BaseConfiguration copy = (BaseConfiguration) super.clone();
+ final BaseConfiguration copy = (BaseConfiguration) super.clone();
cloneStore(copy);
copy.cloneInterpolator(this);
return copy;
}
- catch (CloneNotSupportedException cex)
+ catch (final CloneNotSupportedException cex)
{
// should not happen
throw new ConfigurationRuntimeException(cex);
@@ -199,21 +200,23 @@ public class BaseConfiguration extends A
* @param copy the copy created by the {@code clone()} method
* @throws CloneNotSupportedException if the map cannot be cloned
*/
- private void cloneStore(BaseConfiguration copy)
+ private void cloneStore(final BaseConfiguration copy)
throws CloneNotSupportedException
{
// This is safe because the type of the map is known
@SuppressWarnings("unchecked")
+ final
Map<String, Object> clonedStore = (Map<String, Object>) ConfigurationUtils.clone(store);
copy.store = clonedStore;
// Handle collections in the map; they have to be cloned, too
- for (Map.Entry<String, Object> e : store.entrySet())
+ for (final Map.Entry<String, Object> e : store.entrySet())
{
if (e.getValue() instanceof Collection)
{
// This is safe because the collections were created by ourselves
@SuppressWarnings("unchecked")
+ final
Collection<String> strList = (Collection<String>) e.getValue();
copy.store.put(e.getKey(), new ArrayList<>(strList));
}
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseConfigurationXMLReader.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseConfigurationXMLReader.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseConfigurationXMLReader.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseConfigurationXMLReader.java Thu Sep 27 22:24:23 2018
@@ -49,7 +49,7 @@ public class BaseConfigurationXMLReader
*
* @param conf the configuration to be parsed
*/
- public BaseConfigurationXMLReader(Configuration conf)
+ public BaseConfigurationXMLReader(final Configuration conf)
{
this();
setConfiguration(conf);
@@ -70,7 +70,7 @@ public class BaseConfigurationXMLReader
*
* @param conf the configuration
*/
- public void setConfiguration(Configuration conf)
+ public void setConfiguration(final Configuration conf)
{
config = conf;
}
@@ -114,7 +114,7 @@ public class BaseConfigurationXMLReader
* @param value the element value
*/
@Override
- protected void elementStart(String name, Object value)
+ protected void elementStart(final String name, final Object value)
{
fireElementStart(name, null);
if (value != null)
@@ -129,7 +129,7 @@ public class BaseConfigurationXMLReader
* @param name the element name
*/
@Override
- protected void elementEnd(String name)
+ protected void elementEnd(final String name)
{
fireElementEnd(name);
}
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java Thu Sep 27 22:24:23 2018
@@ -74,7 +74,7 @@ public class BaseHierarchicalConfigurati
* constructor will behave like the standard constructor)
* @since 1.4
*/
- public BaseHierarchicalConfiguration(HierarchicalConfiguration<ImmutableNode> c)
+ public BaseHierarchicalConfiguration(final HierarchicalConfiguration<ImmutableNode> c)
{
this(createNodeModel(c));
}
@@ -85,7 +85,7 @@ public class BaseHierarchicalConfigurati
*
* @param model the {@code NodeModel}
*/
- protected BaseHierarchicalConfiguration(NodeModel<ImmutableNode> model)
+ protected BaseHierarchicalConfiguration(final NodeModel<ImmutableNode> model)
{
super(model);
changeListener = createChangeListener();
@@ -121,24 +121,24 @@ public class BaseHierarchicalConfigurati
* @return a new configuration object representing the selected subset
*/
@Override
- public Configuration subset(String prefix)
+ public Configuration subset(final String prefix)
{
beginRead(false);
try
{
- List<QueryResult<ImmutableNode>> results = fetchNodeList(prefix);
+ final List<QueryResult<ImmutableNode>> results = fetchNodeList(prefix);
if (results.isEmpty())
{
return new BaseHierarchicalConfiguration();
}
final BaseHierarchicalConfiguration parent = this;
- BaseHierarchicalConfiguration result =
+ final BaseHierarchicalConfiguration result =
new BaseHierarchicalConfiguration()
{
// Override interpolate to always interpolate on the parent
@Override
- protected Object interpolate(Object value)
+ protected Object interpolate(final Object value)
{
return parent.interpolate(value);
}
@@ -174,13 +174,13 @@ public class BaseHierarchicalConfigurati
* @return the root node for the subset configuration
*/
private ImmutableNode createSubsetRootNode(
- Collection<QueryResult<ImmutableNode>> results)
+ final Collection<QueryResult<ImmutableNode>> results)
{
- ImmutableNode.Builder builder = new ImmutableNode.Builder();
+ final ImmutableNode.Builder builder = new ImmutableNode.Builder();
Object value = null;
int valueCount = 0;
- for (QueryResult<ImmutableNode> result : results)
+ for (final QueryResult<ImmutableNode> result : results)
{
if (result.isAttributeResult())
{
@@ -224,8 +224,8 @@ public class BaseHierarchicalConfigurati
* node
*/
@Override
- public HierarchicalConfiguration<ImmutableNode> configurationAt(String key,
- boolean supportUpdates)
+ public HierarchicalConfiguration<ImmutableNode> configurationAt(final String key,
+ final boolean supportUpdates)
{
beginRead(false);
try
@@ -265,7 +265,7 @@ public class BaseHierarchicalConfigurati
* @return a {@code NodeSelector} for initializing a sub configuration
* @since 2.0
*/
- protected NodeSelector getSubConfigurationNodeSelector(String key)
+ protected NodeSelector getSubConfigurationNodeSelector(final String key)
{
return new NodeSelector(key);
}
@@ -281,9 +281,9 @@ public class BaseHierarchicalConfigurati
* @since 2.0
*/
protected SubnodeConfiguration createSubConfigurationForTrackedNode(
- NodeSelector selector, InMemoryNodeModelSupport parentModelSupport)
+ final NodeSelector selector, final InMemoryNodeModelSupport parentModelSupport)
{
- SubnodeConfiguration subConfig =
+ final SubnodeConfiguration subConfig =
new SubnodeConfiguration(this, new TrackedNodeModel(
parentModelSupport, selector, true));
initSubConfigurationForThisParent(subConfig);
@@ -299,7 +299,7 @@ public class BaseHierarchicalConfigurati
* @param subConfig the sub configuration to be initialized
* @since 2.0
*/
- protected void initSubConfigurationForThisParent(SubnodeConfiguration subConfig)
+ protected void initSubConfigurationForThisParent(final SubnodeConfiguration subConfig)
{
initSubConfiguration(subConfig);
subConfig.addEventListener(ConfigurationEvent.ANY, changeListener);
@@ -315,9 +315,9 @@ public class BaseHierarchicalConfigurati
* @return the new sub configuration
*/
private BaseHierarchicalConfiguration createConnectedSubConfiguration(
- String key)
+ final String key)
{
- NodeSelector selector = getSubConfigurationNodeSelector(key);
+ final NodeSelector selector = getSubConfigurationNodeSelector(key);
getSubConfigurationParentModel().trackNode(selector, this);
return createSubConfigurationForTrackedNode(selector, this);
}
@@ -331,13 +331,13 @@ public class BaseHierarchicalConfigurati
* @return the list with sub configurations
*/
private List<HierarchicalConfiguration<ImmutableNode>> createConnectedSubConfigurations(
- InMemoryNodeModelSupport parentModelSupport,
- Collection<NodeSelector> selectors)
+ final InMemoryNodeModelSupport parentModelSupport,
+ final Collection<NodeSelector> selectors)
{
- List<HierarchicalConfiguration<ImmutableNode>> configs =
+ final List<HierarchicalConfiguration<ImmutableNode>> configs =
new ArrayList<>(
selectors.size());
- for (NodeSelector selector : selectors)
+ for (final NodeSelector selector : selectors)
{
configs.add(createSubConfigurationForTrackedNode(selector,
parentModelSupport));
@@ -354,16 +354,16 @@ public class BaseHierarchicalConfigurati
* @return the new sub configuration
*/
private BaseHierarchicalConfiguration createIndependentSubConfiguration(
- String key)
+ final String key)
{
- List<ImmutableNode> targetNodes = fetchFilteredNodeResults(key);
- int size = targetNodes.size();
+ final List<ImmutableNode> targetNodes = fetchFilteredNodeResults(key);
+ final int size = targetNodes.size();
if (size != 1)
{
throw new ConfigurationRuntimeException(
"Passed in key must select exactly one node (found %,d): %s", size, key);
}
- BaseHierarchicalConfiguration sub =
+ final BaseHierarchicalConfiguration sub =
new BaseHierarchicalConfiguration(new InMemoryNodeModel(
targetNodes.get(0)));
initSubConfiguration(sub);
@@ -379,9 +379,9 @@ public class BaseHierarchicalConfigurati
* @return the initialized sub configuration
*/
private BaseHierarchicalConfiguration createIndependentSubConfigurationForNode(
- ImmutableNode node)
+ final ImmutableNode node)
{
- BaseHierarchicalConfiguration sub =
+ final BaseHierarchicalConfiguration sub =
new BaseHierarchicalConfiguration(new InMemoryNodeModel(node));
initSubConfiguration(sub);
return sub;
@@ -393,9 +393,9 @@ public class BaseHierarchicalConfigurati
* @param key the key
* @return the filtered list with result nodes
*/
- private List<ImmutableNode> fetchFilteredNodeResults(String key)
+ private List<ImmutableNode> fetchFilteredNodeResults(final String key)
{
- NodeHandler<ImmutableNode> handler = getModel().getNodeHandler();
+ final NodeHandler<ImmutableNode> handler = getModel().getNodeHandler();
return resolveNodeKey(handler.getRootNode(), key, handler);
}
@@ -406,7 +406,7 @@ public class BaseHierarchicalConfigurati
*/
@Override
public ImmutableHierarchicalConfiguration immutableConfigurationAt(
- String key, boolean supportUpdates)
+ final String key, final boolean supportUpdates)
{
return ConfigurationUtils.unmodifiableConfiguration(configurationAt(
key, supportUpdates));
@@ -418,7 +418,7 @@ public class BaseHierarchicalConfigurati
* @throws ConfigurationRuntimeException if the key does not select a single node
*/
@Override
- public HierarchicalConfiguration<ImmutableNode> configurationAt(String key)
+ public HierarchicalConfiguration<ImmutableNode> configurationAt(final String key)
{
return configurationAt(key, false);
}
@@ -431,7 +431,7 @@ public class BaseHierarchicalConfigurati
*/
@Override
public ImmutableHierarchicalConfiguration immutableConfigurationAt(
- String key)
+ final String key)
{
return ConfigurationUtils.unmodifiableConfiguration(configurationAt(
key));
@@ -443,7 +443,7 @@ public class BaseHierarchicalConfigurati
*/
@Override
public List<HierarchicalConfiguration<ImmutableNode>> configurationsAt(
- String key)
+ final String key)
{
List<ImmutableNode> nodes;
beginRead(false);
@@ -456,12 +456,12 @@ public class BaseHierarchicalConfigurati
endRead();
}
- List<HierarchicalConfiguration<ImmutableNode>> results =
+ final List<HierarchicalConfiguration<ImmutableNode>> results =
new ArrayList<>(
nodes.size());
- for (ImmutableNode node : nodes)
+ for (final ImmutableNode node : nodes)
{
- BaseHierarchicalConfiguration sub =
+ final BaseHierarchicalConfiguration sub =
createIndependentSubConfigurationForNode(node);
results.add(sub);
}
@@ -475,7 +475,7 @@ public class BaseHierarchicalConfigurati
*/
@Override
public List<HierarchicalConfiguration<ImmutableNode>> configurationsAt(
- String key, boolean supportUpdates)
+ final String key, final boolean supportUpdates)
{
if (!supportUpdates)
{
@@ -493,7 +493,7 @@ public class BaseHierarchicalConfigurati
endRead();
}
- Collection<NodeSelector> selectors =
+ final Collection<NodeSelector> selectors =
parentModel.selectAndTrackNodes(key, this);
return createConnectedSubConfigurations(this, selectors);
}
@@ -506,7 +506,7 @@ public class BaseHierarchicalConfigurati
*/
@Override
public List<ImmutableHierarchicalConfiguration> immutableConfigurationsAt(
- String key)
+ final String key)
{
return toImmutable(configurationsAt(key));
}
@@ -518,7 +518,7 @@ public class BaseHierarchicalConfigurati
*/
@Override
public List<HierarchicalConfiguration<ImmutableNode>> childConfigurationsAt(
- String key)
+ final String key)
{
List<ImmutableNode> nodes;
beginRead(false);
@@ -536,11 +536,11 @@ public class BaseHierarchicalConfigurati
return Collections.emptyList();
}
- ImmutableNode parent = nodes.get(0);
- List<HierarchicalConfiguration<ImmutableNode>> subs =
+ final ImmutableNode parent = nodes.get(0);
+ final List<HierarchicalConfiguration<ImmutableNode>> subs =
new ArrayList<>(parent
.getChildren().size());
- for (ImmutableNode node : parent.getChildren())
+ for (final ImmutableNode node : parent.getChildren())
{
subs.add(createIndependentSubConfigurationForNode(node));
}
@@ -556,14 +556,14 @@ public class BaseHierarchicalConfigurati
*/
@Override
public List<HierarchicalConfiguration<ImmutableNode>> childConfigurationsAt(
- String key, boolean supportUpdates)
+ final String key, final boolean supportUpdates)
{
if (!supportUpdates)
{
return childConfigurationsAt(key);
}
- InMemoryNodeModel parentModel = getSubConfigurationParentModel();
+ final InMemoryNodeModel parentModel = getSubConfigurationParentModel();
return createConnectedSubConfigurations(this,
parentModel.trackChildNodes(key, this));
}
@@ -576,7 +576,7 @@ public class BaseHierarchicalConfigurati
*/
@Override
public List<ImmutableHierarchicalConfiguration> immutableChildConfigurationsAt(
- String key)
+ final String key)
{
return toImmutable(childConfigurationsAt(key));
}
@@ -590,7 +590,7 @@ public class BaseHierarchicalConfigurati
* @param event the event describing the change
* @since 1.5
*/
- protected void subnodeConfigurationChanged(ConfigurationEvent event)
+ protected void subnodeConfigurationChanged(final ConfigurationEvent event)
{
fireEvent(ConfigurationEvent.SUBNODE_CHANGED, null, event, event.isBeforeUpdate());
}
@@ -602,7 +602,7 @@ public class BaseHierarchicalConfigurati
*
* @param sub the sub configuration to be initialized
*/
- private void initSubConfiguration(BaseHierarchicalConfiguration sub)
+ private void initSubConfiguration(final BaseHierarchicalConfiguration sub)
{
sub.setSynchronizer(getSynchronizer());
sub.setExpressionEngine(getExpressionEngine());
@@ -623,7 +623,7 @@ public class BaseHierarchicalConfigurati
return new EventListener<ConfigurationEvent>()
{
@Override
- public void onEvent(ConfigurationEvent event)
+ public void onEvent(final ConfigurationEvent event)
{
subnodeConfigurationChanged(event);
}
@@ -643,12 +643,12 @@ public class BaseHierarchicalConfigurati
@Override
public Configuration interpolatedConfiguration()
{
- InterpolatedVisitor visitor = new InterpolatedVisitor();
- NodeHandler<ImmutableNode> handler = getModel().getNodeHandler();
+ final InterpolatedVisitor visitor = new InterpolatedVisitor();
+ final NodeHandler<ImmutableNode> handler = getModel().getNodeHandler();
NodeTreeWalker.INSTANCE
.walkDFS(handler.getRootNode(), visitor, handler);
- BaseHierarchicalConfiguration c =
+ final BaseHierarchicalConfiguration c =
(BaseHierarchicalConfiguration) clone();
c.getNodeModel().setRootNode(visitor.getInterpolatedRoot());
return c;
@@ -673,11 +673,11 @@ public class BaseHierarchicalConfigurati
* @return a list with corresponding immutable configurations
*/
private static List<ImmutableHierarchicalConfiguration> toImmutable(
- List<? extends HierarchicalConfiguration<?>> subs)
+ final List<? extends HierarchicalConfiguration<?>> subs)
{
- List<ImmutableHierarchicalConfiguration> res =
+ final List<ImmutableHierarchicalConfiguration> res =
new ArrayList<>(subs.size());
- for (HierarchicalConfiguration<?> sub : subs)
+ for (final HierarchicalConfiguration<?> sub : subs)
{
res.add(ConfigurationUtils.unmodifiableConfiguration(sub));
}
@@ -695,9 +695,9 @@ public class BaseHierarchicalConfigurati
* @return the {@code NodeModel} for the new configuration
*/
private static NodeModel<ImmutableNode> createNodeModel(
- HierarchicalConfiguration<ImmutableNode> c)
+ final HierarchicalConfiguration<ImmutableNode> c)
{
- ImmutableNode root = (c != null) ? obtainRootNode(c) : null;
+ final ImmutableNode root = (c != null) ? obtainRootNode(c) : null;
return new InMemoryNodeModel(root);
}
@@ -709,7 +709,7 @@ public class BaseHierarchicalConfigurati
* @return the root node of this configuration
*/
private static ImmutableNode obtainRootNode(
- HierarchicalConfiguration<ImmutableNode> c)
+ final HierarchicalConfiguration<ImmutableNode> c)
{
return c.getNodeModel().getNodeHandler().getRootNode();
}
@@ -732,9 +732,9 @@ public class BaseHierarchicalConfigurati
ConfigurationNodeVisitorAdapter<ImmutableNode>
{
@Override
- public void visitBeforeChildren(ImmutableNode node, NodeHandler<ImmutableNode> handler)
+ public void visitBeforeChildren(final ImmutableNode node, final NodeHandler<ImmutableNode> handler)
{
- ReferenceNodeHandler refHandler = (ReferenceNodeHandler) handler;
+ final ReferenceNodeHandler refHandler = (ReferenceNodeHandler) handler;
updateNode(node, refHandler);
insertNewChildNodes(node, refHandler);
}
@@ -781,10 +781,10 @@ public class BaseHierarchicalConfigurati
* @param node the current node to be processed
* @param refHandler the {@code ReferenceNodeHandler}
*/
- private void updateNode(ImmutableNode node,
- ReferenceNodeHandler refHandler)
+ private void updateNode(final ImmutableNode node,
+ final ReferenceNodeHandler refHandler)
{
- Object reference = refHandler.getReference(node);
+ final Object reference = refHandler.getReference(node);
if (reference != null)
{
update(node, reference, refHandler);
@@ -797,12 +797,12 @@ public class BaseHierarchicalConfigurati
* @param node the current node to be processed
* @param refHandler the {@code ReferenceNodeHandler}
*/
- private void insertNewChildNodes(ImmutableNode node,
- ReferenceNodeHandler refHandler)
+ private void insertNewChildNodes(final ImmutableNode node,
+ final ReferenceNodeHandler refHandler)
{
- Collection<ImmutableNode> subNodes =
+ final Collection<ImmutableNode> subNodes =
new LinkedList<>(refHandler.getChildren(node));
- Iterator<ImmutableNode> children = subNodes.iterator();
+ final Iterator<ImmutableNode> children = subNodes.iterator();
ImmutableNode sibling1;
ImmutableNode nd = null;
@@ -819,7 +819,7 @@ public class BaseHierarchicalConfigurati
if (refHandler.getReference(nd) == null)
{
// find all following new nodes
- List<ImmutableNode> newNodes =
+ final List<ImmutableNode> newNodes =
new LinkedList<>();
newNodes.add(nd);
while (children.hasNext())
@@ -836,9 +836,9 @@ public class BaseHierarchicalConfigurati
}
// Insert all new nodes
- ImmutableNode sibling2 =
+ final ImmutableNode sibling2 =
(refHandler.getReference(nd) == null) ? null : nd;
- for (ImmutableNode insertNode : newNodes)
+ for (final ImmutableNode insertNode : newNodes)
{
if (refHandler.getReference(insertNode) == null)
{
@@ -885,8 +885,8 @@ public class BaseHierarchicalConfigurati
}
@Override
- public void visitBeforeChildren(ImmutableNode node,
- NodeHandler<ImmutableNode> handler)
+ public void visitBeforeChildren(final ImmutableNode node,
+ final NodeHandler<ImmutableNode> handler)
{
if (isLeafNode(node, handler))
{
@@ -894,7 +894,7 @@ public class BaseHierarchicalConfigurati
}
else
{
- ImmutableNode.Builder builder =
+ final ImmutableNode.Builder builder =
new ImmutableNode.Builder(handler.getChildrenCount(
node, null))
.name(handler.nodeName(node))
@@ -906,12 +906,12 @@ public class BaseHierarchicalConfigurati
}
@Override
- public void visitAfterChildren(ImmutableNode node,
- NodeHandler<ImmutableNode> handler)
+ public void visitAfterChildren(final ImmutableNode node,
+ final NodeHandler<ImmutableNode> handler)
{
if (!isLeafNode(node, handler))
{
- ImmutableNode newNode = pop().create();
+ final ImmutableNode newNode = pop().create();
storeInterpolatedNode(newNode);
}
}
@@ -921,7 +921,7 @@ public class BaseHierarchicalConfigurati
*
* @param builder the builder
*/
- private void push(ImmutableNode.Builder builder)
+ private void push(final ImmutableNode.Builder builder)
{
builderStack.add(0, builder);
}
@@ -954,8 +954,8 @@ public class BaseHierarchicalConfigurati
* @param handler the {@code NodeHandler}
* @return a flag whether this is a leaf node
*/
- private boolean isLeafNode(ImmutableNode node,
- NodeHandler<ImmutableNode> handler)
+ private boolean isLeafNode(final ImmutableNode node,
+ final NodeHandler<ImmutableNode> handler)
{
return handler.getChildren(node).isEmpty();
}
@@ -969,15 +969,15 @@ public class BaseHierarchicalConfigurati
* @param node the current node to be processed
* @param handler the {@code NodeHandler}
*/
- private void handleLeafNode(ImmutableNode node,
- NodeHandler<ImmutableNode> handler)
+ private void handleLeafNode(final ImmutableNode node,
+ final NodeHandler<ImmutableNode> handler)
{
- Object value = interpolate(node.getValue());
- Map<String, Object> interpolatedAttributes =
+ final Object value = interpolate(node.getValue());
+ final Map<String, Object> interpolatedAttributes =
new HashMap<>();
- boolean attributeChanged =
+ final boolean attributeChanged =
interpolateAttributes(node, handler, interpolatedAttributes);
- ImmutableNode newNode =
+ final ImmutableNode newNode =
(valueChanged(value, handler.getValue(node)) || attributeChanged) ? new ImmutableNode.Builder()
.name(handler.nodeName(node)).value(value)
.addAttributes(interpolatedAttributes).create()
@@ -992,7 +992,7 @@ public class BaseHierarchicalConfigurati
*
* @param node the node to be stored
*/
- private void storeInterpolatedNode(ImmutableNode node)
+ private void storeInterpolatedNode(final ImmutableNode node)
{
if (builderStack.isEmpty())
{
@@ -1013,14 +1013,14 @@ public class BaseHierarchicalConfigurati
* @return a flag whether an attribute value was changed by
* interpolation
*/
- private boolean interpolateAttributes(ImmutableNode node,
- NodeHandler<ImmutableNode> handler,
- Map<String, Object> interpolatedAttributes)
+ private boolean interpolateAttributes(final ImmutableNode node,
+ final NodeHandler<ImmutableNode> handler,
+ final Map<String, Object> interpolatedAttributes)
{
boolean attributeChanged = false;
- for (String attr : handler.getAttributes(node))
+ for (final String attr : handler.getAttributes(node))
{
- Object attrValue =
+ final Object attrValue =
interpolate(handler.getAttributeValue(node, attr));
if (valueChanged(attrValue,
handler.getAttributeValue(node, attr)))
@@ -1039,10 +1039,10 @@ public class BaseHierarchicalConfigurati
* @param handler the {@code NodeHandler}
* @return the map with interpolated attributes
*/
- private Map<String, Object> interpolateAttributes(ImmutableNode node,
- NodeHandler<ImmutableNode> handler)
+ private Map<String, Object> interpolateAttributes(final ImmutableNode node,
+ final NodeHandler<ImmutableNode> handler)
{
- Map<String, Object> attributes = new HashMap<>();
+ final Map<String, Object> attributes = new HashMap<>();
interpolateAttributes(node, handler, attributes);
return attributes;
}
@@ -1054,7 +1054,7 @@ public class BaseHierarchicalConfigurati
* @param value the original value
* @return a flag whether the value was changed
*/
- private boolean valueChanged(Object interpolatedValue, Object value)
+ private boolean valueChanged(final Object interpolatedValue, final Object value)
{
return ObjectUtils.notEqual(interpolatedValue, value);
}
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java Thu Sep 27 22:24:23 2018
@@ -229,7 +229,7 @@ public class CombinedConfiguration exten
* @param comb the node combiner (can be <b>null</b>, then a union combiner
* is used as default)
*/
- public CombinedConfiguration(NodeCombiner comb)
+ public CombinedConfiguration(final NodeCombiner comb)
{
nodeCombiner = (comb != null) ? comb : DEFAULT_COMBINER;
initChildCollections();
@@ -274,7 +274,7 @@ public class CombinedConfiguration exten
*
* @param nodeCombiner the node combiner
*/
- public void setNodeCombiner(NodeCombiner nodeCombiner)
+ public void setNodeCombiner(final NodeCombiner nodeCombiner)
{
if (nodeCombiner == null)
{
@@ -330,7 +330,7 @@ public class CombinedConfiguration exten
* @since 1.6
*/
public void setConversionExpressionEngine(
- ExpressionEngine conversionExpressionEngine)
+ final ExpressionEngine conversionExpressionEngine)
{
beginWrite(true);
try
@@ -359,8 +359,8 @@ public class CombinedConfiguration exten
* @param at the position of this configuration in the combined tree (can be
* <b>null</b>)
*/
- public void addConfiguration(Configuration config, String name,
- String at)
+ public void addConfiguration(final Configuration config, final String name,
+ final String at)
{
if (config == null)
{
@@ -379,7 +379,7 @@ public class CombinedConfiguration exten
+ "' already exists in this combined configuration!");
}
- ConfigData cd = new ConfigData(config, name, at);
+ final ConfigData cd = new ConfigData(config, name, at);
if (getLogger().isDebugEnabled())
{
getLogger()
@@ -409,7 +409,7 @@ public class CombinedConfiguration exten
* @param config the configuration to add (must not be <b>null</b>)
* @param name the name of this configuration (can be <b>null</b>)
*/
- public void addConfiguration(Configuration config, String name)
+ public void addConfiguration(final Configuration config, final String name)
{
addConfiguration(config, name, null);
}
@@ -421,7 +421,7 @@ public class CombinedConfiguration exten
*
* @param config the configuration to add (must not be <b>null</b>)
*/
- public void addConfiguration(Configuration config)
+ public void addConfiguration(final Configuration config)
{
addConfiguration(config, null, null);
}
@@ -453,12 +453,12 @@ public class CombinedConfiguration exten
* @param index the index
* @return the configuration at this index
*/
- public Configuration getConfiguration(int index)
+ public Configuration getConfiguration(final int index)
{
beginRead(true);
try
{
- ConfigData cd = configurations.get(index);
+ final ConfigData cd = configurations.get(index);
return cd.getConfiguration();
}
finally
@@ -474,7 +474,7 @@ public class CombinedConfiguration exten
* @param name the name of the configuration
* @return the configuration with this name
*/
- public Configuration getConfiguration(String name)
+ public Configuration getConfiguration(final String name)
{
beginRead(true);
try
@@ -497,9 +497,9 @@ public class CombinedConfiguration exten
beginRead(true);
try
{
- List<Configuration> list =
+ final List<Configuration> list =
new ArrayList<>(getNumberOfConfigurationsInternal());
- for (ConfigData cd : configurations)
+ for (final ConfigData cd : configurations)
{
list.add(cd.getConfiguration());
}
@@ -523,8 +523,8 @@ public class CombinedConfiguration exten
beginRead(true);
try
{
- List<String> list = new ArrayList<>(getNumberOfConfigurationsInternal());
- for (ConfigData cd : configurations)
+ final List<String> list = new ArrayList<>(getNumberOfConfigurationsInternal());
+ for (final ConfigData cd : configurations)
{
list.add(cd.getName());
}
@@ -542,7 +542,7 @@ public class CombinedConfiguration exten
* @param config the configuration to be removed
* @return a flag whether this configuration was found and could be removed
*/
- public boolean removeConfiguration(Configuration config)
+ public boolean removeConfiguration(final Configuration config)
{
for (int index = 0; index < getNumberOfConfigurations(); index++)
{
@@ -562,9 +562,9 @@ public class CombinedConfiguration exten
* @param index the index
* @return the removed configuration
*/
- public Configuration removeConfigurationAt(int index)
+ public Configuration removeConfigurationAt(final int index)
{
- ConfigData cd = configurations.remove(index);
+ final ConfigData cd = configurations.remove(index);
if (cd.getName() != null)
{
namedConfigurations.remove(cd.getName());
@@ -581,9 +581,9 @@ public class CombinedConfiguration exten
* @return the removed configuration (<b>null</b> if this configuration
* was not found)
*/
- public Configuration removeConfiguration(String name)
+ public Configuration removeConfiguration(final String name)
{
- Configuration conf = getConfiguration(name);
+ final Configuration conf = getConfiguration(name);
if (conf != null)
{
removeConfiguration(conf);
@@ -641,7 +641,7 @@ public class CombinedConfiguration exten
* @param event the update event
*/
@Override
- public void onEvent(ConfigurationEvent event)
+ public void onEvent(final ConfigurationEvent event)
{
if (event.isBeforeUpdate())
{
@@ -675,9 +675,9 @@ public class CombinedConfiguration exten
beginRead(false);
try
{
- CombinedConfiguration copy = (CombinedConfiguration) super.clone();
+ final CombinedConfiguration copy = (CombinedConfiguration) super.clone();
copy.initChildCollections();
- for (ConfigData cd : configurations)
+ for (final ConfigData cd : configurations)
{
copy.addConfiguration(ConfigurationUtils.cloneConfiguration(cd
.getConfiguration()), cd.getName(), cd.getAt());
@@ -714,20 +714,20 @@ public class CombinedConfiguration exten
* and the source cannot be determined, or if the key is <b>null</b>
* @since 1.5
*/
- public Configuration getSource(String key)
+ public Configuration getSource(final String key)
{
if (key == null)
{
throw new IllegalArgumentException("Key must not be null!");
}
- Set<Configuration> sources = getSources(key);
+ final Set<Configuration> sources = getSources(key);
if (sources.isEmpty())
{
return null;
}
- Iterator<Configuration> iterator = sources.iterator();
- Configuration source = iterator.next();
+ final Iterator<Configuration> iterator = sources.iterator();
+ final Configuration source = iterator.next();
if (iterator.hasNext())
{
throw new IllegalArgumentException("The key " + key
@@ -754,17 +754,17 @@ public class CombinedConfiguration exten
* @return a set with the configuration sources, which contain this property
* @since 2.0
*/
- public Set<Configuration> getSources(String key)
+ public Set<Configuration> getSources(final String key)
{
beginRead(false);
try
{
- List<QueryResult<ImmutableNode>> results = fetchNodeList(key);
- Set<Configuration> sources = new HashSet<>();
+ final List<QueryResult<ImmutableNode>> results = fetchNodeList(key);
+ final Set<Configuration> sources = new HashSet<>();
- for (QueryResult<ImmutableNode> result : results)
+ for (final QueryResult<ImmutableNode> result : results)
{
- Set<Configuration> resultSources =
+ final Set<Configuration> resultSources =
findSourceConfigurations(result.getNode());
if (resultSources.isEmpty())
{
@@ -790,7 +790,7 @@ public class CombinedConfiguration exten
* is available. If not, it is constructed by requesting a write lock.
*/
@Override
- protected void beginRead(boolean optimize)
+ protected void beginRead(final boolean optimize)
{
if (optimize)
{
@@ -822,7 +822,7 @@ public class CombinedConfiguration exten
* is available. If not, it is constructed now.
*/
@Override
- protected void beginWrite(boolean optimize)
+ protected void beginWrite(final boolean optimize)
{
super.beginWrite(true);
if (optimize)
@@ -840,7 +840,7 @@ public class CombinedConfiguration exten
upToDate = true;
}
}
- catch (RuntimeException rex)
+ catch (final RuntimeException rex)
{
endWrite();
throw rex;
@@ -896,7 +896,7 @@ public class CombinedConfiguration exten
}
return EMPTY_ROOT;
}
- Iterator<ConfigData> it = configurations.iterator();
+ final Iterator<ConfigData> it = configurations.iterator();
ImmutableNode node = it.next().getTransformedRoot();
while (it.hasNext())
{
@@ -905,8 +905,8 @@ public class CombinedConfiguration exten
}
if (getLogger().isDebugEnabled())
{
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- PrintStream stream = new PrintStream(os);
+ final ByteArrayOutputStream os = new ByteArrayOutputStream();
+ final PrintStream stream = new PrintStream(os);
TreeUtils.printTree(stream, node);
getLogger().debug(os.toString());
}
@@ -920,13 +920,13 @@ public class CombinedConfiguration exten
* @param node the node
* @return a set with the owning configurations
*/
- private Set<Configuration> findSourceConfigurations(ImmutableNode node)
+ private Set<Configuration> findSourceConfigurations(final ImmutableNode node)
{
- Set<Configuration> result = new HashSet<>();
- FindNodeVisitor<ImmutableNode> visitor =
+ final Set<Configuration> result = new HashSet<>();
+ final FindNodeVisitor<ImmutableNode> visitor =
new FindNodeVisitor<>(node);
- for (ConfigData cd : configurations)
+ for (final ConfigData cd : configurations)
{
NodeTreeWalker.INSTANCE.walkBFS(cd.getRootNode(), visitor,
getModel().getNodeHandler());
@@ -946,7 +946,7 @@ public class CombinedConfiguration exten
*
* @param configuration the child configuration
*/
- private void registerListenerAt(Configuration configuration)
+ private void registerListenerAt(final Configuration configuration)
{
if (configuration instanceof EventSource)
{
@@ -961,7 +961,7 @@ public class CombinedConfiguration exten
*
* @param configuration the child configuration
*/
- private void unregisterListenerAt(Configuration configuration)
+ private void unregisterListenerAt(final Configuration configuration)
{
if (configuration instanceof EventSource)
{
@@ -978,7 +978,7 @@ public class CombinedConfiguration exten
{
if (configurations != null)
{
- for (ConfigData child : configurations)
+ for (final ConfigData child : configurations)
{
unregisterListenerAt(child.getConfiguration());
}
@@ -1026,7 +1026,7 @@ public class CombinedConfiguration exten
* @param n the name
* @param at the at position
*/
- public ConfigData(Configuration config, String n, String at)
+ public ConfigData(final Configuration config, final String n, final String at)
{
configuration = config;
name = n;
@@ -1084,7 +1084,7 @@ public class CombinedConfiguration exten
*/
public ImmutableNode getTransformedRoot()
{
- ImmutableNode configRoot = getRootNodeOfConfiguration();
+ final ImmutableNode configRoot = getRootNodeOfConfiguration();
return (atPath == null) ? configRoot : prependAtPath(configRoot);
}
@@ -1094,10 +1094,10 @@ public class CombinedConfiguration exten
* @param node the root node of the represented configuration
* @return the new root node including the at path
*/
- private ImmutableNode prependAtPath(ImmutableNode node)
+ private ImmutableNode prependAtPath(final ImmutableNode node)
{
- ImmutableNode.Builder pathBuilder = new ImmutableNode.Builder();
- Iterator<String> pathIterator = atPath.iterator();
+ final ImmutableNode.Builder pathBuilder = new ImmutableNode.Builder();
+ final Iterator<String> pathIterator = atPath.iterator();
prependAtPathComponent(pathBuilder, pathIterator.next(),
pathIterator, node);
return new ImmutableNode.Builder(1).addChild(pathBuilder.create())
@@ -1114,14 +1114,14 @@ public class CombinedConfiguration exten
* @param components an iterator with all components of the at path
* @param orgRoot the original root node of the wrapped configuration
*/
- private void prependAtPathComponent(ImmutableNode.Builder builder,
- String currentComponent, Iterator<String> components,
- ImmutableNode orgRoot)
+ private void prependAtPathComponent(final ImmutableNode.Builder builder,
+ final String currentComponent, final Iterator<String> components,
+ final ImmutableNode orgRoot)
{
builder.name(currentComponent);
if (components.hasNext())
{
- ImmutableNode.Builder childBuilder =
+ final ImmutableNode.Builder childBuilder =
new ImmutableNode.Builder();
prependAtPathComponent(childBuilder, components.next(),
components, orgRoot);
@@ -1147,7 +1147,7 @@ public class CombinedConfiguration exten
getConfiguration().lock(LockMode.READ);
try
{
- ImmutableNode root =
+ final ImmutableNode root =
ConfigurationUtils
.convertToHierarchical(getConfiguration(),
conversionExpressionEngine).getNodeModel()
@@ -1167,15 +1167,15 @@ public class CombinedConfiguration exten
* @param at the at string
* @return a collection with the names of the single components
*/
- private Collection<String> parseAt(String at)
+ private Collection<String> parseAt(final String at)
{
if (at == null)
{
return null;
}
- Collection<String> result = new ArrayList<>();
- DefaultConfigurationKey.KeyIterator it = new DefaultConfigurationKey(
+ final Collection<String> result = new ArrayList<>();
+ final DefaultConfigurationKey.KeyIterator it = new DefaultConfigurationKey(
AT_ENGINE, at).iterator();
while (it.hasNext())
{
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java Thu Sep 27 22:24:23 2018
@@ -106,7 +106,7 @@ implements Cloneable
*
* @param inMemoryConfiguration the in memory configuration to use
*/
- public CompositeConfiguration(Configuration inMemoryConfiguration)
+ public CompositeConfiguration(final Configuration inMemoryConfiguration)
{
configList.clear();
this.inMemoryConfiguration = inMemoryConfiguration;
@@ -119,7 +119,7 @@ implements Cloneable
*
* @param configurations the collection of configurations to add
*/
- public CompositeConfiguration(Collection<? extends Configuration> configurations)
+ public CompositeConfiguration(final Collection<? extends Configuration> configurations)
{
this(new BaseConfiguration(), configurations);
}
@@ -132,14 +132,14 @@ implements Cloneable
* @param configurations the collection of configurations to add
* @see #CompositeConfiguration(Configuration)
*/
- public CompositeConfiguration(Configuration inMemoryConfiguration,
- Collection<? extends Configuration> configurations)
+ public CompositeConfiguration(final Configuration inMemoryConfiguration,
+ final Collection<? extends Configuration> configurations)
{
this(inMemoryConfiguration);
if (configurations != null)
{
- for (Configuration c : configurations)
+ for (final Configuration c : configurations)
{
addConfiguration(c);
}
@@ -151,7 +151,7 @@ implements Cloneable
*
* @param config the configuration to add
*/
- public void addConfiguration(Configuration config)
+ public void addConfiguration(final Configuration config)
{
addConfiguration(config, false);
}
@@ -171,7 +171,7 @@ implements Cloneable
* <em>in-memory</em> configuration, <b>false</b> otherwise
* @since 1.8
*/
- public void addConfiguration(Configuration config, boolean asInMemory)
+ public void addConfiguration(final Configuration config, final boolean asInMemory)
{
beginWrite(false);
try
@@ -219,7 +219,7 @@ implements Cloneable
* @param config the configuration to add
* @since 2.3
*/
- public void addConfigurationFirst(Configuration config)
+ public void addConfigurationFirst(final Configuration config)
{
addConfigurationFirst(config, false);
}
@@ -238,7 +238,7 @@ implements Cloneable
* <em>in-memory</em> configuration, <b>false</b> otherwise
* @since 2.3
*/
- public void addConfigurationFirst(Configuration config, boolean asInMemory)
+ public void addConfigurationFirst(final Configuration config, final boolean asInMemory)
{
beginWrite(false);
try
@@ -270,7 +270,7 @@ implements Cloneable
*
* @param config The configuration to remove
*/
- public void removeConfiguration(Configuration config)
+ public void removeConfiguration(final Configuration config)
{
beginWrite(false);
try
@@ -330,7 +330,7 @@ implements Cloneable
* @param token The Value to add.
*/
@Override
- protected void addPropertyDirect(String key, Object token)
+ protected void addPropertyDirect(final String key, final Object token)
{
inMemoryConfiguration.addProperty(key, token);
}
@@ -343,10 +343,10 @@ implements Cloneable
* @return object associated with the given configuration key.
*/
@Override
- protected Object getPropertyInternal(String key)
+ protected Object getPropertyInternal(final String key)
{
Configuration firstMatchingConfiguration = null;
- for (Configuration config : configList)
+ for (final Configuration config : configList)
{
if (config.containsKey(key))
{
@@ -365,10 +365,10 @@ implements Cloneable
@Override
protected Iterator<String> getKeysInternal()
{
- Set<String> keys = new LinkedHashSet<>();
- for (Configuration config : configList)
+ final Set<String> keys = new LinkedHashSet<>();
+ for (final Configuration config : configList)
{
- for (Iterator<String> it = config.getKeys(); it.hasNext();)
+ for (final Iterator<String> it = config.getKeys(); it.hasNext();)
{
keys.add(it.next());
}
@@ -378,12 +378,12 @@ implements Cloneable
}
@Override
- protected Iterator<String> getKeysInternal(String key)
+ protected Iterator<String> getKeysInternal(final String key)
{
- Set<String> keys = new LinkedHashSet<>();
- for (Configuration config : configList)
+ final Set<String> keys = new LinkedHashSet<>();
+ for (final Configuration config : configList)
{
- for (Iterator<String> it = config.getKeys(key); it.hasNext();)
+ for (final Iterator<String> it = config.getKeys(key); it.hasNext();)
{
keys.add(it.next());
}
@@ -395,7 +395,7 @@ implements Cloneable
@Override
protected boolean isEmptyInternal()
{
- for (Configuration config : configList)
+ for (final Configuration config : configList)
{
if (!config.isEmpty())
{
@@ -407,18 +407,18 @@ implements Cloneable
}
@Override
- protected void clearPropertyDirect(String key)
+ protected void clearPropertyDirect(final String key)
{
- for (Configuration config : configList)
+ for (final Configuration config : configList)
{
config.clearProperty(key);
}
}
@Override
- protected boolean containsKeyInternal(String key)
+ protected boolean containsKeyInternal(final String key)
{
- for (Configuration config : configList)
+ for (final Configuration config : configList)
{
if (config.containsKey(key))
{
@@ -429,15 +429,15 @@ implements Cloneable
}
@Override
- public List<Object> getList(String key, List<?> defaultValue)
+ public List<Object> getList(final String key, final List<?> defaultValue)
{
- List<Object> list = new ArrayList<>();
+ final List<Object> list = new ArrayList<>();
// add all elements from the first configuration containing the requested key
- Iterator<Configuration> it = configList.iterator();
+ final Iterator<Configuration> it = configList.iterator();
while (it.hasNext() && list.isEmpty())
{
- Configuration config = it.next();
+ final Configuration config = it.next();
if (config != inMemoryConfiguration && config.containsKey(key))
{
appendListProperty(list, config, key);
@@ -451,11 +451,12 @@ implements Cloneable
{
// This is okay because we just return this list to the caller
@SuppressWarnings("unchecked")
+ final
List<Object> resultList = (List<Object>) defaultValue;
return resultList;
}
- ListIterator<Object> lit = list.listIterator();
+ final ListIterator<Object> lit = list.listIterator();
while (lit.hasNext())
{
lit.set(interpolate(lit.next()));
@@ -465,12 +466,12 @@ implements Cloneable
}
@Override
- public String[] getStringArray(String key)
+ public String[] getStringArray(final String key)
{
- List<Object> list = getList(key);
+ final List<Object> list = getList(key);
// transform property values into strings
- String[] tokens = new String[list.size()];
+ final String[] tokens = new String[list.size()];
for (int i = 0; i < tokens.length; i++)
{
@@ -486,7 +487,7 @@ implements Cloneable
* @param index The index of the configuration to retrieve
* @return the configuration at this index
*/
- public Configuration getConfiguration(int index)
+ public Configuration getConfiguration(final int index)
{
beginRead(false);
try
@@ -533,14 +534,14 @@ implements Cloneable
{
try
{
- CompositeConfiguration copy = (CompositeConfiguration) super
+ final CompositeConfiguration copy = (CompositeConfiguration) super
.clone();
copy.configList = new LinkedList<>();
copy.inMemoryConfiguration = ConfigurationUtils
.cloneConfiguration(getInMemoryConfiguration());
copy.configList.add(copy.inMemoryConfiguration);
- for (Configuration config : configList)
+ for (final Configuration config : configList)
{
if (config != getInMemoryConfiguration())
{
@@ -552,7 +553,7 @@ implements Cloneable
copy.cloneInterpolator(this);
return copy;
}
- catch (CloneNotSupportedException cnex)
+ catch (final CloneNotSupportedException cnex)
{
// cannot happen
throw new ConfigurationRuntimeException(cnex);
@@ -565,7 +566,7 @@ implements Cloneable
*/
@Override
public void setListDelimiterHandler(
- ListDelimiterHandler listDelimiterHandler)
+ final ListDelimiterHandler listDelimiterHandler)
{
if (inMemoryConfiguration instanceof AbstractConfiguration)
{
@@ -598,7 +599,7 @@ implements Cloneable
* determined
* @since 1.5
*/
- public Configuration getSource(String key)
+ public Configuration getSource(final String key)
{
if (key == null)
{
@@ -606,7 +607,7 @@ implements Cloneable
}
Configuration source = null;
- for (Configuration conf : configList)
+ for (final Configuration conf : configList)
{
if (conf.containsKey(key))
{
@@ -627,7 +628,7 @@ implements Cloneable
*
* @param config the new in-memory configuration
*/
- private void replaceInMemoryConfiguration(Configuration config)
+ private void replaceInMemoryConfiguration(final Configuration config)
{
if (!inMemoryConfigIsChild)
{
@@ -646,15 +647,15 @@ implements Cloneable
* @param config the configuration to query
* @param key the key of the property
*/
- private void appendListProperty(List<Object> dest, Configuration config,
- String key)
+ private void appendListProperty(final List<Object> dest, final Configuration config,
+ final String key)
{
- Object value = interpolate(config.getProperty(key));
+ final Object value = interpolate(config.getProperty(key));
if (value != null)
{
if (value instanceof Collection)
{
- Collection<?> col = (Collection<?>) value;
+ final Collection<?> col = (Collection<?>) value;
dest.addAll(col);
}
else
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ConfigurationConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ConfigurationConverter.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ConfigurationConverter.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ConfigurationConverter.java Thu Sep 27 22:24:23 2018
@@ -51,7 +51,7 @@ public final class ConfigurationConverte
* @param props properties object to convert
* @return Configuration configuration created from the Properties
*/
- public static Configuration getConfiguration(Properties props)
+ public static Configuration getConfiguration(final Properties props)
{
return new MapConfiguration(props);
}
@@ -66,9 +66,9 @@ public final class ConfigurationConverte
* @return Properties created from the Configuration
* @since 2.2
*/
- public static Properties getProperties(ImmutableConfiguration config)
+ public static Properties getProperties(final ImmutableConfiguration config)
{
- Properties props = new Properties();
+ final Properties props = new Properties();
ListDelimiterHandler listHandler;
boolean useDelimiterHandler;
@@ -83,10 +83,10 @@ public final class ConfigurationConverte
useDelimiterHandler = false;
}
- for (Iterator<String> keys = config.getKeys(); keys.hasNext();)
+ for (final Iterator<String> keys = config.getKeys(); keys.hasNext();)
{
- String key = keys.next();
- List<Object> list = config.getList(key);
+ final String key = keys.next();
+ final List<Object> list = config.getList(key);
String propValue;
if (useDelimiterHandler)
@@ -97,7 +97,7 @@ public final class ConfigurationConverte
String.valueOf(listHandler.escapeList(list,
ListDelimiterHandler.NOOP_TRANSFORMER));
}
- catch (Exception ex)
+ catch (final Exception ex)
{
// obviously, the list handler does not support splitting
useDelimiterHandler = false;
@@ -125,7 +125,7 @@ public final class ConfigurationConverte
* @param config Configuration object to convert
* @return Properties created from the Configuration
*/
- public static Properties getProperties(Configuration config)
+ public static Properties getProperties(final Configuration config)
{
return getProperties((ImmutableConfiguration) config);
}
@@ -136,7 +136,7 @@ public final class ConfigurationConverte
* @param config Configuration object to convert
* @return Map created from the Configuration
*/
- public static Map<Object, Object> getMap(Configuration config)
+ public static Map<Object, Object> getMap(final Configuration config)
{
return new ConfigurationMap(config);
}
@@ -148,7 +148,7 @@ public final class ConfigurationConverte
* @param list the list
* @return the resulting string
*/
- private static String listToString(List<?> list)
+ private static String listToString(final List<?> list)
{
return StringUtils.join(list, DEFAULT_SEPARATOR);
}
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ConfigurationLookup.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ConfigurationLookup.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ConfigurationLookup.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ConfigurationLookup.java Thu Sep 27 22:24:23 2018
@@ -46,7 +46,7 @@ public class ConfigurationLookup impleme
* <b>null</b>)
* @throws IllegalArgumentException if the configuration is <b>null</b>
*/
- public ConfigurationLookup(ImmutableConfiguration config)
+ public ConfigurationLookup(final ImmutableConfiguration config)
{
if (config == null)
{
@@ -72,7 +72,7 @@ public class ConfigurationLookup impleme
* that this may be a complex object, e.g. a collection or an array.
*/
@Override
- public Object lookup(String variable)
+ public Object lookup(final String variable)
{
return getConfiguration().getProperty(variable);
}