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 2020/11/21 18:56:03 UTC

[commons-digester] branch master updated: Add missing '@Override' annotations.

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-digester.git


The following commit(s) were added to refs/heads/master by this push:
     new 2b98326  Add missing '@Override' annotations.
2b98326 is described below

commit 2b98326c215a7fcb1d760013fb76d5a2da31b6b2
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 13:55:58 2020 -0500

    Add missing '@Override' annotations.
---
 .../commons/digester3/AbstractObjectCreationFactory.java     |  3 +++
 .../java/org/apache/commons/digester3/AbstractRulesImpl.java |  5 +++++
 .../commons/digester3/DefaultThrowingErrorHandler.java       |  3 +++
 .../src/main/java/org/apache/commons/digester3/Digester.java |  6 ++++++
 .../java/org/apache/commons/digester3/ExtendedBaseRules.java |  1 +
 .../java/org/apache/commons/digester3/ObjectCreateRule.java  |  1 +
 .../org/apache/commons/digester3/PatternRuleMatcher.java     |  1 +
 .../main/java/org/apache/commons/digester3/RegexRules.java   |  3 +++
 .../main/java/org/apache/commons/digester3/RuleSetBase.java  |  1 +
 .../main/java/org/apache/commons/digester3/RulesBase.java    |  3 +++
 .../apache/commons/digester3/SetNestedPropertiesRule.java    |  8 ++++++++
 .../apache/commons/digester3/WithDefaultsRulesWrapper.java   |  8 ++++++++
 .../annotations/DefaultAnnotationHandlerFactory.java         |  1 +
 .../digester3/annotations/FromAnnotationsRuleModule.java     |  3 +++
 .../commons/digester3/annotations/WithMemoryRulesBinder.java |  5 +++++
 .../annotations/handlers/AbstractMethodHandler.java          |  1 +
 .../annotations/handlers/BeanPropertySetterHandler.java      |  1 +
 .../digester3/annotations/handlers/CallMethodHandler.java    |  1 +
 .../digester3/annotations/handlers/CallParamHandler.java     |  1 +
 .../digester3/annotations/handlers/FactoryCreateHandler.java |  1 +
 .../digester3/annotations/handlers/ObjectCreateHandler.java  |  1 +
 .../digester3/annotations/handlers/PathCallParamHandler.java |  1 +
 .../digester3/annotations/handlers/SetPropertiesHandler.java |  1 +
 .../digester3/annotations/handlers/SetTopHandler.java        |  1 +
 .../digester3/annotations/reflect/MethodArgument.java        |  4 ++++
 .../digester3/binder/AbstractBackToLinkedRuleBuilder.java    |  1 +
 .../apache/commons/digester3/binder/AbstractRulesModule.java |  1 +
 .../apache/commons/digester3/binder/BinderClassLoader.java   |  1 +
 .../apache/commons/digester3/binder/DefaultRulesBinder.java  |  5 +++++
 .../apache/commons/digester3/binder/FromBinderRuleSet.java   |  2 ++
 .../apache/commons/digester3/plugins/PluginCreateRule.java   |  1 +
 .../org/apache/commons/digester3/plugins/PluginRules.java    |  8 ++++++++
 .../digester3/substitution/MultiVariableExpander.java        |  1 +
 .../commons/digester3/substitution/VariableAttributes.java   | 12 ++++++++++++
 .../commons/digester3/xmlrules/NameSpaceURIRulesBinder.java  |  5 +++++
 .../commons/digester3/xmlrules/PrefixedRulesBinder.java      |  5 +++++
 .../commons/digester3/xmlrules/WithMemoryRulesBinder.java    |  5 +++++
 .../apache/commons/digester3/xmlrules/XmlRulesModule.java    |  1 +
 .../test/java/org/apache/commons/digester3/AlphaBean.java    |  2 ++
 .../src/test/java/org/apache/commons/digester3/BetaBean.java |  2 ++
 .../org/apache/commons/digester3/DTDValidationTestCase.java  |  3 +++
 .../java/org/apache/commons/digester3/DigesterTestCase.java  |  2 ++
 .../java/org/apache/commons/digester3/ErrorHandlerTest.java  |  6 ++++++
 .../apache/commons/digester3/LocationTrackerTestCase.java    |  2 ++
 .../apache/commons/digester3/NamespaceSnapshotTestCase.java  |  1 +
 .../src/test/java/org/apache/commons/digester3/TestRule.java |  1 +
 .../test/java/org/apache/commons/digester3/TestRuleSet.java  |  1 +
 .../java/org/apache/commons/digester3/XMLSchemaTestCase.java |  3 +++
 .../commons/digester3/annotations/catalog/AudioVisual.java   |  1 +
 .../apache/commons/digester3/annotations/catalog/Book.java   |  1 +
 .../failingtests/FailingDigesterLoaderHandlerFactory.java    |  1 +
 .../digester3/annotations/failingtests/FakeHandler.java      |  1 +
 .../commons/digester3/binder/BinderClassLoaderTestCase.java  |  1 +
 .../apache/commons/digester3/binder/Digester163TestCase.java |  1 +
 .../commons/digester3/binder/DigesterLoaderTestCase.java     |  7 +++++++
 55 files changed, 149 insertions(+)

diff --git a/core/src/main/java/org/apache/commons/digester3/AbstractObjectCreationFactory.java b/core/src/main/java/org/apache/commons/digester3/AbstractObjectCreationFactory.java
index a222cba..f903318 100644
--- a/core/src/main/java/org/apache/commons/digester3/AbstractObjectCreationFactory.java
+++ b/core/src/main/java/org/apache/commons/digester3/AbstractObjectCreationFactory.java
@@ -46,12 +46,14 @@ public abstract class AbstractObjectCreationFactory<T>
      * @return creates a new T instance
      * @throws Exception any exception thrown will be propagated upwards
      */
+    @Override
     public abstract T createObject( Attributes attributes )
         throws Exception;
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public Digester getDigester()
     {
         return ( this.digester );
@@ -60,6 +62,7 @@ public abstract class AbstractObjectCreationFactory<T>
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setDigester( final Digester digester )
     {
         this.digester = digester;
diff --git a/core/src/main/java/org/apache/commons/digester3/AbstractRulesImpl.java b/core/src/main/java/org/apache/commons/digester3/AbstractRulesImpl.java
index 1e70b59..1a19a16 100644
--- a/core/src/main/java/org/apache/commons/digester3/AbstractRulesImpl.java
+++ b/core/src/main/java/org/apache/commons/digester3/AbstractRulesImpl.java
@@ -51,6 +51,7 @@ public abstract class AbstractRulesImpl
     /**
      * {@inheritDoc}
      */
+    @Override
     public Digester getDigester()
     {
         return digester;
@@ -59,6 +60,7 @@ public abstract class AbstractRulesImpl
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setDigester( final Digester digester )
     {
         this.digester = digester;
@@ -67,6 +69,7 @@ public abstract class AbstractRulesImpl
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getNamespaceURI()
     {
         return namespaceURI;
@@ -75,6 +78,7 @@ public abstract class AbstractRulesImpl
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setNamespaceURI( final String namespaceURI )
     {
         this.namespaceURI = namespaceURI;
@@ -85,6 +89,7 @@ public abstract class AbstractRulesImpl
     /**
      * {@inheritDoc}
      */
+    @Override
     public final void add( final String pattern, final Rule rule )
     {
         // set up rule
diff --git a/core/src/main/java/org/apache/commons/digester3/DefaultThrowingErrorHandler.java b/core/src/main/java/org/apache/commons/digester3/DefaultThrowingErrorHandler.java
index 5dc6ec7..17f78a8 100644
--- a/core/src/main/java/org/apache/commons/digester3/DefaultThrowingErrorHandler.java
+++ b/core/src/main/java/org/apache/commons/digester3/DefaultThrowingErrorHandler.java
@@ -33,6 +33,7 @@ public class DefaultThrowingErrorHandler
     /**
      * {@inheritDoc}
      */
+    @Override
     public void warning( final SAXParseException e )
         throws SAXException
     {
@@ -42,6 +43,7 @@ public class DefaultThrowingErrorHandler
     /**
      * {@inheritDoc}
      */
+    @Override
     public void fatalError( final SAXParseException e )
         throws SAXException
     {
@@ -51,6 +53,7 @@ public class DefaultThrowingErrorHandler
     /**
      * {@inheritDoc}
      */
+    @Override
     public void error( final SAXParseException e )
         throws SAXException
     {
diff --git a/core/src/main/java/org/apache/commons/digester3/Digester.java b/core/src/main/java/org/apache/commons/digester3/Digester.java
index e89619a..83ea322 100644
--- a/core/src/main/java/org/apache/commons/digester3/Digester.java
+++ b/core/src/main/java/org/apache/commons/digester3/Digester.java
@@ -1595,6 +1595,7 @@ public class Digester
         return asyncParse( new Callable<T>()
         {
 
+            @Override
             public T call()
                 throws Exception
             {
@@ -1658,6 +1659,7 @@ public class Digester
         return asyncParse( new Callable<T>()
         {
 
+            @Override
             public T call()
                 throws Exception
             {
@@ -1702,6 +1704,7 @@ public class Digester
         return asyncParse( new Callable<T>()
         {
 
+            @Override
             public T call()
                 throws Exception
             {
@@ -1746,6 +1749,7 @@ public class Digester
         return asyncParse( new Callable<T>()
         {
 
+            @Override
             public T call()
                 throws Exception
             {
@@ -1790,6 +1794,7 @@ public class Digester
         return asyncParse( new Callable<T>()
         {
 
+            @Override
             public T call()
                 throws Exception
             {
@@ -1835,6 +1840,7 @@ public class Digester
         return asyncParse( new Callable<T>()
         {
 
+            @Override
             public T call()
                 throws Exception
             {
diff --git a/core/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java b/core/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java
index f1c6bba..eda4c67 100644
--- a/core/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java
+++ b/core/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java
@@ -447,6 +447,7 @@ public class ExtendedBaseRules
         Collections.sort( universalList, new Comparator<Rule>()
         {
 
+            @Override
             public int compare( final Rule r1, final Rule r2 )
             {
                 // Get the entry order from the map
diff --git a/core/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java b/core/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
index 1ea2b11..9226997 100644
--- a/core/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
+++ b/core/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
@@ -58,6 +58,7 @@ public class ObjectCreateRule
             this.constructorArgs = constructorArgs;
         }
 
+        @Override
         public Object intercept( final Object obj, final Method method, final Object[] args, final MethodProxy proxy )
             throws Throwable
         {
diff --git a/core/src/main/java/org/apache/commons/digester3/PatternRuleMatcher.java b/core/src/main/java/org/apache/commons/digester3/PatternRuleMatcher.java
index 9a1abf2..8836479 100644
--- a/core/src/main/java/org/apache/commons/digester3/PatternRuleMatcher.java
+++ b/core/src/main/java/org/apache/commons/digester3/PatternRuleMatcher.java
@@ -53,6 +53,7 @@ final class PatternRuleMatcher
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean match( final String namespace, final String pattern, final String name, final Attributes attributes )
     {
         if ( namespaceURI != null && !namespace.equals( namespaceURI ) )
diff --git a/core/src/main/java/org/apache/commons/digester3/RegexRules.java b/core/src/main/java/org/apache/commons/digester3/RegexRules.java
index d7ec183..dcc5409 100644
--- a/core/src/main/java/org/apache/commons/digester3/RegexRules.java
+++ b/core/src/main/java/org/apache/commons/digester3/RegexRules.java
@@ -100,6 +100,7 @@ public class RegexRules
     /**
      * {@inheritDoc}
      */
+    @Override
     public void clear()
     {
         registeredRules.clear();
@@ -108,6 +109,7 @@ public class RegexRules
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Rule> match( final String namespaceURI, final String pattern, final String name, final Attributes attributes )
     {
         //
@@ -132,6 +134,7 @@ public class RegexRules
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Rule> rules()
     {
         final ArrayList<Rule> rules = new ArrayList<Rule>( registeredRules.size() );
diff --git a/core/src/main/java/org/apache/commons/digester3/RuleSetBase.java b/core/src/main/java/org/apache/commons/digester3/RuleSetBase.java
index 9a44001..8f070ff 100644
--- a/core/src/main/java/org/apache/commons/digester3/RuleSetBase.java
+++ b/core/src/main/java/org/apache/commons/digester3/RuleSetBase.java
@@ -62,6 +62,7 @@ public abstract class RuleSetBase
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getNamespaceURI()
     {
         return ( this.namespaceURI );
diff --git a/core/src/main/java/org/apache/commons/digester3/RulesBase.java b/core/src/main/java/org/apache/commons/digester3/RulesBase.java
index 4dc0137..228d5e4 100644
--- a/core/src/main/java/org/apache/commons/digester3/RulesBase.java
+++ b/core/src/main/java/org/apache/commons/digester3/RulesBase.java
@@ -118,6 +118,7 @@ public class RulesBase
     /**
      * {@inheritDoc}
      */
+    @Override
     public void clear()
     {
         wildcardCache.clear();
@@ -128,6 +129,7 @@ public class RulesBase
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Rule> match( final String namespaceURI, final String pattern, final String name, final Attributes attributes )
     {
         // List rulesList = (List) this.cache.get(pattern);
@@ -159,6 +161,7 @@ public class RulesBase
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Rule> rules()
     {
         return ( this.rules );
diff --git a/core/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java b/core/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java
index d337af5..dde68d9 100644
--- a/core/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java
+++ b/core/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java
@@ -344,32 +344,39 @@ public class SetNestedPropertiesRule
             rules.add( rule );
         }
 
+        @Override
         public Digester getDigester()
         {
             return null;
         }
 
+        @Override
         public void setDigester( final Digester digester )
         {
         }
 
+        @Override
         public String getNamespaceURI()
         {
             return null;
         }
 
+        @Override
         public void setNamespaceURI( final String namespaceURI )
         {
         }
 
+        @Override
         public void add( final String pattern, final Rule rule )
         {
         }
 
+        @Override
         public void clear()
         {
         }
 
+        @Override
         public List<Rule> match( final String namespaceURI, final String matchPath, final String name, final Attributes attributes )
         {
             final List<Rule> match = decoratedRules.match( namespaceURI, matchPath, name, attributes );
@@ -403,6 +410,7 @@ public class SetNestedPropertiesRule
             return match;
         }
 
+        @Override
         public List<Rule> rules()
         {
             // This is not actually expected to be called during normal
diff --git a/core/src/main/java/org/apache/commons/digester3/WithDefaultsRulesWrapper.java b/core/src/main/java/org/apache/commons/digester3/WithDefaultsRulesWrapper.java
index 21384e6..de9d3e5 100644
--- a/core/src/main/java/org/apache/commons/digester3/WithDefaultsRulesWrapper.java
+++ b/core/src/main/java/org/apache/commons/digester3/WithDefaultsRulesWrapper.java
@@ -91,6 +91,7 @@ public class WithDefaultsRulesWrapper
     /**
      * {@inheritDoc}
      */
+    @Override
     public Digester getDigester()
     {
         return wrappedRules.getDigester();
@@ -99,6 +100,7 @@ public class WithDefaultsRulesWrapper
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setDigester( final Digester digester )
     {
         wrappedRules.setDigester( digester );
@@ -111,6 +113,7 @@ public class WithDefaultsRulesWrapper
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getNamespaceURI()
     {
         return wrappedRules.getNamespaceURI();
@@ -119,6 +122,7 @@ public class WithDefaultsRulesWrapper
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setNamespaceURI( final String namespaceURI )
     {
         wrappedRules.setNamespaceURI( namespaceURI );
@@ -139,6 +143,7 @@ public class WithDefaultsRulesWrapper
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Rule> match( final String namespaceURI, final String pattern, final String name, final Attributes attributes )
     {
         final List<Rule> matches = wrappedRules.match( namespaceURI, pattern, name, attributes );
@@ -176,6 +181,7 @@ public class WithDefaultsRulesWrapper
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Rule> rules()
     {
         return allRules;
@@ -184,6 +190,7 @@ public class WithDefaultsRulesWrapper
     /**
      * {@inheritDoc}
      */
+    @Override
     public void clear()
     {
         wrappedRules.clear();
@@ -194,6 +201,7 @@ public class WithDefaultsRulesWrapper
     /**
      * {@inheritDoc}
      */
+    @Override
     public void add( final String pattern, final Rule rule )
     {
         wrappedRules.add( pattern, rule );
diff --git a/core/src/main/java/org/apache/commons/digester3/annotations/DefaultAnnotationHandlerFactory.java b/core/src/main/java/org/apache/commons/digester3/annotations/DefaultAnnotationHandlerFactory.java
index db51d73..8a15c73 100644
--- a/core/src/main/java/org/apache/commons/digester3/annotations/DefaultAnnotationHandlerFactory.java
+++ b/core/src/main/java/org/apache/commons/digester3/annotations/DefaultAnnotationHandlerFactory.java
@@ -34,6 +34,7 @@ final class DefaultAnnotationHandlerFactory
     /**
      * {@inheritDoc}
      */
+    @Override
     public <L extends AnnotationHandler<? extends Annotation, ? extends AnnotatedElement>> L newInstance( final Class<L> type )
         throws Exception
     {
diff --git a/core/src/main/java/org/apache/commons/digester3/annotations/FromAnnotationsRuleModule.java b/core/src/main/java/org/apache/commons/digester3/annotations/FromAnnotationsRuleModule.java
index db09ad9..91fe94b 100644
--- a/core/src/main/java/org/apache/commons/digester3/annotations/FromAnnotationsRuleModule.java
+++ b/core/src/main/java/org/apache/commons/digester3/annotations/FromAnnotationsRuleModule.java
@@ -123,6 +123,7 @@ public abstract class FromAnnotationsRuleModule
             // CONSTRUCTOR
             visitElements( new PrivilegedAction<Constructor<?>[]>()
             {
+                @Override
                 public Constructor<?>[] run()
                 {
                     return type.getDeclaredConstructors();
@@ -132,6 +133,7 @@ public abstract class FromAnnotationsRuleModule
             // FIELD
             visitElements( new PrivilegedAction<Field[]>()
             {
+                @Override
                 public Field[] run()
                 {
                     return type.getDeclaredFields();
@@ -142,6 +144,7 @@ public abstract class FromAnnotationsRuleModule
         // METHOD
         visitElements( new PrivilegedAction<Method[]>()
         {
+            @Override
             public Method[] run()
             {
                 return type.getDeclaredMethods();
diff --git a/core/src/main/java/org/apache/commons/digester3/annotations/WithMemoryRulesBinder.java b/core/src/main/java/org/apache/commons/digester3/annotations/WithMemoryRulesBinder.java
index 4266a2b..8368b23 100644
--- a/core/src/main/java/org/apache/commons/digester3/annotations/WithMemoryRulesBinder.java
+++ b/core/src/main/java/org/apache/commons/digester3/annotations/WithMemoryRulesBinder.java
@@ -51,6 +51,7 @@ final class WithMemoryRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public ClassLoader getContextClassLoader()
     {
         return wrappedRulesBinder.getContextClassLoader();
@@ -59,6 +60,7 @@ final class WithMemoryRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addError( final String messagePattern, final Object... arguments )
     {
         wrappedRulesBinder.addError( messagePattern, arguments );
@@ -67,6 +69,7 @@ final class WithMemoryRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addError( final Throwable t )
     {
         wrappedRulesBinder.addError( t );
@@ -75,6 +78,7 @@ final class WithMemoryRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public void install( final RulesModule rulesModule )
     {
         wrappedRulesBinder.install( rulesModule );
@@ -83,6 +87,7 @@ final class WithMemoryRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public LinkedRuleBuilder forPattern( final String pattern )
     {
         return wrappedRulesBinder.forPattern( pattern );
diff --git a/core/src/main/java/org/apache/commons/digester3/annotations/handlers/AbstractMethodHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/AbstractMethodHandler.java
index 8bde8d6..d7c9b81 100644
--- a/core/src/main/java/org/apache/commons/digester3/annotations/handlers/AbstractMethodHandler.java
+++ b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/AbstractMethodHandler.java
@@ -56,6 +56,7 @@ abstract class AbstractMethodHandler<A extends Annotation> implements Annotation
     /**
      * {@inheritDoc}
      */
+    @Override
     public void handle( final A annotation, final Method element, final RulesBinder rulesBinder )
     {
         if ( SUPPORTED_ARGS != element.getParameterTypes().length )
diff --git a/core/src/main/java/org/apache/commons/digester3/annotations/handlers/BeanPropertySetterHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/BeanPropertySetterHandler.java
index f50fb2d..263924f 100644
--- a/core/src/main/java/org/apache/commons/digester3/annotations/handlers/BeanPropertySetterHandler.java
+++ b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/BeanPropertySetterHandler.java
@@ -37,6 +37,7 @@ public final class BeanPropertySetterHandler
     /**
      * {@inheritDoc}
      */
+    @Override
     public void handle( final BeanPropertySetter annotation, final Field element, final RulesBinder rulesBinder )
     {
         rulesBinder.forPattern( annotation.pattern() )
diff --git a/core/src/main/java/org/apache/commons/digester3/annotations/handlers/CallMethodHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/CallMethodHandler.java
index 45b317d..b1512b0 100644
--- a/core/src/main/java/org/apache/commons/digester3/annotations/handlers/CallMethodHandler.java
+++ b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/CallMethodHandler.java
@@ -38,6 +38,7 @@ public class CallMethodHandler
     /**
      * {@inheritDoc}
      */
+    @Override
     public void handle( final CallMethod annotation, final Method element, final RulesBinder rulesBinder )
     {
         final CallMethodBuilder callMethodBuilder = rulesBinder
diff --git a/core/src/main/java/org/apache/commons/digester3/annotations/handlers/CallParamHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/CallParamHandler.java
index 33380ac..ff3a46e 100644
--- a/core/src/main/java/org/apache/commons/digester3/annotations/handlers/CallParamHandler.java
+++ b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/CallParamHandler.java
@@ -37,6 +37,7 @@ public final class CallParamHandler
     /**
      * {@inheritDoc}
      */
+    @Override
     public void handle( final CallParam annotation, final MethodArgument element, final RulesBinder rulesBinder )
     {
         final CallParamBuilder builder = rulesBinder
diff --git a/core/src/main/java/org/apache/commons/digester3/annotations/handlers/FactoryCreateHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/FactoryCreateHandler.java
index 6765717..b1b514d 100644
--- a/core/src/main/java/org/apache/commons/digester3/annotations/handlers/FactoryCreateHandler.java
+++ b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/FactoryCreateHandler.java
@@ -36,6 +36,7 @@ public final class FactoryCreateHandler
     /**
      * {@inheritDoc}
      */
+    @Override
     public void handle( final FactoryCreate annotation, final Class<?> element, final RulesBinder rulesBinder )
     {
         final FactoryCreateBuilder builder = rulesBinder.forPattern( annotation.pattern() )
diff --git a/core/src/main/java/org/apache/commons/digester3/annotations/handlers/ObjectCreateHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/ObjectCreateHandler.java
index 9fb7c4d..dcc356b 100644
--- a/core/src/main/java/org/apache/commons/digester3/annotations/handlers/ObjectCreateHandler.java
+++ b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/ObjectCreateHandler.java
@@ -39,6 +39,7 @@ public final class ObjectCreateHandler
     /**
      * {@inheritDoc}
      */
+    @Override
     public void handle( final ObjectCreate annotation, final AnnotatedElement element, final RulesBinder rulesBinder )
     {
         Class<?> type = null;
diff --git a/core/src/main/java/org/apache/commons/digester3/annotations/handlers/PathCallParamHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/PathCallParamHandler.java
index 354a6ab..ba59896 100644
--- a/core/src/main/java/org/apache/commons/digester3/annotations/handlers/PathCallParamHandler.java
+++ b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/PathCallParamHandler.java
@@ -36,6 +36,7 @@ public final class PathCallParamHandler
     /**
      * {@inheritDoc}
      */
+    @Override
     public void handle( final PathCallParam annotation, final MethodArgument element, final RulesBinder rulesBinder )
     {
         rulesBinder
diff --git a/core/src/main/java/org/apache/commons/digester3/annotations/handlers/SetPropertiesHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/SetPropertiesHandler.java
index c2c89b8..23c60ce 100644
--- a/core/src/main/java/org/apache/commons/digester3/annotations/handlers/SetPropertiesHandler.java
+++ b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/SetPropertiesHandler.java
@@ -38,6 +38,7 @@ public final class SetPropertiesHandler
     /**
      * {@inheritDoc}
      */
+    @Override
     public void handle( final SetProperty annotation, final Field element, final RulesBinder rulesBinder )
     {
         final SetPropertiesBuilder builder = rulesBinder
diff --git a/core/src/main/java/org/apache/commons/digester3/annotations/handlers/SetTopHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/SetTopHandler.java
index 4561f89..f25308e 100644
--- a/core/src/main/java/org/apache/commons/digester3/annotations/handlers/SetTopHandler.java
+++ b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/SetTopHandler.java
@@ -37,6 +37,7 @@ public final class SetTopHandler
     /**
      * {@inheritDoc}
      */
+    @Override
     public void handle( final SetTop annotation, final Method element, final RulesBinder rulesBinder )
     {
         if ( element.getParameterTypes().length != 1 )
diff --git a/core/src/main/java/org/apache/commons/digester3/annotations/reflect/MethodArgument.java b/core/src/main/java/org/apache/commons/digester3/annotations/reflect/MethodArgument.java
index 2d8a9c4..b2547ba 100644
--- a/core/src/main/java/org/apache/commons/digester3/annotations/reflect/MethodArgument.java
+++ b/core/src/main/java/org/apache/commons/digester3/annotations/reflect/MethodArgument.java
@@ -96,6 +96,7 @@ public final class MethodArgument
     /**
      * {@inheritDoc}
      */
+    @Override
     public <T extends Annotation> T getAnnotation( final Class<T> annotationType )
     {
         for ( final Annotation annotation : this.annotations )
@@ -111,6 +112,7 @@ public final class MethodArgument
     /**
      * {@inheritDoc}
      */
+    @Override
     public Annotation[] getAnnotations()
     {
         return this.getAnnotationsArrayCopy();
@@ -119,6 +121,7 @@ public final class MethodArgument
     /**
      * {@inheritDoc}
      */
+    @Override
     public Annotation[] getDeclaredAnnotations()
     {
         return this.getAnnotationsArrayCopy();
@@ -139,6 +142,7 @@ public final class MethodArgument
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isAnnotationPresent( final Class<? extends Annotation> annotationType )
     {
         for ( final Annotation annotation : this.annotations )
diff --git a/core/src/main/java/org/apache/commons/digester3/binder/AbstractBackToLinkedRuleBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/AbstractBackToLinkedRuleBuilder.java
index bb8b654..c3011ab 100644
--- a/core/src/main/java/org/apache/commons/digester3/binder/AbstractBackToLinkedRuleBuilder.java
+++ b/core/src/main/java/org/apache/commons/digester3/binder/AbstractBackToLinkedRuleBuilder.java
@@ -70,6 +70,7 @@ abstract class AbstractBackToLinkedRuleBuilder<R extends Rule>
     /**
      * {@inheritDoc}
      */
+    @Override
     public final R get()
     {
         final R rule = this.createRule();
diff --git a/core/src/main/java/org/apache/commons/digester3/binder/AbstractRulesModule.java b/core/src/main/java/org/apache/commons/digester3/binder/AbstractRulesModule.java
index c809bf8..0569847 100644
--- a/core/src/main/java/org/apache/commons/digester3/binder/AbstractRulesModule.java
+++ b/core/src/main/java/org/apache/commons/digester3/binder/AbstractRulesModule.java
@@ -33,6 +33,7 @@ public abstract class AbstractRulesModule
     /**
      * {@inheritDoc}
      */
+    @Override
     public final void configure( final RulesBinder rulesBinder )
     {
         if ( this.rulesBinder != null )
diff --git a/core/src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java b/core/src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java
index 09150c9..2dae538 100644
--- a/core/src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java
+++ b/core/src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java
@@ -52,6 +52,7 @@ final class BinderClassLoader
         final PrivilegedAction<BinderClassLoader> action = new PrivilegedAction<BinderClassLoader>()
         {
 
+            @Override
             public BinderClassLoader run()
             {
                 return new BinderClassLoader( adaptedClassLoader );
diff --git a/core/src/main/java/org/apache/commons/digester3/binder/DefaultRulesBinder.java b/core/src/main/java/org/apache/commons/digester3/binder/DefaultRulesBinder.java
index 655fec2..4fe419c 100644
--- a/core/src/main/java/org/apache/commons/digester3/binder/DefaultRulesBinder.java
+++ b/core/src/main/java/org/apache/commons/digester3/binder/DefaultRulesBinder.java
@@ -65,6 +65,7 @@ final class DefaultRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public ClassLoader getContextClassLoader()
     {
         return this.classLoader;
@@ -73,6 +74,7 @@ final class DefaultRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addError( String messagePattern, final Object... arguments )
     {
         final StackTraceElement[] stackTrace = new Exception().getStackTrace();
@@ -121,6 +123,7 @@ final class DefaultRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addError( final Throwable t )
     {
         final String message = "An exception was caught and reported. Message: " + t.getMessage();
@@ -141,6 +144,7 @@ final class DefaultRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public void install( final RulesModule rulesModule )
     {
         rulesModule.configure( this );
@@ -149,6 +153,7 @@ final class DefaultRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public LinkedRuleBuilder forPattern( final String pattern )
     {
         final String keyPattern;
diff --git a/core/src/main/java/org/apache/commons/digester3/binder/FromBinderRuleSet.java b/core/src/main/java/org/apache/commons/digester3/binder/FromBinderRuleSet.java
index 00f7f7e..e031319 100644
--- a/core/src/main/java/org/apache/commons/digester3/binder/FromBinderRuleSet.java
+++ b/core/src/main/java/org/apache/commons/digester3/binder/FromBinderRuleSet.java
@@ -125,6 +125,7 @@ final class FromBinderRuleSet
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addRuleInstances( final Digester digester )
     {
         for ( final AbstractBackToLinkedRuleBuilder<? extends Rule> provider : providers )
@@ -136,6 +137,7 @@ final class FromBinderRuleSet
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getNamespaceURI()
     {
         return null;
diff --git a/core/src/main/java/org/apache/commons/digester3/plugins/PluginCreateRule.java b/core/src/main/java/org/apache/commons/digester3/plugins/PluginCreateRule.java
index ff47ec0..ff26757 100644
--- a/core/src/main/java/org/apache/commons/digester3/plugins/PluginCreateRule.java
+++ b/core/src/main/java/org/apache/commons/digester3/plugins/PluginCreateRule.java
@@ -160,6 +160,7 @@ public class PluginCreateRule
     /**
      * {@inheritDoc}
      */
+    @Override
     public void postRegisterInit( final String matchPattern )
     {
         final Log log = LogUtils.getLogger( getDigester() );
diff --git a/core/src/main/java/org/apache/commons/digester3/plugins/PluginRules.java b/core/src/main/java/org/apache/commons/digester3/plugins/PluginRules.java
index 2788b30..fd0dadf 100644
--- a/core/src/main/java/org/apache/commons/digester3/plugins/PluginRules.java
+++ b/core/src/main/java/org/apache/commons/digester3/plugins/PluginRules.java
@@ -163,6 +163,7 @@ public class PluginRules
      *
      * @return the Digester instance with which this instance is associated.
      */
+    @Override
     public Digester getDigester()
     {
         return digester;
@@ -173,6 +174,7 @@ public class PluginRules
      * 
      * @param digester The newly associated Digester instance
      */
+    @Override
     public void setDigester( final Digester digester )
     {
         this.digester = digester;
@@ -184,6 +186,7 @@ public class PluginRules
      *
      * @return the namespace URI that will be applied to all subsequently added <code>Rule</code> objects.
      */
+    @Override
     public String getNamespaceURI()
     {
         return decoratedRules.getNamespaceURI();
@@ -195,6 +198,7 @@ public class PluginRules
      * @param namespaceURI Namespace URI that must match on all subsequently added rules, or <code>null</code> for
      *            matching regardless of the current namespace URI
      */
+    @Override
     public void setNamespaceURI( final String namespaceURI )
     {
         decoratedRules.setNamespaceURI( namespaceURI );
@@ -271,6 +275,7 @@ public class PluginRules
      * 
      * @return list of all Rule objects known to this Rules instance.
      */
+    @Override
     public List<Rule> rules()
     {
         return decoratedRules.rules();
@@ -283,6 +288,7 @@ public class PluginRules
      *            with and without a leading slash ('/').
      * @param rule Rule instance to be registered
      */
+    @Override
     public void add( String pattern, final Rule rule )
     {
         final Log log = LogUtils.getLogger( digester );
@@ -349,6 +355,7 @@ public class PluginRules
     /**
      * Clear all rules.
      */
+    @Override
     public void clear()
     {
         decoratedRules.clear();
@@ -357,6 +364,7 @@ public class PluginRules
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Rule> match( final String namespaceURI, final String path, final String name, final Attributes attributes )
     {
         final Log log = LogUtils.getLogger( digester );
diff --git a/core/src/main/java/org/apache/commons/digester3/substitution/MultiVariableExpander.java b/core/src/main/java/org/apache/commons/digester3/substitution/MultiVariableExpander.java
index ded2ef6..23e10aa 100644
--- a/core/src/main/java/org/apache/commons/digester3/substitution/MultiVariableExpander.java
+++ b/core/src/main/java/org/apache/commons/digester3/substitution/MultiVariableExpander.java
@@ -55,6 +55,7 @@ public class MultiVariableExpander
     /**
      * {@inheritDoc}
      */
+    @Override
     public String expand( String param )
     {
         for ( int i = 0; i < nEntries; ++i )
diff --git a/core/src/main/java/org/apache/commons/digester3/substitution/VariableAttributes.java b/core/src/main/java/org/apache/commons/digester3/substitution/VariableAttributes.java
index e05a699..d0bb200 100644
--- a/core/src/main/java/org/apache/commons/digester3/substitution/VariableAttributes.java
+++ b/core/src/main/java/org/apache/commons/digester3/substitution/VariableAttributes.java
@@ -62,6 +62,7 @@ public class VariableAttributes
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getValue( final int index )
     {
         if ( index >= values.size() )
@@ -99,6 +100,7 @@ public class VariableAttributes
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getValue( final String qname )
     {
         final int index = attrs.getIndex( qname );
@@ -112,6 +114,7 @@ public class VariableAttributes
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getValue( final String uri, final String localname )
     {
         final int index = attrs.getIndex( uri, localname );
@@ -126,6 +129,7 @@ public class VariableAttributes
     /**
      * {@inheritDoc}
      */
+    @Override
     public int getIndex( final String qname )
     {
         return attrs.getIndex( qname );
@@ -134,6 +138,7 @@ public class VariableAttributes
     /**
      * {@inheritDoc}
      */
+    @Override
     public int getIndex( final String uri, final String localpart )
     {
         return attrs.getIndex( uri, localpart );
@@ -142,6 +147,7 @@ public class VariableAttributes
     /**
      * {@inheritDoc}
      */
+    @Override
     public int getLength()
     {
         return attrs.getLength();
@@ -150,6 +156,7 @@ public class VariableAttributes
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getLocalName( final int index )
     {
         return attrs.getLocalName( index );
@@ -158,6 +165,7 @@ public class VariableAttributes
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getQName( final int index )
     {
         return attrs.getQName( index );
@@ -166,6 +174,7 @@ public class VariableAttributes
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getType( final int index )
     {
         return attrs.getType( index );
@@ -174,6 +183,7 @@ public class VariableAttributes
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getType( final String qname )
     {
         return attrs.getType( qname );
@@ -182,6 +192,7 @@ public class VariableAttributes
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getType( final String uri, final String localname )
     {
         return attrs.getType( uri, localname );
@@ -190,6 +201,7 @@ public class VariableAttributes
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getURI( final int index )
     {
         return attrs.getURI( index );
diff --git a/core/src/main/java/org/apache/commons/digester3/xmlrules/NameSpaceURIRulesBinder.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/NameSpaceURIRulesBinder.java
index 7a4bf3d..852bf9e 100644
--- a/core/src/main/java/org/apache/commons/digester3/xmlrules/NameSpaceURIRulesBinder.java
+++ b/core/src/main/java/org/apache/commons/digester3/xmlrules/NameSpaceURIRulesBinder.java
@@ -62,6 +62,7 @@ final class NameSpaceURIRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public ClassLoader getContextClassLoader()
     {
         return wrappedBinder.getContextClassLoader();
@@ -70,6 +71,7 @@ final class NameSpaceURIRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addError( final String messagePattern, final Object... arguments )
     {
         wrappedBinder.addError( messagePattern, arguments );
@@ -78,6 +80,7 @@ final class NameSpaceURIRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addError( final Throwable t )
     {
         wrappedBinder.addError( t );
@@ -86,6 +89,7 @@ final class NameSpaceURIRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public void install( final RulesModule rulesModule )
     {
         wrappedBinder.install( rulesModule );
@@ -94,6 +98,7 @@ final class NameSpaceURIRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public LinkedRuleBuilder forPattern( final String pattern )
     {
         return wrappedBinder.forPattern( pattern ).withNamespaceURI( namespaceURIs.peek() );
diff --git a/core/src/main/java/org/apache/commons/digester3/xmlrules/PrefixedRulesBinder.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/PrefixedRulesBinder.java
index c8d3f5a..b49a9a6 100644
--- a/core/src/main/java/org/apache/commons/digester3/xmlrules/PrefixedRulesBinder.java
+++ b/core/src/main/java/org/apache/commons/digester3/xmlrules/PrefixedRulesBinder.java
@@ -40,6 +40,7 @@ final class PrefixedRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public ClassLoader getContextClassLoader()
     {
         return this.wrappedRulesBinder.getContextClassLoader();
@@ -48,6 +49,7 @@ final class PrefixedRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addError( final String messagePattern, final Object... arguments )
     {
         this.wrappedRulesBinder.addError( messagePattern, arguments );
@@ -56,6 +58,7 @@ final class PrefixedRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addError( final Throwable t )
     {
         this.wrappedRulesBinder.addError( t );
@@ -64,6 +67,7 @@ final class PrefixedRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public void install( final RulesModule rulesModule )
     {
         this.wrappedRulesBinder.install( rulesModule );
@@ -72,6 +76,7 @@ final class PrefixedRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public LinkedRuleBuilder forPattern( String pattern )
     {
         if ( this.prefix != null && this.prefix.length() > 0 )
diff --git a/core/src/main/java/org/apache/commons/digester3/xmlrules/WithMemoryRulesBinder.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/WithMemoryRulesBinder.java
index 2c8197c..e703623 100644
--- a/core/src/main/java/org/apache/commons/digester3/xmlrules/WithMemoryRulesBinder.java
+++ b/core/src/main/java/org/apache/commons/digester3/xmlrules/WithMemoryRulesBinder.java
@@ -55,6 +55,7 @@ class WithMemoryRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public ClassLoader getContextClassLoader()
     {
         return this.wrappedRulesBinder.getContextClassLoader();
@@ -63,6 +64,7 @@ class WithMemoryRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addError( final String messagePattern, final Object... arguments )
     {
         this.wrappedRulesBinder.addError( messagePattern, arguments );
@@ -71,6 +73,7 @@ class WithMemoryRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addError( final Throwable t )
     {
         this.wrappedRulesBinder.addError( t );
@@ -79,6 +82,7 @@ class WithMemoryRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public void install( final RulesModule rulesModule )
     {
         this.wrappedRulesBinder.install( rulesModule );
@@ -87,6 +91,7 @@ class WithMemoryRulesBinder
     /**
      * {@inheritDoc}
      */
+    @Override
     public LinkedRuleBuilder forPattern( final String pattern )
     {
         return this.wrappedRulesBinder.forPattern( pattern );
diff --git a/core/src/main/java/org/apache/commons/digester3/xmlrules/XmlRulesModule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/XmlRulesModule.java
index 8a40e8e..8c4387a 100644
--- a/core/src/main/java/org/apache/commons/digester3/xmlrules/XmlRulesModule.java
+++ b/core/src/main/java/org/apache/commons/digester3/xmlrules/XmlRulesModule.java
@@ -51,6 +51,7 @@ final class XmlRulesModule
     /**
      * {@inheritDoc}
      */
+    @Override
     public void configure( final RulesBinder rulesBinder )
     {
         if ( rulesBinder instanceof WithMemoryRulesBinder )
diff --git a/core/src/test/java/org/apache/commons/digester3/AlphaBean.java b/core/src/test/java/org/apache/commons/digester3/AlphaBean.java
index 72e0960..3e731d4 100644
--- a/core/src/test/java/org/apache/commons/digester3/AlphaBean.java
+++ b/core/src/test/java/org/apache/commons/digester3/AlphaBean.java
@@ -36,11 +36,13 @@ public class AlphaBean
         setName( name );
     }
 
+    @Override
     public String getName()
     {
         return name;
     }
 
+    @Override
     public void setName( final String name )
     {
         this.name = name;
diff --git a/core/src/test/java/org/apache/commons/digester3/BetaBean.java b/core/src/test/java/org/apache/commons/digester3/BetaBean.java
index 608a38c..d049a15 100644
--- a/core/src/test/java/org/apache/commons/digester3/BetaBean.java
+++ b/core/src/test/java/org/apache/commons/digester3/BetaBean.java
@@ -31,11 +31,13 @@ public class BetaBean
     {
     }
 
+    @Override
     public String getName()
     {
         return name;
     }
 
+    @Override
     public void setName( final String name )
     {
         this.name = name;
diff --git a/core/src/test/java/org/apache/commons/digester3/DTDValidationTestCase.java b/core/src/test/java/org/apache/commons/digester3/DTDValidationTestCase.java
index 1a61a7e..be3d3e7 100644
--- a/core/src/test/java/org/apache/commons/digester3/DTDValidationTestCase.java
+++ b/core/src/test/java/org/apache/commons/digester3/DTDValidationTestCase.java
@@ -51,18 +51,21 @@ public class DTDValidationTestCase
         .setErrorHandler( new ErrorHandler()
         {
 
+            @Override
             public void warning( final SAXParseException e )
                 throws SAXException
             {
                 throw e;
             }
 
+            @Override
             public void fatalError( final SAXParseException e )
                 throws SAXException
             {
                 throw e;
             }
 
+            @Override
             public void error( final SAXParseException e )
                 throws SAXException
             {
diff --git a/core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java b/core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java
index d708d5b..dfa39ce 100644
--- a/core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java
+++ b/core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java
@@ -618,6 +618,7 @@ public class DigesterTestCase
     {
         public ArrayList<String> events = new ArrayList<String>();
 
+        @Override
         public Object onPush( final Digester d, final String stackName, final Object o )
         {
             final String msg = "push:" + stackName + ":" + o.toString();
@@ -631,6 +632,7 @@ public class DigesterTestCase
             return o;
         }
 
+        @Override
         public Object onPop( final Digester d, final String stackName, final Object o )
         {
             final String msg = "pop:" + stackName + ":" + o.toString();
diff --git a/core/src/test/java/org/apache/commons/digester3/ErrorHandlerTest.java b/core/src/test/java/org/apache/commons/digester3/ErrorHandlerTest.java
index 30a2a10..75a5d35 100644
--- a/core/src/test/java/org/apache/commons/digester3/ErrorHandlerTest.java
+++ b/core/src/test/java/org/apache/commons/digester3/ErrorHandlerTest.java
@@ -71,18 +71,21 @@ public class ErrorHandlerTest
         {
             Log log = LogFactory.getLog( this.getClass() );
 
+            @Override
             public void warning( final SAXParseException arg0 )
                 throws SAXException
             {
                 log.warn( "Custom Warn Handler" );
             }
 
+            @Override
             public void fatalError( final SAXParseException e )
                 throws SAXException
             {
                 log.fatal( "Custom Fatal Error Handler", e );
             }
 
+            @Override
             public void error( final SAXParseException e )
                 throws SAXException
             {
@@ -123,18 +126,21 @@ public class ErrorHandlerTest
         {
             Log log = LogFactory.getLog( this.getClass() );
 
+            @Override
             public void warning( final SAXParseException arg0 )
                 throws SAXException
             {
                 log.warn( "Custom Warn Handler" );
             }
 
+            @Override
             public void fatalError( final SAXParseException e )
                 throws SAXException
             {
                 log.fatal( "Custom Fatal Error Handler" );
             }
 
+            @Override
             public void error( final SAXParseException e )
                 throws SAXException
             {
diff --git a/core/src/test/java/org/apache/commons/digester3/LocationTrackerTestCase.java b/core/src/test/java/org/apache/commons/digester3/LocationTrackerTestCase.java
index 7eb0ab0..c58f14b 100644
--- a/core/src/test/java/org/apache/commons/digester3/LocationTrackerTestCase.java
+++ b/core/src/test/java/org/apache/commons/digester3/LocationTrackerTestCase.java
@@ -46,6 +46,7 @@ public class LocationTrackerTestCase
     {
         public Map<Object, String> locations = new HashMap<Object, String>();
 
+        @Override
         public <T> T onPush( final Digester d, final String stackName, final T o )
         {
             if ( stackName == null )
@@ -63,6 +64,7 @@ public class LocationTrackerTestCase
             return o;
         }
 
+        @Override
         public <T> T onPop( final Digester d, final String stackName, final T o )
         {
             return o;
diff --git a/core/src/test/java/org/apache/commons/digester3/NamespaceSnapshotTestCase.java b/core/src/test/java/org/apache/commons/digester3/NamespaceSnapshotTestCase.java
index 0b96144..7d2e850 100644
--- a/core/src/test/java/org/apache/commons/digester3/NamespaceSnapshotTestCase.java
+++ b/core/src/test/java/org/apache/commons/digester3/NamespaceSnapshotTestCase.java
@@ -61,6 +61,7 @@ public class NamespaceSnapshotTestCase
             /**
              * {@inheritDoc}
              */
+            @Override
             public NamespaceSnapshotRule get()
             {
                 return new NamespaceSnapshotRule();
diff --git a/core/src/test/java/org/apache/commons/digester3/TestRule.java b/core/src/test/java/org/apache/commons/digester3/TestRule.java
index 4b6fc61..2747f0e 100644
--- a/core/src/test/java/org/apache/commons/digester3/TestRule.java
+++ b/core/src/test/java/org/apache/commons/digester3/TestRule.java
@@ -179,6 +179,7 @@ public class TestRule
             this.callOrder = callOrder;
         }
 
+        @Override
         public TestRule get()
         {
             final TestRule testRule = new TestRule( identifier );
diff --git a/core/src/test/java/org/apache/commons/digester3/TestRuleSet.java b/core/src/test/java/org/apache/commons/digester3/TestRuleSet.java
index a9f1fef..d43800c 100644
--- a/core/src/test/java/org/apache/commons/digester3/TestRuleSet.java
+++ b/core/src/test/java/org/apache/commons/digester3/TestRuleSet.java
@@ -88,6 +88,7 @@ public class TestRuleSet
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addRuleInstances( final Digester digester )
     {
 
diff --git a/core/src/test/java/org/apache/commons/digester3/XMLSchemaTestCase.java b/core/src/test/java/org/apache/commons/digester3/XMLSchemaTestCase.java
index fb3ed1b..54e114c 100644
--- a/core/src/test/java/org/apache/commons/digester3/XMLSchemaTestCase.java
+++ b/core/src/test/java/org/apache/commons/digester3/XMLSchemaTestCase.java
@@ -162,16 +162,19 @@ public class XMLSchemaTestCase
         {
         }
 
+        @Override
         public void error( final SAXParseException exception )
         {
             clean = false;
         }
 
+        @Override
         public void fatalError( final SAXParseException exception )
         {
             clean = false;
         }
 
+        @Override
         public void warning( final SAXParseException exception )
         {
             clean = false;
diff --git a/core/src/test/java/org/apache/commons/digester3/annotations/catalog/AudioVisual.java b/core/src/test/java/org/apache/commons/digester3/annotations/catalog/AudioVisual.java
index 076ca46..66f1b02 100644
--- a/core/src/test/java/org/apache/commons/digester3/annotations/catalog/AudioVisual.java
+++ b/core/src/test/java/org/apache/commons/digester3/annotations/catalog/AudioVisual.java
@@ -138,6 +138,7 @@ public final class AudioVisual
         return true;
     }
 
+    @Override
     public void print()
     {
         System.out.println( this.toString() );
diff --git a/core/src/test/java/org/apache/commons/digester3/annotations/catalog/Book.java b/core/src/test/java/org/apache/commons/digester3/annotations/catalog/Book.java
index 691c17d..e2098f2 100644
--- a/core/src/test/java/org/apache/commons/digester3/annotations/catalog/Book.java
+++ b/core/src/test/java/org/apache/commons/digester3/annotations/catalog/Book.java
@@ -137,6 +137,7 @@ public final class Book
         return "Book [author=" + author + ", desc=" + desc + ", isbn=" + isbn + ", title=" + title + "]";
     }
 
+    @Override
     public void print()
     {
         System.out.println( this.toString() );
diff --git a/core/src/test/java/org/apache/commons/digester3/annotations/failingtests/FailingDigesterLoaderHandlerFactory.java b/core/src/test/java/org/apache/commons/digester3/annotations/failingtests/FailingDigesterLoaderHandlerFactory.java
index 4a64a20..853bc0a 100644
--- a/core/src/test/java/org/apache/commons/digester3/annotations/failingtests/FailingDigesterLoaderHandlerFactory.java
+++ b/core/src/test/java/org/apache/commons/digester3/annotations/failingtests/FailingDigesterLoaderHandlerFactory.java
@@ -28,6 +28,7 @@ public class FailingDigesterLoaderHandlerFactory
     implements AnnotationHandlerFactory
 {
 
+    @Override
     public <H extends AnnotationHandler<? extends Annotation, ? extends AnnotatedElement>> H newInstance( final Class<H> type )
         throws Exception
     {
diff --git a/core/src/test/java/org/apache/commons/digester3/annotations/failingtests/FakeHandler.java b/core/src/test/java/org/apache/commons/digester3/annotations/failingtests/FakeHandler.java
index 3aed02f..38ddc59 100644
--- a/core/src/test/java/org/apache/commons/digester3/annotations/failingtests/FakeHandler.java
+++ b/core/src/test/java/org/apache/commons/digester3/annotations/failingtests/FakeHandler.java
@@ -27,6 +27,7 @@ public final class FakeHandler
     implements AnnotationHandler<Annotation, AnnotatedElement>
 {
 
+    @Override
     public void handle( final Annotation annotation, final AnnotatedElement element, final RulesBinder rulesBinder )
     {
         // do nothing
diff --git a/core/src/test/java/org/apache/commons/digester3/binder/BinderClassLoaderTestCase.java b/core/src/test/java/org/apache/commons/digester3/binder/BinderClassLoaderTestCase.java
index 8c3ccf7..22792a2 100644
--- a/core/src/test/java/org/apache/commons/digester3/binder/BinderClassLoaderTestCase.java
+++ b/core/src/test/java/org/apache/commons/digester3/binder/BinderClassLoaderTestCase.java
@@ -255,6 +255,7 @@ public final class BinderClassLoaderTestCase
         private static class InMemoryURLStreamHandlerFactory
             implements URLStreamHandlerFactory
         {
+            @Override
             public URLStreamHandler createURLStreamHandler( final String protocol )
             {
                 return new URLStreamHandler()
diff --git a/core/src/test/java/org/apache/commons/digester3/binder/Digester163TestCase.java b/core/src/test/java/org/apache/commons/digester3/binder/Digester163TestCase.java
index 1c298eb..651ee00 100644
--- a/core/src/test/java/org/apache/commons/digester3/binder/Digester163TestCase.java
+++ b/core/src/test/java/org/apache/commons/digester3/binder/Digester163TestCase.java
@@ -86,6 +86,7 @@ public class Digester163TestCase
         {
             executor.submit( new Runnable()
             {
+                @Override
                 public void run()
                 {
                     try
diff --git a/core/src/test/java/org/apache/commons/digester3/binder/DigesterLoaderTestCase.java b/core/src/test/java/org/apache/commons/digester3/binder/DigesterLoaderTestCase.java
index 1605055..354bf74 100644
--- a/core/src/test/java/org/apache/commons/digester3/binder/DigesterLoaderTestCase.java
+++ b/core/src/test/java/org/apache/commons/digester3/binder/DigesterLoaderTestCase.java
@@ -41,18 +41,21 @@ public final class DigesterLoaderTestCase
         final ErrorHandler expected = new ErrorHandler()
         {
 
+            @Override
             public void warning( final SAXParseException exception )
                 throws SAXException
             {
                 // do nothing
             }
 
+            @Override
             public void fatalError( final SAXParseException exception )
                 throws SAXException
             {
                 // do nothing
             }
 
+            @Override
             public void error( final SAXParseException exception )
                 throws SAXException
             {
@@ -83,24 +86,28 @@ public final class DigesterLoaderTestCase
         final Locator expected = new Locator()
         {
 
+            @Override
             public String getSystemId()
             {
                 // just fake method
                 return null;
             }
 
+            @Override
             public String getPublicId()
             {
                 // just fake method
                 return null;
             }
 
+            @Override
             public int getLineNumber()
             {
                 // just fake method
                 return 0;
             }
 
+            @Override
             public int getColumnNumber()
             {
                 // just fake method