Author: ggregory
Date: Thu Dec 3 07:11:03 2015
New Revision: 1717717
URL: http://svn.apache.org/viewvc?rev=1717717&view=rev
Log:
Add missing '@Override' annotations.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModelSupport.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeHandler.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeModel.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/TreeData.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorBase.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeTreeWalker.java
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=1717717&r1=1717716&r2=1717717&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 Dec 3 07:11:03 2015
@@ -226,6 +226,7 @@ public class BaseHierarchicalConfigurati
* @throws ConfigurationRuntimeException if the key does not select a
single
* node
*/
+ @Override
public HierarchicalConfiguration<ImmutableNode> configurationAt(String key,
boolean supportUpdates)
{
@@ -405,6 +406,7 @@ public class BaseHierarchicalConfigurati
* by delegating to {@code configurationAt()}. Then an immutable wrapper
* is created and returned.
*/
+ @Override
public ImmutableHierarchicalConfiguration immutableConfigurationAt(
String key, boolean supportUpdates)
{
@@ -417,6 +419,7 @@ public class BaseHierarchicalConfigurati
* <b>false</b>)}.
* @throws ConfigurationRuntimeException if the key does not select a
single node
*/
+ @Override
public HierarchicalConfiguration<ImmutableNode> configurationAt(String key)
{
return configurationAt(key, false);
@@ -428,6 +431,7 @@ public class BaseHierarchicalConfigurati
* is created and returned.
* @throws ConfigurationRuntimeException if the key does not select a
single node
*/
+ @Override
public ImmutableHierarchicalConfiguration immutableConfigurationAt(
String key)
{
@@ -439,6 +443,7 @@ public class BaseHierarchicalConfigurati
* {@inheritDoc} This implementation creates sub configurations in the same
* way as described for {@link #configurationAt(String)}.
*/
+ @Override
public List<HierarchicalConfiguration<ImmutableNode>> configurationsAt(
String key)
{
@@ -470,6 +475,7 @@ public class BaseHierarchicalConfigurati
* {@inheritDoc} This implementation creates tracked nodes for the
specified
* key. Then sub configurations for these nodes are created and returned.
*/
+ @Override
public List<HierarchicalConfiguration<ImmutableNode>> configurationsAt(
String key, boolean supportUpdates)
{
@@ -500,6 +506,7 @@ public class BaseHierarchicalConfigurati
* {@code SubnodeConfiguration} objects. Then for each element of this list
* an unmodifiable wrapper is created.
*/
+ @Override
public List<ImmutableHierarchicalConfiguration> immutableConfigurationsAt(
String key)
{
@@ -511,6 +518,7 @@ public class BaseHierarchicalConfigurati
* given key. If not a single node is selected, an empty list is returned.
* Otherwise, sub configurations for each child of the node are created.
*/
+ @Override
public List<HierarchicalConfiguration<ImmutableNode>>
childConfigurationsAt(
String key)
{
@@ -548,6 +556,7 @@ public class BaseHierarchicalConfigurati
* of the {@code supportUpdates} flag, connected sub configurations may be
* created.
*/
+ @Override
public List<HierarchicalConfiguration<ImmutableNode>>
childConfigurationsAt(
String key, boolean supportUpdates)
{
@@ -567,6 +576,7 @@ public class BaseHierarchicalConfigurati
* configurations. Then a list with immutable wrapper configurations is
* created.
*/
+ @Override
public List<ImmutableHierarchicalConfiguration>
immutableChildConfigurationsAt(
String key)
{
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java?rev=1717717&r1=1717716&r2=1717717&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java
Thu Dec 3 07:11:03 2015
@@ -58,6 +58,7 @@ public abstract class AbstractListDelimi
* primitive objects.</li>
* </ul>
*/
+ @Override
public Iterable<?> parse(Object value)
{
return flatten(value);
@@ -68,6 +69,7 @@ public abstract class AbstractListDelimi
* string is <b>null</b>. In this case, an empty collection is returned.
* Otherwise, this method delegates to {@link #splitString(String,
boolean)}.
*/
+ @Override
public Collection<String> split(String s, boolean trim)
{
if (s == null)
@@ -83,6 +85,7 @@ public abstract class AbstractListDelimi
* otherwise no escaping is performed. Eventually, the passed in
transformer
* is invoked so that additional encoding can be performed.
*/
+ @Override
public Object escape(Object value, ValueTransformer transformer)
{
Object escValue =
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModelSupport.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModelSupport.java?rev=1717717&r1=1717716&r2=1717717&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModelSupport.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModelSupport.java
Thu Dec 3 07:11:03 2015
@@ -37,5 +37,6 @@ public interface InMemoryNodeModelSuppor
* {@inheritDoc} This variant specializes the return type to
* {@code InMemoryNodeModel}.
*/
+ @Override
InMemoryNodeModel getNodeModel();
}
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeHandler.java?rev=1717717&r1=1717716&r2=1717717&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeHandler.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeHandler.java
Thu Dec 3 07:11:03 2015
@@ -76,6 +76,7 @@ class TrackedNodeHandler extends Abstrac
* {@inheritDoc} This implementation delegates to the handler with the
* parent mapping.
*/
+ @Override
public ImmutableNode getParent(ImmutableNode node)
{
return getParentHandler().getParent(node);
@@ -85,6 +86,7 @@ class TrackedNodeHandler extends Abstrac
* {@inheritDoc} This implementation returns the root node passed at
* construction time.
*/
+ @Override
public ImmutableNode getRootNode()
{
return rootNode;
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeModel.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeModel.java?rev=1717717&r1=1717716&r2=1717717&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeModel.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeModel.java
Thu Dec 3 07:11:03 2015
@@ -164,40 +164,47 @@ public class TrackedNodeModel implements
return releaseTrackedNodeOnFinalize;
}
+ @Override
public void setRootNode(ImmutableNode newRoot)
{
getParentModel().replaceTrackedNode(getSelector(), newRoot);
}
+ @Override
public NodeHandler<ImmutableNode> getNodeHandler()
{
return getParentModel().getTrackedNodeHandler(getSelector());
}
+ @Override
public void addProperty(String key, Iterable<?> values,
NodeKeyResolver<ImmutableNode> resolver)
{
getParentModel().addProperty(key, getSelector(), values, resolver);
}
+ @Override
public void addNodes(String key, Collection<? extends ImmutableNode> nodes,
NodeKeyResolver<ImmutableNode> resolver)
{
getParentModel().addNodes(key, getSelector(), nodes, resolver);
}
+ @Override
public void setProperty(String key, Object value,
NodeKeyResolver<ImmutableNode> resolver)
{
getParentModel().setProperty(key, getSelector(), value, resolver);
}
+ @Override
public List<QueryResult<ImmutableNode>> clearTree(String key,
NodeKeyResolver<ImmutableNode> resolver)
{
return getParentModel().clearTree(key, getSelector(), resolver);
}
+ @Override
public void clearProperty(String key,
NodeKeyResolver<ImmutableNode> resolver)
{
@@ -211,6 +218,7 @@ public class TrackedNodeModel implements
*
* @param resolver
*/
+ @Override
public void clear(NodeKeyResolver<ImmutableNode> resolver)
{
getParentModel().clearTree(null, getSelector(), resolver);
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/TreeData.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/TreeData.java?rev=1717717&r1=1717716&r2=1717717&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/TreeData.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/TreeData.java
Thu Dec 3 07:11:03 2015
@@ -76,6 +76,7 @@ class TreeData extends AbstractImmutable
referenceTracker = refTracker;
}
+ @Override
public ImmutableNode getRootNode()
{
return root;
@@ -110,6 +111,7 @@ class TreeData extends AbstractImmutable
* @return the parent node for this node
* @throws IllegalArgumentException if the node cannot be resolved
*/
+ @Override
public ImmutableNode getParent(ImmutableNode node)
{
if (node == getRootNode())
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorBase.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorBase.java?rev=1717717&r1=1717716&r2=1717717&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorBase.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorBase.java
Thu Dec 3 07:11:03 2015
@@ -75,6 +75,7 @@ abstract class ConfigurationNodeIterator
*
* @return the position
*/
+ @Override
public int getPosition()
{
return position;
@@ -86,6 +87,7 @@ abstract class ConfigurationNodeIterator
* @param pos the new position
* @return a flag if this is a valid position
*/
+ @Override
public boolean setPosition(int pos)
{
position = pos;
@@ -97,6 +99,7 @@ abstract class ConfigurationNodeIterator
*
* @return the current pointer in this iteration
*/
+ @Override
public NodePointer getNodePointer()
{
if (getPosition() < 1 && !setPosition(1))
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java?rev=1717717&r1=1717716&r2=1717717&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java
Thu Dec 3 07:11:03 2015
@@ -444,6 +444,7 @@ public class TestSubnodeConfiguration
ConfigurationInterpolator interpolator = parent.getInterpolator();
interpolator.registerLookup("brackets", new Lookup() {
+ @Override
public String lookup(String key) {
return "(" + key + ")";
}
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.java?rev=1717717&r1=1717716&r2=1717717&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.java
Thu Dec 3 07:11:03 2015
@@ -379,6 +379,7 @@ public class NodeStructureHelper
(NodeHandler<ImmutableNode>) EasyMock
.anyObject(NoHandler.class)))
.andAnswer(new IAnswer<List<QueryResult<ImmutableNode>>>() {
+ @Override
public List<QueryResult<ImmutableNode>> answer()
throws Throwable {
ImmutableNode root =
@@ -407,6 +408,7 @@ public class NodeStructureHelper
EasyMock.anyString(),
EasyMock.anyObject(TreeData.class)))
.andAnswer(new IAnswer<NodeAddData<ImmutableNode>>() {
+ @Override
public NodeAddData<ImmutableNode> answer() throws
Throwable {
ImmutableNode root =
(ImmutableNode)
EasyMock.getCurrentArguments()[0];
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java?rev=1717717&r1=1717716&r2=1717717&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java
Thu Dec 3 07:11:03 2015
@@ -606,6 +606,7 @@ public class TestInMemoryNodeModel
EasyMock.eq(KEY),
EasyMock.anyObject(TreeData.class))).andAnswer(
new IAnswer<NodeAddData<ImmutableNode>>() {
+ @Override
public NodeAddData<ImmutableNode> answer()
throws Throwable {
assertSame("Wrong root node", model.getRootNode(),
@@ -648,6 +649,7 @@ public class TestInMemoryNodeModel
EasyMock.eq(KEY), EasyMock.anyObject(TreeData.class)))
.andAnswer(new IAnswer<NodeAddData<ImmutableNode>>()
{
+ @Override
public NodeAddData<ImmutableNode> answer() throws Throwable
{
ImmutableNode addParent =
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.java?rev=1717717&r1=1717716&r2=1717717&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.java
Thu Dec 3 07:11:03 2015
@@ -550,6 +550,7 @@ public class TestInMemoryNodeModelTracke
EasyMock.anyString(), EasyMock.anyObject(),
EasyMock.anyObject(TreeData.class)))
.andAnswer(new IAnswer<NodeUpdateData<ImmutableNode>>() {
+ @Override
public NodeUpdateData<ImmutableNode> answer()
throws Throwable {
ImmutableNode root =
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeTreeWalker.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeTreeWalker.java?rev=1717717&r1=1717716&r2=1717717&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeTreeWalker.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeTreeWalker.java
Thu Dec 3 07:11:03 2015
@@ -291,18 +291,21 @@ public class TestNodeTreeWalker
this.maxNodeCount = maxNodeCount;
}
+ @Override
public void visitBeforeChildren(ImmutableNode node,
NodeHandler<ImmutableNode> handler)
{
visitedNodes.add(handler.nodeName(node));
}
+ @Override
public void visitAfterChildren(ImmutableNode node,
NodeHandler<ImmutableNode> handler)
{
visitedNodes.add(visitAfterName(handler.nodeName(node)));
}
+ @Override
public boolean terminate()
{
return visitedNodes.size() >= getMaxNodeCount();
