diff --git a/src/main/java/net/sf/ezmorph/MorphException.java b/src/main/java/net/sf/ezmorph/MorphException.java
index 9b4f0d6..195fe02 100644
--- a/src/main/java/net/sf/ezmorph/MorphException.java
+++ b/src/main/java/net/sf/ezmorph/MorphException.java
@@ -73,6 +73,7 @@ public MorphException(Throwable cause) {
      *
      * @return a Throwable that represents the cause of this exception
      */
+    @Override
     public Throwable getCause() {
         return this.cause;
     }
diff --git a/src/main/java/net/sf/ezmorph/array/AbstractArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/AbstractArrayMorpher.java
index cd8cf4a..fe77476 100644
--- a/src/main/java/net/sf/ezmorph/array/AbstractArrayMorpher.java
+++ b/src/main/java/net/sf/ezmorph/array/AbstractArrayMorpher.java
@@ -51,6 +51,7 @@ public void setUseDefault(boolean useDefault) {
         this.useDefault = useDefault;
     }
 
+    @Override
     public boolean supports(Class clazz) {
         return clazz.isArray();
     }
diff --git a/src/main/java/net/sf/ezmorph/array/BooleanArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/BooleanArrayMorpher.java
index dcac1f7..dd192ad 100644
--- a/src/main/java/net/sf/ezmorph/array/BooleanArrayMorpher.java
+++ b/src/main/java/net/sf/ezmorph/array/BooleanArrayMorpher.java
@@ -43,6 +43,7 @@ public BooleanArrayMorpher(boolean defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -71,6 +72,7 @@ public boolean getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -79,6 +81,7 @@ public int hashCode() {
         return builder.toHashCode();
     }
 
+    @Override
     public Object morph(Object array) {
         if (array == null) {
             return null;
@@ -110,6 +113,7 @@ public Object morph(Object array) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return BOOLEAN_ARRAY_CLASS;
     }
diff --git a/src/main/java/net/sf/ezmorph/array/BooleanObjectArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/BooleanObjectArrayMorpher.java
index 273d75e..3e58262 100644
--- a/src/main/java/net/sf/ezmorph/array/BooleanObjectArrayMorpher.java
+++ b/src/main/java/net/sf/ezmorph/array/BooleanObjectArrayMorpher.java
@@ -43,6 +43,7 @@ public BooleanObjectArrayMorpher(Boolean defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -71,6 +72,7 @@ public Boolean getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -79,6 +81,7 @@ public int hashCode() {
         return builder.toHashCode();
     }
 
+    @Override
     public Object morph(Object array) {
         if (array == null) {
             return null;
@@ -122,6 +125,7 @@ public Object morph(Object array) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return BOOLEAN_OBJECT_ARRAY_CLASS;
     }
diff --git a/src/main/java/net/sf/ezmorph/array/ByteArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/ByteArrayMorpher.java
index 959612d..4655245 100644
--- a/src/main/java/net/sf/ezmorph/array/ByteArrayMorpher.java
+++ b/src/main/java/net/sf/ezmorph/array/ByteArrayMorpher.java
@@ -43,6 +43,7 @@ public ByteArrayMorpher(byte defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -71,6 +72,7 @@ public byte getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -79,6 +81,7 @@ public int hashCode() {
         return builder.toHashCode();
     }
 
+    @Override
     public Object morph(Object array) {
         if (array == null) {
             return null;
@@ -110,6 +113,7 @@ public Object morph(Object array) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return BYTE_ARRAY_CLASS;
     }
diff --git a/src/main/java/net/sf/ezmorph/array/CharArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/CharArrayMorpher.java
index 72aafb2..04d4032 100644
--- a/src/main/java/net/sf/ezmorph/array/CharArrayMorpher.java
+++ b/src/main/java/net/sf/ezmorph/array/CharArrayMorpher.java
@@ -43,6 +43,7 @@ public CharArrayMorpher(char defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -74,6 +75,7 @@ public char getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -82,6 +84,7 @@ public int hashCode() {
         return builder.toHashCode();
     }
 
+    @Override
     public Object morph(Object array) {
         if (array == null) {
             return null;
@@ -113,6 +116,7 @@ public Object morph(Object array) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return CHAR_ARRAY_CLASS;
     }
diff --git a/src/main/java/net/sf/ezmorph/array/CharacterObjectArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/CharacterObjectArrayMorpher.java
index 14eae4e..fd3c7b1 100644
--- a/src/main/java/net/sf/ezmorph/array/CharacterObjectArrayMorpher.java
+++ b/src/main/java/net/sf/ezmorph/array/CharacterObjectArrayMorpher.java
@@ -43,6 +43,7 @@ public CharacterObjectArrayMorpher(Character defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -71,6 +72,7 @@ public Character getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -79,6 +81,7 @@ public int hashCode() {
         return builder.toHashCode();
     }
 
+    @Override
     public Object morph(Object array) {
         if (array == null) {
             return null;
@@ -122,6 +125,7 @@ public Object morph(Object array) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return CHARACTER_OBJECT_ARRAY_CLASS;
     }
diff --git a/src/main/java/net/sf/ezmorph/array/DoubleArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/DoubleArrayMorpher.java
index 7c12dbb..a9cd4a5 100644
--- a/src/main/java/net/sf/ezmorph/array/DoubleArrayMorpher.java
+++ b/src/main/java/net/sf/ezmorph/array/DoubleArrayMorpher.java
@@ -43,6 +43,7 @@ public DoubleArrayMorpher(double defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -74,6 +75,7 @@ public double getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -82,6 +84,7 @@ public int hashCode() {
         return builder.toHashCode();
     }
 
+    @Override
     public Object morph(Object array) {
         if (array == null) {
             return null;
@@ -113,6 +116,7 @@ public Object morph(Object array) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return DOUBLE_ARRAY_CLASS;
     }
diff --git a/src/main/java/net/sf/ezmorph/array/FloatArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/FloatArrayMorpher.java
index b194d5e..d9cd4d1 100644
--- a/src/main/java/net/sf/ezmorph/array/FloatArrayMorpher.java
+++ b/src/main/java/net/sf/ezmorph/array/FloatArrayMorpher.java
@@ -43,6 +43,7 @@ public FloatArrayMorpher(float defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -74,6 +75,7 @@ public float getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -82,6 +84,7 @@ public int hashCode() {
         return builder.toHashCode();
     }
 
+    @Override
     public Object morph(Object array) {
         if (array == null) {
             return null;
@@ -113,6 +116,7 @@ public Object morph(Object array) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return FLOAT_ARRAY_CLASS;
     }
diff --git a/src/main/java/net/sf/ezmorph/array/IntArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/IntArrayMorpher.java
index 1503ec9..cf6f8a3 100644
--- a/src/main/java/net/sf/ezmorph/array/IntArrayMorpher.java
+++ b/src/main/java/net/sf/ezmorph/array/IntArrayMorpher.java
@@ -43,6 +43,7 @@ public IntArrayMorpher(int defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -74,6 +75,7 @@ public int getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -82,6 +84,7 @@ public int hashCode() {
         return builder.toHashCode();
     }
 
+    @Override
     public Object morph(Object array) {
         if (array == null) {
             return null;
@@ -113,6 +116,7 @@ public Object morph(Object array) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return INT_ARRAY_CLASS;
     }
diff --git a/src/main/java/net/sf/ezmorph/array/LongArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/LongArrayMorpher.java
index db7324c..712082e 100644
--- a/src/main/java/net/sf/ezmorph/array/LongArrayMorpher.java
+++ b/src/main/java/net/sf/ezmorph/array/LongArrayMorpher.java
@@ -43,6 +43,7 @@ public LongArrayMorpher(long defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -74,6 +75,7 @@ public long getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -82,6 +84,7 @@ public int hashCode() {
         return builder.toHashCode();
     }
 
+    @Override
     public Object morph(Object array) {
         if (array == null) {
             return null;
@@ -113,6 +116,7 @@ public Object morph(Object array) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return LONG_ARRAY_CLASS;
     }
diff --git a/src/main/java/net/sf/ezmorph/array/ObjectArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/ObjectArrayMorpher.java
index 6c30786..2d9df1f 100644
--- a/src/main/java/net/sf/ezmorph/array/ObjectArrayMorpher.java
+++ b/src/main/java/net/sf/ezmorph/array/ObjectArrayMorpher.java
@@ -46,6 +46,7 @@ public ObjectArrayMorpher(Morpher morpher) {
         setMorpher(morpher);
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -62,10 +63,12 @@ public boolean equals(Object obj) {
         return morpher.equals(other.morpher);
     }
 
+    @Override
     public int hashCode() {
         return new HashCodeBuilder().append(morpher).toHashCode();
     }
 
+    @Override
     public Object morph(Object array) {
         if (array == null) {
             return null;
@@ -104,10 +107,12 @@ public Object morph(Object array) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return targetArrayClass;
     }
 
+    @Override
     public boolean supports(Class clazz) {
         if (clazz != null && !clazz.isArray()) {
             return false;
diff --git a/src/main/java/net/sf/ezmorph/array/ShortArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/ShortArrayMorpher.java
index 4a53494..642bb51 100644
--- a/src/main/java/net/sf/ezmorph/array/ShortArrayMorpher.java
+++ b/src/main/java/net/sf/ezmorph/array/ShortArrayMorpher.java
@@ -43,6 +43,7 @@ public ShortArrayMorpher(short defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -74,6 +75,7 @@ public short getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -82,6 +84,7 @@ public int hashCode() {
         return builder.toHashCode();
     }
 
+    @Override
     public Object morph(Object array) {
         if (array == null) {
             return null;
@@ -113,6 +116,7 @@ public Object morph(Object array) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return SHORT_ARRAY_CLASS;
     }
diff --git a/src/main/java/net/sf/ezmorph/bean/BeanMorpher.java b/src/main/java/net/sf/ezmorph/bean/BeanMorpher.java
index e386f6a..9a43408 100644
--- a/src/main/java/net/sf/ezmorph/bean/BeanMorpher.java
+++ b/src/main/java/net/sf/ezmorph/bean/BeanMorpher.java
@@ -71,6 +71,7 @@ public BeanMorpher(Class beanClass, MorpherRegistry morpherRegistry, boolean len
         this.lenient = lenient;
     }
 
+    @Override
     public Object morph(Object sourceBean) {
         if (sourceBean == null) {
             return null;
@@ -129,10 +130,12 @@ public Object morph(Object sourceBean) {
         return targetBean;
     }
 
+    @Override
     public Class morphsTo() {
         return beanClass;
     }
 
+    @Override
     public boolean supports(Class clazz) {
         return !clazz.isArray();
     }
diff --git a/src/main/java/net/sf/ezmorph/bean/MorphDynaBean.java b/src/main/java/net/sf/ezmorph/bean/MorphDynaBean.java
index df824b5..3000014 100644
--- a/src/main/java/net/sf/ezmorph/bean/MorphDynaBean.java
+++ b/src/main/java/net/sf/ezmorph/bean/MorphDynaBean.java
@@ -50,6 +50,7 @@ public MorphDynaBean(MorpherRegistry morpherRegistry) {
         setMorpherRegistry(morpherRegistry);
     }
 
+    @Override
     public boolean contains(String name, String key) {
         DynaProperty dynaProperty = getDynaProperty(name);
 
@@ -66,6 +67,7 @@ public boolean contains(String name, String key) {
         return ((Map) value).containsKey(key);
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -89,6 +91,7 @@ public boolean equals(Object obj) {
         return builder.isEquals();
     }
 
+    @Override
     public Object get(String name) {
         Object value = dynaValues.get(name);
 
@@ -104,6 +107,7 @@ public Object get(String name) {
         }
     }
 
+    @Override
     public Object get(String name, int index) {
         DynaProperty dynaProperty = getDynaProperty(name);
 
@@ -123,6 +127,7 @@ public Object get(String name, int index) {
         return value;
     }
 
+    @Override
     public Object get(String name, String key) {
         DynaProperty dynaProperty = getDynaProperty(name);
 
@@ -139,6 +144,7 @@ public Object get(String name, String key) {
         return ((Map) value).get(key);
     }
 
+    @Override
     public DynaClass getDynaClass() {
         return this.dynaClass;
     }
@@ -147,6 +153,7 @@ public MorpherRegistry getMorpherRegistry() {
         return morpherRegistry;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder().append(dynaClass);
         DynaProperty[] props = dynaClass.getDynaProperties();
@@ -157,6 +164,7 @@ public int hashCode() {
         return builder.toHashCode();
     }
 
+    @Override
     public void remove(String name, String key) {
         DynaProperty dynaProperty = getDynaProperty(name);
 
@@ -173,6 +181,7 @@ public void remove(String name, String key) {
         ((Map) value).remove(key);
     }
 
+    @Override
     public void set(String name, int index, Object value) {
         DynaProperty dynaProperty = getDynaProperty(name);
 
@@ -210,6 +219,7 @@ public void set(String name, int index, Object value) {
         }
     }
 
+    @Override
     public void set(String name, Object value) {
         DynaProperty property = getDynaProperty(name);
 
@@ -220,6 +230,7 @@ public void set(String name, Object value) {
         dynaValues.put(name, value);
     }
 
+    @Override
     public void set(String name, String key, Object value) {
         DynaProperty dynaProperty = getDynaProperty(name);
 
@@ -251,6 +262,7 @@ public void setMorpherRegistry(MorpherRegistry morpherRegistry) {
         }
     }
 
+    @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append(dynaValues)
diff --git a/src/main/java/net/sf/ezmorph/bean/MorphDynaClass.java b/src/main/java/net/sf/ezmorph/bean/MorphDynaClass.java
index a667e5b..defeeab 100644
--- a/src/main/java/net/sf/ezmorph/bean/MorphDynaClass.java
+++ b/src/main/java/net/sf/ezmorph/bean/MorphDynaClass.java
@@ -37,6 +37,7 @@
  */
 public final class MorphDynaClass implements DynaClass, Serializable {
     private static final Comparator dynaPropertyComparator = new Comparator() {
+        @Override
         public int compare(Object a, Object b) {
             if (a instanceof DynaProperty && b instanceof DynaProperty) {
                 DynaProperty p1 = (DynaProperty) a;
@@ -51,7 +52,7 @@ public int compare(Object a, Object b) {
 
     private Map attributes;
     private Class beanClass;
-    private DynaProperty dynaProperties[];
+    private DynaProperty[] dynaProperties;
     private String name;
     private Map properties = new HashMap();
     private Class type;
@@ -91,6 +92,7 @@ public MorphDynaClass(String name, Class type, Map attributes, boolean exception
         process();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -119,10 +121,12 @@ public boolean equals(Object obj) {
         return builder.isEquals();
     }
 
+    @Override
     public DynaProperty[] getDynaProperties() {
         return dynaProperties;
     }
 
+    @Override
     public DynaProperty getDynaProperty(String propertyName) {
         if (propertyName == null) {
             throw new MorphException("Unnespecified bean property name");
@@ -130,10 +134,12 @@ public DynaProperty getDynaProperty(String propertyName) {
         return (DynaProperty) properties.get(propertyName);
     }
 
+    @Override
     public String getName() {
         return this.name;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder().append(name).append(type);
         for (int i = 0; i < dynaProperties.length; i++) {
@@ -143,6 +149,7 @@ public int hashCode() {
         return builder.toHashCode();
     }
 
+    @Override
     public DynaBean newInstance() throws IllegalAccessException, InstantiationException {
         return newInstance(null);
     }
@@ -163,6 +170,7 @@ public DynaBean newInstance(MorpherRegistry morpherRegistry) throws IllegalAcces
         return dynaBean;
     }
 
+    @Override
     public String toString() {
         return new ToStringBuilder(this)
                 .append("name", this.name)
diff --git a/src/main/java/net/sf/ezmorph/object/AbstractObjectMorpher.java b/src/main/java/net/sf/ezmorph/object/AbstractObjectMorpher.java
index 56f12b8..4c706f3 100644
--- a/src/main/java/net/sf/ezmorph/object/AbstractObjectMorpher.java
+++ b/src/main/java/net/sf/ezmorph/object/AbstractObjectMorpher.java
@@ -57,6 +57,7 @@ public void setUseDefault(boolean useDefault) {
      * @param clazz the source Class
      * @return true if clazz is supported by this morpher, false otherwise.
      */
+    @Override
     public boolean supports(Class clazz) {
         return !clazz.isArray();
     }
diff --git a/src/main/java/net/sf/ezmorph/object/BigDecimalMorpher.java b/src/main/java/net/sf/ezmorph/object/BigDecimalMorpher.java
index 1021958..47a70a6 100644
--- a/src/main/java/net/sf/ezmorph/object/BigDecimalMorpher.java
+++ b/src/main/java/net/sf/ezmorph/object/BigDecimalMorpher.java
@@ -42,6 +42,7 @@ public BigDecimalMorpher(BigDecimal defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -73,6 +74,7 @@ public BigDecimal getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -81,6 +83,7 @@ public int hashCode() {
         return builder.toHashCode();
     }
 
+    @Override
     public Object morph(Object value) {
         if (value instanceof BigDecimal) {
             return value;
@@ -128,6 +131,7 @@ public Object morph(Object value) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return BigDecimal.class;
     }
diff --git a/src/main/java/net/sf/ezmorph/object/BigIntegerMorpher.java b/src/main/java/net/sf/ezmorph/object/BigIntegerMorpher.java
index 5ca39cb..47fb486 100644
--- a/src/main/java/net/sf/ezmorph/object/BigIntegerMorpher.java
+++ b/src/main/java/net/sf/ezmorph/object/BigIntegerMorpher.java
@@ -43,6 +43,7 @@ public BigIntegerMorpher(BigInteger defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -74,6 +75,7 @@ public BigInteger getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -82,6 +84,7 @@ public int hashCode() {
         return builder.toHashCode();
     }
 
+    @Override
     public Object morph(Object value) {
         if (value instanceof BigInteger) {
             return value;
@@ -128,6 +131,7 @@ public Object morph(Object value) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return BigInteger.class;
     }
diff --git a/src/main/java/net/sf/ezmorph/object/BooleanObjectMorpher.java b/src/main/java/net/sf/ezmorph/object/BooleanObjectMorpher.java
index fe42117..754a5c1 100644
--- a/src/main/java/net/sf/ezmorph/object/BooleanObjectMorpher.java
+++ b/src/main/java/net/sf/ezmorph/object/BooleanObjectMorpher.java
@@ -40,6 +40,7 @@ public BooleanObjectMorpher(Boolean defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -71,6 +72,7 @@ public Boolean getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -79,6 +81,7 @@ public int hashCode() {
         return builder.toHashCode();
     }
 
+    @Override
     public Object morph(Object value) {
         if (value == null) {
             if (isUseDefault()) {
@@ -105,6 +108,7 @@ public Object morph(Object value) {
         throw new MorphException("Can't morph value: " + value);
     }
 
+    @Override
     public Class morphsTo() {
         return Boolean.class;
     }
diff --git a/src/main/java/net/sf/ezmorph/object/CharacterObjectMorpher.java b/src/main/java/net/sf/ezmorph/object/CharacterObjectMorpher.java
index aeb56fc..3bacb08 100644
--- a/src/main/java/net/sf/ezmorph/object/CharacterObjectMorpher.java
+++ b/src/main/java/net/sf/ezmorph/object/CharacterObjectMorpher.java
@@ -40,6 +40,7 @@ public CharacterObjectMorpher(Character defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -71,6 +72,7 @@ public Character getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -79,6 +81,7 @@ public int hashCode() {
         return builder.toHashCode();
     }
 
+    @Override
     public Object morph(Object value) {
         if (value == null) {
             if (isUseDefault()) {
@@ -104,6 +107,7 @@ public Object morph(Object value) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return Character.class;
     }
diff --git a/src/main/java/net/sf/ezmorph/object/ClassMorpher.java b/src/main/java/net/sf/ezmorph/object/ClassMorpher.java
index b303fcf..a917200 100644
--- a/src/main/java/net/sf/ezmorph/object/ClassMorpher.java
+++ b/src/main/java/net/sf/ezmorph/object/ClassMorpher.java
@@ -37,14 +37,17 @@ public static ClassMorpher getInstance() {
 
     private ClassMorpher() {}
 
+    @Override
     public boolean equals(Object obj) {
         return INSTANCE == obj;
     }
 
+    @Override
     public int hashCode() {
         return 42 + getClass().hashCode();
     }
 
+    @Override
     public Object morph(Object value) {
         if (value == null) {
             return null;
@@ -65,10 +68,12 @@ public Object morph(Object value) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return Class.class;
     }
 
+    @Override
     public boolean supports(Class clazz) {
         return true;
     }
diff --git a/src/main/java/net/sf/ezmorph/object/DateMorpher.java b/src/main/java/net/sf/ezmorph/object/DateMorpher.java
index c3a2a62..7465d6d 100644
--- a/src/main/java/net/sf/ezmorph/object/DateMorpher.java
+++ b/src/main/java/net/sf/ezmorph/object/DateMorpher.java
@@ -115,6 +115,7 @@ public DateMorpher(String[] formats, Locale locale, boolean lenient) {
         this.lenient = lenient;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -149,6 +150,7 @@ public Date getDefaultValue() {
         return (Date) defaultValue.clone();
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         builder.append(formats);
@@ -160,6 +162,7 @@ public int hashCode() {
         return builder.toHashCode();
     }
 
+    @Override
     public Object morph(Object value) {
         if (value == null) {
             return null;
@@ -198,6 +201,7 @@ public Object morph(Object value) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return Date.class;
     }
@@ -211,6 +215,7 @@ public void setDefaultValue(Date defaultValue) {
         this.defaultValue = (Date) defaultValue.clone();
     }
 
+    @Override
     public boolean supports(Class clazz) {
         return String.class.isAssignableFrom(clazz);
     }
diff --git a/src/main/java/net/sf/ezmorph/object/IdentityObjectMorpher.java b/src/main/java/net/sf/ezmorph/object/IdentityObjectMorpher.java
index b3e7f4e..48df2a8 100644
--- a/src/main/java/net/sf/ezmorph/object/IdentityObjectMorpher.java
+++ b/src/main/java/net/sf/ezmorph/object/IdentityObjectMorpher.java
@@ -36,22 +36,27 @@ public static IdentityObjectMorpher getInstance() {
 
     private IdentityObjectMorpher() {}
 
+    @Override
     public boolean equals(Object obj) {
         return INSTANCE == obj;
     }
 
+    @Override
     public int hashCode() {
         return 42 + getClass().hashCode();
     }
 
+    @Override
     public Object morph(Object value) {
         return value;
     }
 
+    @Override
     public Class morphsTo() {
         return Object.class;
     }
 
+    @Override
     public boolean supports(Class clazz) {
         return true;
     }
diff --git a/src/main/java/net/sf/ezmorph/object/MapToDateMorpher.java b/src/main/java/net/sf/ezmorph/object/MapToDateMorpher.java
index 1947949..5af5359 100644
--- a/src/main/java/net/sf/ezmorph/object/MapToDateMorpher.java
+++ b/src/main/java/net/sf/ezmorph/object/MapToDateMorpher.java
@@ -44,6 +44,7 @@ public MapToDateMorpher(Date defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -75,6 +76,7 @@ public Date getDefaultValue() {
         return (Date) defaultValue.clone();
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -83,6 +85,7 @@ public int hashCode() {
         return builder.toHashCode();
     }
 
+    @Override
     public Object morph(Object value) {
         if (value == null) {
             return null;
@@ -116,6 +119,7 @@ public Object morph(Object value) {
         return c.getTime();
     }
 
+    @Override
     public Class morphsTo() {
         return Date.class;
     }
@@ -129,6 +133,7 @@ public void setDefaultValue(Date defaultValue) {
         this.defaultValue = (Date) defaultValue.clone();
     }
 
+    @Override
     public boolean supports(Class clazz) {
         return clazz != null && Map.class.isAssignableFrom(clazz);
     }
diff --git a/src/main/java/net/sf/ezmorph/object/NumberMorpher.java b/src/main/java/net/sf/ezmorph/object/NumberMorpher.java
index 2fea689..ec8ea39 100644
--- a/src/main/java/net/sf/ezmorph/object/NumberMorpher.java
+++ b/src/main/java/net/sf/ezmorph/object/NumberMorpher.java
@@ -112,6 +112,7 @@ public NumberMorpher(Class type, Number defaultValue) {
         setDefaultValue(defaultValue);
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -144,6 +145,7 @@ public Number getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         builder.append(type);
@@ -153,6 +155,7 @@ public int hashCode() {
         return builder.toHashCode();
     }
 
+    @Override
     public Object morph(Object value) {
         if (value != null && type.isAssignableFrom(value.getClass())) {
             // no conversion needed
@@ -189,6 +192,7 @@ public Object morph(Object value) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return type;
     }
diff --git a/src/main/java/net/sf/ezmorph/object/ObjectListMorpher.java b/src/main/java/net/sf/ezmorph/object/ObjectListMorpher.java
index 93d814f..2cf05fa 100644
--- a/src/main/java/net/sf/ezmorph/object/ObjectListMorpher.java
+++ b/src/main/java/net/sf/ezmorph/object/ObjectListMorpher.java
@@ -52,6 +52,7 @@ public ObjectListMorpher(Morpher morpher, Object defaultValue) {
         setMorpher(morpher);
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -68,10 +69,12 @@ public boolean equals(Object obj) {
         return morpher.equals(other.morpher);
     }
 
+    @Override
     public int hashCode() {
         return new HashCodeBuilder().append(morpher).toHashCode();
     }
 
+    @Override
     public Object morph(Object value) {
         if (value == null) {
             return null;
@@ -107,10 +110,12 @@ public Object morph(Object value) {
         return list;
     }
 
+    @Override
     public Class morphsTo() {
         return List.class;
     }
 
+    @Override
     public boolean supports(Class clazz) {
         return clazz != null && List.class.isAssignableFrom(clazz);
     }
diff --git a/src/main/java/net/sf/ezmorph/object/StringMorpher.java b/src/main/java/net/sf/ezmorph/object/StringMorpher.java
index ac252f1..5fe612a 100644
--- a/src/main/java/net/sf/ezmorph/object/StringMorpher.java
+++ b/src/main/java/net/sf/ezmorph/object/StringMorpher.java
@@ -37,14 +37,17 @@ public static StringMorpher getInstance() {
 
     private StringMorpher() {}
 
+    @Override
     public boolean equals(Object obj) {
         return INSTANCE == obj;
     }
 
+    @Override
     public int hashCode() {
         return 42 + getClass().hashCode();
     }
 
+    @Override
     public Object morph(Object value) {
         if (value == null) {
             return null;
@@ -61,10 +64,12 @@ public Object morph(Object value) {
         return String.valueOf(value);
     }
 
+    @Override
     public Class morphsTo() {
         return String.class;
     }
 
+    @Override
     public boolean supports(Class clazz) {
         return !clazz.isArray();
     }
diff --git a/src/main/java/net/sf/ezmorph/object/SwitchingMorpher.java b/src/main/java/net/sf/ezmorph/object/SwitchingMorpher.java
index 2a89e93..523a51b 100644
--- a/src/main/java/net/sf/ezmorph/object/SwitchingMorpher.java
+++ b/src/main/java/net/sf/ezmorph/object/SwitchingMorpher.java
@@ -44,6 +44,7 @@ public SwitchingMorpher(Map classMap, MorpherRegistry morpherRegistry) {
         this.classMap.putAll(classMap);
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -72,6 +73,7 @@ public boolean equals(Object obj) {
         return true;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         for (Iterator entries = classMap.entrySet().iterator(); entries.hasNext(); ) {
@@ -82,6 +84,7 @@ public int hashCode() {
         return builder.toHashCode();
     }
 
+    @Override
     public Object morph(Object value) {
         if (value == null) {
             return null;
@@ -91,10 +94,12 @@ public Object morph(Object value) {
         return morpherRegistry.morph(target, value);
     }
 
+    @Override
     public Class morphsTo() {
         return Object.class;
     }
 
+    @Override
     public boolean supports(Class clazz) {
         return true;
     }
diff --git a/src/main/java/net/sf/ezmorph/primitive/AbstractPrimitiveMorpher.java b/src/main/java/net/sf/ezmorph/primitive/AbstractPrimitiveMorpher.java
index 17c1368..f16af9c 100644
--- a/src/main/java/net/sf/ezmorph/primitive/AbstractPrimitiveMorpher.java
+++ b/src/main/java/net/sf/ezmorph/primitive/AbstractPrimitiveMorpher.java
@@ -51,6 +51,7 @@ public boolean isUseDefault() {
      * @param clazz the source Class
      * @return true if clazz is supported by this morpher, false otherwise.
      */
+    @Override
     public boolean supports(Class clazz) {
         return !clazz.isArray();
     }
diff --git a/src/main/java/net/sf/ezmorph/primitive/BooleanMorpher.java b/src/main/java/net/sf/ezmorph/primitive/BooleanMorpher.java
index 6314a9f..4e77d02 100644
--- a/src/main/java/net/sf/ezmorph/primitive/BooleanMorpher.java
+++ b/src/main/java/net/sf/ezmorph/primitive/BooleanMorpher.java
@@ -40,6 +40,7 @@ public BooleanMorpher(boolean defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -71,6 +72,7 @@ public boolean getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -124,6 +126,7 @@ public boolean morph(Object value) {
         throw new MorphException("Can't morph value: " + value);
     }
 
+    @Override
     public Class morphsTo() {
         return Boolean.TYPE;
     }
diff --git a/src/main/java/net/sf/ezmorph/primitive/ByteMorpher.java b/src/main/java/net/sf/ezmorph/primitive/ByteMorpher.java
index 1a25bf3..673aed6 100644
--- a/src/main/java/net/sf/ezmorph/primitive/ByteMorpher.java
+++ b/src/main/java/net/sf/ezmorph/primitive/ByteMorpher.java
@@ -40,6 +40,7 @@ public ByteMorpher(byte defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -71,6 +72,7 @@ public byte getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -111,6 +113,7 @@ public byte morph(Object value) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return Byte.TYPE;
     }
diff --git a/src/main/java/net/sf/ezmorph/primitive/CharMorpher.java b/src/main/java/net/sf/ezmorph/primitive/CharMorpher.java
index de551be..c46949d 100644
--- a/src/main/java/net/sf/ezmorph/primitive/CharMorpher.java
+++ b/src/main/java/net/sf/ezmorph/primitive/CharMorpher.java
@@ -40,6 +40,7 @@ public CharMorpher(char defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -71,6 +72,7 @@ public char getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -110,6 +112,7 @@ public char morph(Object value) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return Character.TYPE;
     }
diff --git a/src/main/java/net/sf/ezmorph/primitive/DoubleMorpher.java b/src/main/java/net/sf/ezmorph/primitive/DoubleMorpher.java
index f9f6fca..05a158a 100644
--- a/src/main/java/net/sf/ezmorph/primitive/DoubleMorpher.java
+++ b/src/main/java/net/sf/ezmorph/primitive/DoubleMorpher.java
@@ -40,6 +40,7 @@ public DoubleMorpher(double defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -71,6 +72,7 @@ public double getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -111,6 +113,7 @@ public double morph(Object value) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return Double.TYPE;
     }
diff --git a/src/main/java/net/sf/ezmorph/primitive/FloatMorpher.java b/src/main/java/net/sf/ezmorph/primitive/FloatMorpher.java
index da80d66..3441d4e 100644
--- a/src/main/java/net/sf/ezmorph/primitive/FloatMorpher.java
+++ b/src/main/java/net/sf/ezmorph/primitive/FloatMorpher.java
@@ -40,6 +40,7 @@ public FloatMorpher(float defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -71,6 +72,7 @@ public float getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -111,6 +113,7 @@ public float morph(Object value) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return Float.TYPE;
     }
diff --git a/src/main/java/net/sf/ezmorph/primitive/IntMorpher.java b/src/main/java/net/sf/ezmorph/primitive/IntMorpher.java
index fa52259..e859fb3 100644
--- a/src/main/java/net/sf/ezmorph/primitive/IntMorpher.java
+++ b/src/main/java/net/sf/ezmorph/primitive/IntMorpher.java
@@ -40,6 +40,7 @@ public IntMorpher(int defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -71,6 +72,7 @@ public int getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -111,6 +113,7 @@ public int morph(Object value) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return Integer.TYPE;
     }
diff --git a/src/main/java/net/sf/ezmorph/primitive/LongMorpher.java b/src/main/java/net/sf/ezmorph/primitive/LongMorpher.java
index 0550dcd..1d91e36 100644
--- a/src/main/java/net/sf/ezmorph/primitive/LongMorpher.java
+++ b/src/main/java/net/sf/ezmorph/primitive/LongMorpher.java
@@ -40,6 +40,7 @@ public LongMorpher(long defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -71,6 +72,7 @@ public long getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -111,6 +113,7 @@ public long morph(Object value) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return Long.TYPE;
     }
diff --git a/src/main/java/net/sf/ezmorph/primitive/ShortMorpher.java b/src/main/java/net/sf/ezmorph/primitive/ShortMorpher.java
index e8b364f..70e5b4c 100644
--- a/src/main/java/net/sf/ezmorph/primitive/ShortMorpher.java
+++ b/src/main/java/net/sf/ezmorph/primitive/ShortMorpher.java
@@ -39,6 +39,7 @@ public ShortMorpher(short defaultValue) {
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -70,6 +71,7 @@ public short getDefaultValue() {
         return defaultValue;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
@@ -110,6 +112,7 @@ public short morph(Object value) {
         }
     }
 
+    @Override
     public Class morphsTo() {
         return Short.TYPE;
     }
diff --git a/src/main/java/net/sf/json/AbstractJSON.java b/src/main/java/net/sf/json/AbstractJSON.java
index 4b73543..8809d55 100644
--- a/src/main/java/net/sf/json/AbstractJSON.java
+++ b/src/main/java/net/sf/json/AbstractJSON.java
@@ -36,6 +36,7 @@
  */
 abstract class AbstractJSON implements JSON {
     private static class CycleSet extends ThreadLocal {
+        @Override
         protected Object initialValue() {
             return new SoftReference(new HashSet());
         }
@@ -249,11 +250,13 @@ private static Set getCycleSet() {
         return cycleSet.getSet();
     }
 
+    @Override
     public final Writer write(Writer writer) throws IOException {
         write(writer, NORMAL);
         return writer;
     }
 
+    @Override
     public final Writer writeCanonical(Writer writer) throws IOException {
         write(writer, CANONICAL);
         return writer;
@@ -270,28 +273,34 @@ interface WritingVisitor {
     }
 
     private static final WritingVisitor NORMAL = new WritingVisitor() {
+        @Override
         public Collection keySet(JSONObject o) {
             return o.keySet();
         }
 
+        @Override
         public void on(JSON o, Writer w) throws IOException {
             o.write(w);
         }
 
+        @Override
         public void on(Object value, Writer w) throws IOException {
             w.write(JSONUtils.valueToString(value));
         }
     };
 
     private static final WritingVisitor CANONICAL = new WritingVisitor() {
+        @Override
         public Collection keySet(JSONObject o) {
             return new TreeSet(o.keySet()); // sort them alphabetically
         }
 
+        @Override
         public void on(JSON o, Writer w) throws IOException {
             o.writeCanonical(w);
         }
 
+        @Override
         public void on(Object value, Writer w) throws IOException {
             w.write(JSONUtils.valueToCanonicalString(value));
         }
diff --git a/src/main/java/net/sf/json/JSONArray.java b/src/main/java/net/sf/json/JSONArray.java
index fe9a721..e2332e0 100644
--- a/src/main/java/net/sf/json/JSONArray.java
+++ b/src/main/java/net/sf/json/JSONArray.java
@@ -401,9 +401,7 @@ public static Collection toCollection(JSONArray jsonArray, JsonConfig jsonConfig
         } else {
             try {
                 collection = (Collection) collectionType.newInstance();
-            } catch (InstantiationException e) {
-                throw new JSONException(e);
-            } catch (IllegalAccessException e) {
+            } catch (InstantiationException | IllegalAccessException e) {
                 throw new JSONException(e);
             }
         }
@@ -535,6 +533,7 @@ public static Collection toCollection( JSONArray jsonArray, JsonConfig jsonConfi
      * @deprecated replaced by toCollection
      * @see #toCollection(JSONArray)
      */
+    @Deprecated
     public static List toList(JSONArray jsonArray) {
         return toList(jsonArray, new JsonConfig());
     }
@@ -545,6 +544,7 @@ public static List toList(JSONArray jsonArray) {
      * @deprecated replaced by toCollection
      * @see #toCollection(JSONArray,Class)
      */
+    @Deprecated
     public static List toList(JSONArray jsonArray, Class objectClass) {
         JsonConfig jsonConfig = new JsonConfig();
         jsonConfig.setRootClass(objectClass);
@@ -564,6 +564,7 @@ public static List toList(JSONArray jsonArray, Class objectClass) {
      *
      * @deprecated replaced by toCollection
      */
+    @Deprecated
     public static List toList(JSONArray jsonArray, Class objectClass, Map classMap) {
         JsonConfig jsonConfig = new JsonConfig();
         jsonConfig.setRootClass(objectClass);
@@ -577,6 +578,7 @@ public static List toList(JSONArray jsonArray, Class objectClass, Map classMap)
      * @deprecated replaced by toCollection
      * @see #toCollection(JSONArray,JsonConfig)
      */
+    @Deprecated
     public static List toList(JSONArray jsonArray, JsonConfig jsonConfig) {
         if (jsonArray.size() == 0) {
             return new ArrayList();
@@ -1207,9 +1209,10 @@ private static void processArrayDimensions(JSONArray jsonArray, List dims, int i
      * Construct an empty JSONArray.
      */
     public JSONArray() {
-        this.elements = new ArrayList<Object>();
+        this.elements = new ArrayList<>();
     }
 
+    @Override
     public void add(int index, Object value) {
         add(index, value, new JsonConfig());
     }
@@ -1218,6 +1221,7 @@ public void add(int index, Object value, JsonConfig jsonConfig) {
         this.elements.add(index, processValue(value, jsonConfig));
     }
 
+    @Override
     public boolean add(Object value) {
         return add(value, new JsonConfig());
     }
@@ -1227,6 +1231,7 @@ public boolean add(Object value, JsonConfig jsonConfig) {
         return true;
     }
 
+    @Override
     public boolean addAll(Collection collection) {
         return addAll(collection, new JsonConfig());
     }
@@ -1241,6 +1246,7 @@ public boolean addAll(Collection collection, JsonConfig jsonConfig) {
         return true;
     }
 
+    @Override
     public boolean addAll(int index, Collection collection) {
         return addAll(index, collection, new JsonConfig());
     }
@@ -1256,10 +1262,12 @@ public boolean addAll(int index, Collection collection, JsonConfig jsonConfig) {
         return true;
     }
 
+    @Override
     public void clear() {
         elements.clear();
     }
 
+    @Override
     public int compareTo(Object obj) {
         if (obj != null && (obj instanceof JSONArray)) {
             JSONArray other = (JSONArray) obj;
@@ -1276,6 +1284,7 @@ public int compareTo(Object obj) {
         return -1;
     }
 
+    @Override
     public boolean contains(Object o) {
         return contains(o, new JsonConfig());
     }
@@ -1284,6 +1293,7 @@ public boolean contains(Object o, JsonConfig jsonConfig) {
         return elements.contains(processValue(o, jsonConfig));
     }
 
+    @Override
     public boolean containsAll(Collection collection) {
         return containsAll(collection, new JsonConfig());
     }
@@ -1742,6 +1752,7 @@ public JSONArray element(String value, JsonConfig jsonConfig) {
         return this;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj == this) {
             return true;
@@ -1845,6 +1856,7 @@ public boolean equals(Object obj) {
      * @param index The index must be between 0 and size() - 1.
      * @return An object value.
      */
+    @Override
     public Object get(int index) {
         /*
          * Object o = opt( index ); if( o == null ){ throw new JSONException(
@@ -1976,6 +1988,7 @@ public String getString(int index) {
         throw new JSONException("JSONArray[" + index + "] not found.");
     }
 
+    @Override
     public int hashCode() {
         int hashcode = 29;
 
@@ -1986,14 +1999,17 @@ public int hashCode() {
         return hashcode;
     }
 
+    @Override
     public int indexOf(Object o) {
         return elements.indexOf(o);
     }
 
+    @Override
     public boolean isArray() {
         return true;
     }
 
+    @Override
     public boolean isEmpty() {
         return this.elements.isEmpty();
     }
@@ -2005,6 +2021,7 @@ public boolean isExpandElements() {
     /**
      * Returns an Iterator for this JSONArray
      */
+    @Override
     public Iterator iterator() {
         return new JSONArrayListIterator();
     }
@@ -2045,14 +2062,17 @@ public String join(String separator, boolean stripQuotes) {
         return sb.toString();
     }
 
+    @Override
     public int lastIndexOf(Object o) {
         return elements.lastIndexOf(o);
     }
 
+    @Override
     public ListIterator listIterator() {
         return listIterator(0);
     }
 
+    @Override
     public ListIterator listIterator(int index) {
         if (index < 0 || index > size()) {
             throw new IndexOutOfBoundsException("Index: " + index);
@@ -2237,14 +2257,17 @@ public String optString(int index, String defaultValue) {
         return o != null ? o.toString() : defaultValue;
     }
 
+    @Override
     public Object remove(int index) {
         return elements.remove(index);
     }
 
+    @Override
     public boolean remove(Object o) {
         return elements.remove(o);
     }
 
+    @Override
     public boolean removeAll(Collection collection) {
         return removeAll(collection, new JsonConfig());
     }
@@ -2253,6 +2276,7 @@ public boolean removeAll(Collection collection, JsonConfig jsonConfig) {
         return elements.removeAll(fromObject(collection, jsonConfig));
     }
 
+    @Override
     public boolean retainAll(Collection collection) {
         return retainAll(collection, new JsonConfig());
     }
@@ -2261,6 +2285,7 @@ public boolean retainAll(Collection collection, JsonConfig jsonConfig) {
         return elements.retainAll(fromObject(collection, jsonConfig));
     }
 
+    @Override
     public Object set(int index, Object value) {
         return set(index, value, new JsonConfig());
     }
@@ -2280,10 +2305,12 @@ public void setExpandElements(boolean expandElements) {
      *
      * @return The length (or size).
      */
+    @Override
     public int size() {
         return this.elements.size();
     }
 
+    @Override
     public List subList(int fromIndex, int toIndex) {
         return elements.subList(fromIndex, toIndex);
     }
@@ -2291,10 +2318,12 @@ public List subList(int fromIndex, int toIndex) {
     /**
      * Produce an Object[] with the contents of this JSONArray.
      */
+    @Override
     public Object[] toArray() {
         return this.elements.toArray();
     }
 
+    @Override
     public Object[] toArray(Object[] array) {
         return elements.toArray(array);
     }
@@ -2331,6 +2360,7 @@ public JSONObject toJSONObject(JSONArray names) {
      * @return a printable, displayable, transmittable representation of the
      *         array.
      */
+    @Override
     public String toString() {
         try {
             return '[' + join(",") + ']';
@@ -2351,6 +2381,7 @@ public String toString() {
      *         bracket)</small>.
      * @throws JSONException
      */
+    @Override
     public String toString(int indentFactor) {
         if (indentFactor == 0) {
             return this.toString();
@@ -2369,6 +2400,7 @@ public String toString(int indentFactor) {
      *         array.
      * @throws JSONException
      */
+    @Override
     public String toString(int indentFactor, int indent) {
         int len = size();
         if (len == 0) {
@@ -2405,6 +2437,7 @@ public String toString(int indentFactor, int indent) {
         return sb.toString();
     }
 
+    @Override
     protected void write(Writer writer, WritingVisitor visitor) throws IOException {
         boolean b = false;
         int len = size();
@@ -2449,6 +2482,7 @@ private JSONArray _addValue(Object value, JsonConfig jsonConfig) {
         return this;
     }
 
+    @Override
     protected Object _processValue(Object value, JsonConfig jsonConfig) {
         if (value instanceof JSONTokener) {
             return _fromJSONTokener((JSONTokener) value, jsonConfig);
@@ -2496,10 +2530,12 @@ private class JSONArrayListIterator implements ListIterator {
             currentIndex = index;
         }
 
+        @Override
         public boolean hasNext() {
             return currentIndex != size();
         }
 
+        @Override
         public Object next() {
             try {
                 Object next = get(currentIndex);
@@ -2510,6 +2546,7 @@ public Object next() {
             }
         }
 
+        @Override
         public void remove() {
             if (lastIndex == -1) {
                 throw new IllegalStateException();
@@ -2525,10 +2562,12 @@ public void remove() {
             }
         }
 
+        @Override
         public boolean hasPrevious() {
             return currentIndex != 0;
         }
 
+        @Override
         public Object previous() {
             try {
                 int index = currentIndex - 1;
@@ -2540,14 +2579,17 @@ public Object previous() {
             }
         }
 
+        @Override
         public int nextIndex() {
             return currentIndex;
         }
 
+        @Override
         public int previousIndex() {
             return currentIndex - 1;
         }
 
+        @Override
         public void set(Object obj) {
             if (lastIndex == -1) {
                 throw new IllegalStateException();
@@ -2560,6 +2602,7 @@ public void set(Object obj) {
             }
         }
 
+        @Override
         public void add(Object obj) {
             try {
                 JSONArray.this.add(currentIndex++, obj);
diff --git a/src/main/java/net/sf/json/JSONFunction.java b/src/main/java/net/sf/json/JSONFunction.java
index e0882c7..ba094d4 100644
--- a/src/main/java/net/sf/json/JSONFunction.java
+++ b/src/main/java/net/sf/json/JSONFunction.java
@@ -83,6 +83,7 @@ public JSONFunction(String[] params, String text) {
         }
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -130,6 +131,7 @@ public String getText() {
         return text;
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         for (int i = 0; i < params.length; i++) {
@@ -142,6 +144,7 @@ public int hashCode() {
     /**
      * Returns the string representation of this function.
      */
+    @Override
     public String toString() {
         StringBuffer b = new StringBuffer("function(");
         if (params.length > 0) {
diff --git a/src/main/java/net/sf/json/JSONNull.java b/src/main/java/net/sf/json/JSONNull.java
index 421e1d2..8b3666c 100644
--- a/src/main/java/net/sf/json/JSONNull.java
+++ b/src/main/java/net/sf/json/JSONNull.java
@@ -49,6 +49,7 @@ private JSONNull() {}
      * @return true if the object parameter is the JSONObject.NULL object or
      *         null.
      */
+    @Override
     public boolean equals(Object object) {
         return object == null
                 || object == this
@@ -56,18 +57,22 @@ public boolean equals(Object object) {
                 || (object instanceof JSONObject && ((JSONObject) object).isNullObject());
     }
 
+    @Override
     public int hashCode() {
         return 37 + "null".hashCode();
     }
 
+    @Override
     public boolean isArray() {
         return false;
     }
 
+    @Override
     public boolean isEmpty() {
         throw new JSONException("Object is null");
     }
 
+    @Override
     public int size() {
         throw new JSONException("Object is null");
     }
@@ -77,14 +82,17 @@ public int size() {
      *
      * @return The string "null".
      */
+    @Override
     public String toString() {
         return "null";
     }
 
+    @Override
     public String toString(int indentFactor) {
         return toString();
     }
 
+    @Override
     public String toString(int indentFactor, int indent) {
         StringBuffer sb = new StringBuffer();
         for (int i = 0; i < indent; i += 1) {
@@ -94,11 +102,13 @@ public String toString(int indentFactor, int indent) {
         return sb.toString();
     }
 
+    @Override
     public Writer write(Writer writer) throws IOException {
         writer.write(toString());
         return writer;
     }
 
+    @Override
     public Writer writeCanonical(Writer w) throws IOException {
         return write(w);
     }
diff --git a/src/main/java/net/sf/json/JSONObject.java b/src/main/java/net/sf/json/JSONObject.java
index 8bad0f1..d9aa59e 100644
--- a/src/main/java/net/sf/json/JSONObject.java
+++ b/src/main/java/net/sf/json/JSONObject.java
@@ -270,18 +270,22 @@ private PropertyOnMap(String name) {
             this.name = name;
         }
 
+        @Override
         public boolean isWritable() {
             return true;
         }
 
+        @Override
         public String name() {
             return name;
         }
 
+        @Override
         public Class getPropertyType() {
             return Object.class;
         }
 
+        @Override
         public void set(Object bean, Object value, JsonConfig jsonConfig) {
             ((Map) bean).put(name, value);
         }
@@ -294,18 +298,22 @@ private MethodProperty(PropertyDescriptor pd) {
             this.pd = pd;
         }
 
+        @Override
         public boolean isWritable() {
             return pd.getWriteMethod() != null;
         }
 
+        @Override
         public String name() {
             return pd.getName();
         }
 
+        @Override
         public Class getPropertyType() {
             return pd.getPropertyType();
         }
 
+        @Override
         public void set(Object bean, Object value, JsonConfig jsonConfig)
                 throws InvocationTargetException, NoSuchMethodException, IllegalAccessException {
             PropertyUtils.setSimpleProperty(bean, pd.getName(), value);
@@ -319,18 +327,22 @@ private FieldProperty(Field f) {
             this.f = f;
         }
 
+        @Override
         public boolean isWritable() {
             return true;
         }
 
+        @Override
         public Class getPropertyType() {
             return f.getType();
         }
 
+        @Override
         public String name() {
             return f.getName();
         }
 
+        @Override
         public void set(Object bean, Object value, JsonConfig jsonConfig)
                 throws InvocationTargetException, NoSuchMethodException, IllegalAccessException {
             f.set(bean, value);
@@ -349,18 +361,22 @@ private PropertySetterStrategyDecorator(Property inner, PropertySetStrategy stra
             this.strategy = strategy;
         }
 
+        @Override
         public boolean isWritable() {
             return inner.isWritable();
         }
 
+        @Override
         public Class getPropertyType() {
             return inner.getPropertyType();
         }
 
+        @Override
         public String name() {
             return inner.name();
         }
 
+        @Override
         public void set(Object bean, Object value, JsonConfig jsonConfig)
                 throws InvocationTargetException, NoSuchMethodException, IllegalAccessException {
             strategy.setProperty(bean, name(), value, jsonConfig);
@@ -1537,10 +1553,12 @@ public void accumulateAll(Map map, JsonConfig jsonConfig) {
         }
     }
 
+    @Override
     public void clear() {
         properties.clear();
     }
 
+    @Override
     public int compareTo(Object obj) {
         if (obj != null && (obj instanceof JSONObject)) {
             JSONObject other = (JSONObject) obj;
@@ -1557,10 +1575,12 @@ public int compareTo(Object obj) {
         return -1;
     }
 
+    @Override
     public boolean containsKey(Object key) {
         return properties.containsKey(key);
     }
 
+    @Override
     public boolean containsValue(Object value) {
         return containsValue(value, new JsonConfig());
     }
@@ -1778,10 +1798,12 @@ public JSONObject elementOpt(String key, Object value, JsonConfig jsonConfig) {
         return this;
     }
 
+    @Override
     public Set entrySet() {
         return Collections.unmodifiableSet(properties.entrySet());
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj == this) {
             return true;
@@ -1881,6 +1903,7 @@ public boolean equals(Object obj) {
         return true;
     }
 
+    @Override
     public Object get(Object key) {
         if (key instanceof String) {
             return get((String) key);
@@ -2041,6 +2064,7 @@ public boolean has(String key) {
         return this.properties.containsKey(key);
     }
 
+    @Override
     public int hashCode() {
         int hashcode = 19;
         if (isNullObject()) {
@@ -2055,10 +2079,12 @@ public int hashCode() {
         return hashcode;
     }
 
+    @Override
     public boolean isArray() {
         return false;
     }
 
+    @Override
     public boolean isEmpty() {
         // verifyIsNull();
         return this.properties.isEmpty();
@@ -2081,6 +2107,7 @@ public Iterator keys() {
         return keySet().iterator();
     }
 
+    @Override
     public Set keySet() {
         return Collections.unmodifiableSet(properties.keySet());
     }
@@ -2307,6 +2334,7 @@ public String optString(String key, String defaultValue) {
         return o != null ? o.toString() : defaultValue;
     }
 
+    @Override
     public Object put(String key, Object value) {
         if (key == null) {
             throw new IllegalArgumentException("key is null.");
@@ -2316,6 +2344,7 @@ public Object put(String key, Object value) {
         return previous;
     }
 
+    @Override
     public void putAll(Map map) {
         putAll(map, new JsonConfig());
     }
@@ -2338,6 +2367,7 @@ public void putAll(Map map, JsonConfig jsonConfig) {
         }
     }
 
+    @Override
     public Object remove(Object key) {
         return properties.remove(key);
     }
@@ -2359,6 +2389,7 @@ public Object remove(String key) {
      *
      * @return The number of keys in the JSONObject.
      */
+    @Override
     public int size() {
         // verifyIsNull();
         return this.properties.size();
@@ -2397,6 +2428,7 @@ public JSONArray toJSONArray(JSONArray names) {
      *         brace)</small> and ending with <code>}</code>&nbsp;<small>(right
      *         brace)</small>.
      */
+    @Override
     public String toString() {
         if (isNullObject()) {
             return JSONNull.getInstance().toString();
@@ -2434,6 +2466,7 @@ public String toString() {
      *         brace)</small>.
      * @throws JSONException If the object contains an invalid number.
      */
+    @Override
     public String toString(int indentFactor) {
         if (isNullObject()) {
             return JSONNull.getInstance().toString();
@@ -2457,6 +2490,7 @@ public String toString(int indentFactor) {
      *         and ending with <code>}</code>&nbsp;<small>(right brace)</small>.
      * @throws JSONException If the object contains an invalid number.
      */
+    @Override
     public String toString(int indentFactor, int indent) {
         if (isNullObject()) {
             return JSONNull.getInstance().toString();
@@ -2507,6 +2541,7 @@ public String toString(int indentFactor, int indent) {
         return sb.toString();
     }
 
+    @Override
     public Collection values() {
         return Collections.unmodifiableCollection(properties.values());
     }
@@ -2519,6 +2554,7 @@ public Collection values() {
      *
      * @throws JSONException
      */
+    @Override
     protected void write(Writer writer, WritingVisitor visitor) throws IOException {
         try {
             if (isNullObject()) {
@@ -2569,6 +2605,7 @@ private JSONObject _accumulate(String key, Object value, JsonConfig jsonConfig)
         return this;
     }
 
+    @Override
     protected Object _processValue(Object value, JsonConfig jsonConfig) {
         if (value instanceof JSONTokener) {
             return _fromJSONTokener((JSONTokener) value, jsonConfig);
diff --git a/src/main/java/net/sf/json/JSONString.java b/src/main/java/net/sf/json/JSONString.java
index 95409fa..c90ce66 100644
--- a/src/main/java/net/sf/json/JSONString.java
+++ b/src/main/java/net/sf/json/JSONString.java
@@ -31,5 +31,5 @@ public interface JSONString {
      *
      * @return A strictly syntactically correct JSON text.
      */
-    public String toJSONString();
+    String toJSONString();
 }
diff --git a/src/main/java/net/sf/json/JsonConfig.java b/src/main/java/net/sf/json/JsonConfig.java
index 7be3d51..86596d3 100644
--- a/src/main/java/net/sf/json/JsonConfig.java
+++ b/src/main/java/net/sf/json/JsonConfig.java
@@ -193,6 +193,7 @@ public void clearPropertyExclusions() {
      *
      * @deprecated use clearJavaPropertyNameProcessors() instead
      */
+    @Deprecated
     public void clearPropertyNameProcessors() {
         clearJavaPropertyNameProcessors();
     }
@@ -455,6 +456,7 @@ public JsonValueProcessor findJsonValueProcessor(Class propertyType, String key)
      *
      * @deprecated use findJavaPropertyNameProcessor() instead
      */
+    @Deprecated
     public PropertyNameProcessor findPropertyNameProcessor(Class beanClass) {
         return findJavaPropertyNameProcessor(beanClass);
     }
@@ -670,6 +672,7 @@ public PropertyExclusionClassMatcher getPropertyExclusionClassMatcher() {
      *
      * @deprecated use getJavaPropertyNameProcessorMatcher() instead
      */
+    @Deprecated
     public PropertyNameProcessorMatcher getPropertyNameProcessorMatcher() {
         return getJavaPropertyNameProcessorMatcher();
     }
@@ -942,6 +945,7 @@ public void registerPropertyExclusions(Class target, String[] properties) {
      *
      * @deprecated use registerJavaPropertyNameProcessor() instead
      */
+    @Deprecated
     public void registerPropertyNameProcessor(Class target, PropertyNameProcessor propertyNameProcessor) {
         registerJavaPropertyNameProcessor(target, propertyNameProcessor);
     }
@@ -1308,6 +1312,7 @@ public void setPropertyExclusionClassMatcher(PropertyExclusionClassMatcher prope
      *
      * @deprecated use setJavaPropertyNameProcessorMatcher() instead
      */
+    @Deprecated
     public void setPropertyNameProcessorMatcher(PropertyNameProcessorMatcher propertyNameProcessorMatcher) {
         setJavaPropertyNameProcessorMatcher(propertyNameProcessorMatcher);
     }
@@ -1478,6 +1483,7 @@ public void unregisterPropertyExclusions(Class target) {
      *
      * @deprecated use unregisterJavaPropertyNameProcessor() instead
      */
+    @Deprecated
     public void unregisterPropertyNameProcessor(Class target) {
         unregisterJavaPropertyNameProcessor(target);
     }
diff --git a/src/main/java/net/sf/json/filters/AndPropertyFilter.java b/src/main/java/net/sf/json/filters/AndPropertyFilter.java
index ac2655d..c4c70db 100644
--- a/src/main/java/net/sf/json/filters/AndPropertyFilter.java
+++ b/src/main/java/net/sf/json/filters/AndPropertyFilter.java
@@ -30,6 +30,7 @@ public AndPropertyFilter(PropertyFilter filter1, PropertyFilter filter2) {
         this.filter2 = filter2;
     }
 
+    @Override
     public boolean apply(Object source, String name, Object value) {
         if (filter1 != null
                 && filter1.apply(source, name, value)
diff --git a/src/main/java/net/sf/json/filters/CompositePropertyFilter.java b/src/main/java/net/sf/json/filters/CompositePropertyFilter.java
index b91bbdd..879f4a1 100644
--- a/src/main/java/net/sf/json/filters/CompositePropertyFilter.java
+++ b/src/main/java/net/sf/json/filters/CompositePropertyFilter.java
@@ -48,6 +48,7 @@ public void addPropertyFilter(PropertyFilter filter) {
         }
     }
 
+    @Override
     public boolean apply(Object source, String name, Object value) {
         for (Iterator i = filters.iterator(); i.hasNext(); ) {
             PropertyFilter filter = (PropertyFilter) i.next();
diff --git a/src/main/java/net/sf/json/filters/FalsePropertyFilter.java b/src/main/java/net/sf/json/filters/FalsePropertyFilter.java
index ce8bf07..4389f1c 100644
--- a/src/main/java/net/sf/json/filters/FalsePropertyFilter.java
+++ b/src/main/java/net/sf/json/filters/FalsePropertyFilter.java
@@ -22,6 +22,7 @@
  * @author Andres Almiray <a href="mailto:aalmiray@users.sourceforge.net">aalmiray@users.sourceforge.net</a>
  */
 public class FalsePropertyFilter implements PropertyFilter {
+    @Override
     public boolean apply(Object source, String name, Object value) {
         return false;
     }
diff --git a/src/main/java/net/sf/json/filters/MappingPropertyFilter.java b/src/main/java/net/sf/json/filters/MappingPropertyFilter.java
index 5c1e03f..b463c07 100644
--- a/src/main/java/net/sf/json/filters/MappingPropertyFilter.java
+++ b/src/main/java/net/sf/json/filters/MappingPropertyFilter.java
@@ -50,6 +50,7 @@ public void addPropertyFilter(Object target, PropertyFilter filter) {
         }
     }
 
+    @Override
     public boolean apply(Object source, String name, Object value) {
         for (Iterator i = filters.entrySet().iterator(); i.hasNext(); ) {
             Map.Entry entry = (Map.Entry) i.next();
diff --git a/src/main/java/net/sf/json/filters/NotPropertyFilter.java b/src/main/java/net/sf/json/filters/NotPropertyFilter.java
index 7bff810..69da16a 100644
--- a/src/main/java/net/sf/json/filters/NotPropertyFilter.java
+++ b/src/main/java/net/sf/json/filters/NotPropertyFilter.java
@@ -28,6 +28,7 @@ public NotPropertyFilter(PropertyFilter filter) {
         this.filter = filter;
     }
 
+    @Override
     public boolean apply(Object source, String name, Object value) {
         if (filter != null) {
             return !filter.apply(source, name, value);
diff --git a/src/main/java/net/sf/json/filters/OrPropertyFilter.java b/src/main/java/net/sf/json/filters/OrPropertyFilter.java
index 29a50d4..cbbaa49 100644
--- a/src/main/java/net/sf/json/filters/OrPropertyFilter.java
+++ b/src/main/java/net/sf/json/filters/OrPropertyFilter.java
@@ -30,6 +30,7 @@ public OrPropertyFilter(PropertyFilter filter1, PropertyFilter filter2) {
         this.filter2 = filter2;
     }
 
+    @Override
     public boolean apply(Object source, String name, Object value) {
         if ((filter1 != null && filter1.apply(source, name, value))
                 || (filter2 != null && filter2.apply(source, name, value))) {
diff --git a/src/main/java/net/sf/json/filters/TruePropertyFilter.java b/src/main/java/net/sf/json/filters/TruePropertyFilter.java
index 3d98556..6d65a4e 100644
--- a/src/main/java/net/sf/json/filters/TruePropertyFilter.java
+++ b/src/main/java/net/sf/json/filters/TruePropertyFilter.java
@@ -22,6 +22,7 @@
  * @author Andres Almiray <a href="mailto:aalmiray@users.sourceforge.net">aalmiray@users.sourceforge.net</a>
  */
 public class TruePropertyFilter implements PropertyFilter {
+    @Override
     public boolean apply(Object source, String name, Object value) {
         return true;
     }
diff --git a/src/main/java/net/sf/json/groovy/JsonGroovyBuilder.java b/src/main/java/net/sf/json/groovy/JsonGroovyBuilder.java
index c9764e9..154dbd2 100644
--- a/src/main/java/net/sf/json/groovy/JsonGroovyBuilder.java
+++ b/src/main/java/net/sf/json/groovy/JsonGroovyBuilder.java
@@ -126,6 +126,7 @@ public void setJsonConfig(JsonConfig jsonConfig) {
         this.jsonConfig = jsonConfig;
     }
 
+    @Override
     public Object getProperty(String name) {
         if (!stack.isEmpty()) {
             Object top = stack.peek();
@@ -144,6 +145,7 @@ public Object getProperty(String name) {
         }
     }
 
+    @Override
     public Object invokeMethod(String name, Object arg) {
         if (JSON.equals(name) && stack.isEmpty()) {
             return createObject(name, arg);
@@ -194,6 +196,7 @@ public Object invokeMethod(String name, Object arg) {
         return current;
     }
 
+    @Override
     public void setProperty(String name, Object value) {
         if (value instanceof GString) {
             value = value.toString();
diff --git a/src/main/java/net/sf/json/processors/DefaultDefaultValueProcessor.java b/src/main/java/net/sf/json/processors/DefaultDefaultValueProcessor.java
index d6b69ac..31c5c9a 100644
--- a/src/main/java/net/sf/json/processors/DefaultDefaultValueProcessor.java
+++ b/src/main/java/net/sf/json/processors/DefaultDefaultValueProcessor.java
@@ -26,6 +26,7 @@
  * @author Andres Almiray <a href="mailto:aalmiray@users.sourceforge.net">aalmiray@users.sourceforge.net</a>
  */
 public class DefaultDefaultValueProcessor implements DefaultValueProcessor {
+    @Override
     public Object getDefaultValue(Class type) {
         if (JSONUtils.isArray(type)) {
             return new JSONArray();
diff --git a/src/main/java/net/sf/json/processors/DefaultValueProcessorMatcher.java b/src/main/java/net/sf/json/processors/DefaultValueProcessorMatcher.java
index 05fbf2b..67e22e6 100644
--- a/src/main/java/net/sf/json/processors/DefaultValueProcessorMatcher.java
+++ b/src/main/java/net/sf/json/processors/DefaultValueProcessorMatcher.java
@@ -40,6 +40,7 @@ public abstract class DefaultValueProcessorMatcher {
     public abstract Object getMatch(Class target, Set set);
 
     private static final class DefaultDefaultValueProcessorMatcher extends DefaultValueProcessorMatcher {
+        @Override
         public Object getMatch(Class target, Set set) {
             if (target != null && set != null && set.contains(target)) {
                 return target;
diff --git a/src/main/java/net/sf/json/processors/JsDateJsonBeanProcessor.java b/src/main/java/net/sf/json/processors/JsDateJsonBeanProcessor.java
index 6198ca3..9009118 100644
--- a/src/main/java/net/sf/json/processors/JsDateJsonBeanProcessor.java
+++ b/src/main/java/net/sf/json/processors/JsDateJsonBeanProcessor.java
@@ -44,6 +44,7 @@ public class JsDateJsonBeanProcessor implements JsonBeanProcessor {
     /**
      * Processes the input bean into a compatible JsDate.<br>
      */
+    @Override
     public JSONObject processBean(Object bean, JsonConfig jsonConfig) {
         JSONObject jsonObject = null;
         if (bean instanceof java.sql.Date) {
diff --git a/src/main/java/net/sf/json/processors/JsDateJsonValueProcessor.java b/src/main/java/net/sf/json/processors/JsDateJsonValueProcessor.java
index dac615c..bde19e0 100644
--- a/src/main/java/net/sf/json/processors/JsDateJsonValueProcessor.java
+++ b/src/main/java/net/sf/json/processors/JsDateJsonValueProcessor.java
@@ -32,10 +32,12 @@ public JsDateJsonValueProcessor() {
         processor = new JsDateJsonBeanProcessor();
     }
 
+    @Override
     public Object processArrayValue(Object value, JsonConfig jsonConfig) {
         return process(value, jsonConfig);
     }
 
+    @Override
     public Object processObjectValue(String key, Object value, JsonConfig jsonConfig) {
         return process(value, jsonConfig);
     }
diff --git a/src/main/java/net/sf/json/processors/JsonBeanProcessorMatcher.java b/src/main/java/net/sf/json/processors/JsonBeanProcessorMatcher.java
index cc89818..461f396 100644
--- a/src/main/java/net/sf/json/processors/JsonBeanProcessorMatcher.java
+++ b/src/main/java/net/sf/json/processors/JsonBeanProcessorMatcher.java
@@ -40,6 +40,7 @@ public abstract class JsonBeanProcessorMatcher {
     public abstract Object getMatch(Class target, Set set);
 
     private static final class DefaultJsonBeanProcessorMatcher extends JsonBeanProcessorMatcher {
+        @Override
         public Object getMatch(Class target, Set set) {
             if (target != null && set != null && set.contains(target)) {
                 return target;
diff --git a/src/main/java/net/sf/json/processors/JsonValueProcessorMatcher.java b/src/main/java/net/sf/json/processors/JsonValueProcessorMatcher.java
index 71ad806..7b3c7ae 100644
--- a/src/main/java/net/sf/json/processors/JsonValueProcessorMatcher.java
+++ b/src/main/java/net/sf/json/processors/JsonValueProcessorMatcher.java
@@ -40,6 +40,7 @@ public abstract class JsonValueProcessorMatcher {
     public abstract Object getMatch(Class target, Set set);
 
     private static final class DefaultJsonValueProcessorMatcher extends JsonValueProcessorMatcher {
+        @Override
         public Object getMatch(Class target, Set set) {
             if (target != null && set != null && set.contains(target)) {
                 return target;
diff --git a/src/main/java/net/sf/json/processors/PropertyNameProcessorMatcher.java b/src/main/java/net/sf/json/processors/PropertyNameProcessorMatcher.java
index f4384bd..5731bb4 100644
--- a/src/main/java/net/sf/json/processors/PropertyNameProcessorMatcher.java
+++ b/src/main/java/net/sf/json/processors/PropertyNameProcessorMatcher.java
@@ -40,6 +40,7 @@ public abstract class PropertyNameProcessorMatcher {
     public abstract Object getMatch(Class target, Set set);
 
     private static final class DefaultPropertyNameProcessorMatcher extends PropertyNameProcessorMatcher {
+        @Override
         public Object getMatch(Class target, Set set) {
             if (target != null && set != null && set.contains(target)) {
                 return target;
diff --git a/src/main/java/net/sf/json/regexp/JdkRegexpMatcher.java b/src/main/java/net/sf/json/regexp/JdkRegexpMatcher.java
index 3bb6deb..f3aa524 100644
--- a/src/main/java/net/sf/json/regexp/JdkRegexpMatcher.java
+++ b/src/main/java/net/sf/json/regexp/JdkRegexpMatcher.java
@@ -39,6 +39,7 @@ public JdkRegexpMatcher(String pattern, boolean multiline) {
         }
     }
 
+    @Override
     public String getGroupIfMatches(String str, int group) {
         Matcher matcher = pattern.matcher(str);
         if (matcher.matches()) {
@@ -47,6 +48,7 @@ public String getGroupIfMatches(String str, int group) {
         return "";
     }
 
+    @Override
     public boolean matches(String str) {
         return pattern.matcher(str).matches();
     }
diff --git a/src/main/java/net/sf/json/regexp/Perl5RegexpMatcher.java b/src/main/java/net/sf/json/regexp/Perl5RegexpMatcher.java
index a347bc6..122fceb 100644
--- a/src/main/java/net/sf/json/regexp/Perl5RegexpMatcher.java
+++ b/src/main/java/net/sf/json/regexp/Perl5RegexpMatcher.java
@@ -49,6 +49,7 @@ public Perl5RegexpMatcher(String pattern, boolean multiline) {
         }
     }
 
+    @Override
     public String getGroupIfMatches(String str, int group) {
         PatternMatcher matcher = new Perl5Matcher();
         if (matcher.matches(str, pattern)) {
@@ -57,6 +58,7 @@ public String getGroupIfMatches(String str, int group) {
         return "";
     }
 
+    @Override
     public boolean matches(String str) {
         return new Perl5Matcher().matches(str, pattern);
     }
diff --git a/src/main/java/net/sf/json/util/CycleDetectionStrategy.java b/src/main/java/net/sf/json/util/CycleDetectionStrategy.java
index 444c6e0..c99df94 100644
--- a/src/main/java/net/sf/json/util/CycleDetectionStrategy.java
+++ b/src/main/java/net/sf/json/util/CycleDetectionStrategy.java
@@ -63,10 +63,12 @@ public abstract class CycleDetectionStrategy {
     public abstract JSONObject handleRepeatedReferenceAsObject(Object reference);
 
     private static final class LenientCycleDetectionStrategy extends CycleDetectionStrategy {
+        @Override
         public JSONArray handleRepeatedReferenceAsArray(Object reference) {
             return new JSONArray();
         }
 
+        @Override
         public JSONObject handleRepeatedReferenceAsObject(Object reference) {
             return new JSONObject(true);
         }
@@ -79,20 +81,24 @@ public JSONObject handleRepeatedReferenceAsObject(Object reference) {
      * @author small
      */
     private static final class LenientNoRefCycleDetectionStrategy extends CycleDetectionStrategy {
+        @Override
         public JSONArray handleRepeatedReferenceAsArray(Object reference) {
             return IGNORE_PROPERTY_ARR;
         }
 
+        @Override
         public JSONObject handleRepeatedReferenceAsObject(Object reference) {
             return IGNORE_PROPERTY_OBJ;
         }
     }
 
     private static final class StrictCycleDetectionStrategy extends CycleDetectionStrategy {
+        @Override
         public JSONArray handleRepeatedReferenceAsArray(Object reference) {
             throw new JSONException("There is a cycle in the hierarchy!");
         }
 
+        @Override
         public JSONObject handleRepeatedReferenceAsObject(Object reference) {
             throw new JSONException("There is a cycle in the hierarchy!");
         }
diff --git a/src/main/java/net/sf/json/util/EnumMorpher.java b/src/main/java/net/sf/json/util/EnumMorpher.java
index 6457b51..21cdf99 100644
--- a/src/main/java/net/sf/json/util/EnumMorpher.java
+++ b/src/main/java/net/sf/json/util/EnumMorpher.java
@@ -34,6 +34,7 @@ public EnumMorpher(Class enumClass) {
         this.enumClass = enumClass;
     }
 
+    @Override
     public Object morph(Object value) {
         if (value == null) {
             return enumClass.cast(null);
@@ -41,10 +42,12 @@ public Object morph(Object value) {
         return Enum.valueOf(enumClass, String.valueOf(value));
     }
 
+    @Override
     public Class morphsTo() {
         return enumClass;
     }
 
+    @Override
     public boolean supports(Class clazz) {
         return String.class.isAssignableFrom(clazz);
     }
diff --git a/src/main/java/net/sf/json/util/JSONBuilder.java b/src/main/java/net/sf/json/util/JSONBuilder.java
index 1b750d6..d74e330 100644
--- a/src/main/java/net/sf/json/util/JSONBuilder.java
+++ b/src/main/java/net/sf/json/util/JSONBuilder.java
@@ -73,7 +73,7 @@ public class JSONBuilder {
     /**
      * The object/array stack.
      */
-    private char stack[];
+    private char[] stack;
 
     /**
      * The stack top index. A value of 0 indicates that the stack is empty.
diff --git a/src/main/java/net/sf/json/util/JSONStringer.java b/src/main/java/net/sf/json/util/JSONStringer.java
index 0351b27..a2d3d29 100644
--- a/src/main/java/net/sf/json/util/JSONStringer.java
+++ b/src/main/java/net/sf/json/util/JSONStringer.java
@@ -71,6 +71,7 @@ public JSONStringer() {
      *
      * @return The JSON text.
      */
+    @Override
     public String toString() {
         return this.mode == 'd' ? this.writer.toString() : null;
     }
diff --git a/src/main/java/net/sf/json/util/JSONTokener.java b/src/main/java/net/sf/json/util/JSONTokener.java
index 6fefb5c..467f831 100644
--- a/src/main/java/net/sf/json/util/JSONTokener.java
+++ b/src/main/java/net/sf/json/util/JSONTokener.java
@@ -498,6 +498,7 @@ public JSONException syntaxError(String message) {
      *
      * @return " at character [this.myIndex] of [this.mySource]"
      */
+    @Override
     public String toString() {
         return " at character " + this.myIndex + " of " + this.mySource;
     }
diff --git a/src/main/java/net/sf/json/util/JavaIdentifierTransformer.java b/src/main/java/net/sf/json/util/JavaIdentifierTransformer.java
index 7ced6cc..1b3359c 100644
--- a/src/main/java/net/sf/json/util/JavaIdentifierTransformer.java
+++ b/src/main/java/net/sf/json/util/JavaIdentifierTransformer.java
@@ -71,6 +71,7 @@ protected final String shaveOffNonJavaIdentifierStartChars(String str) {
     }
 
     private static final class CamelCaseJavaIdentifierTransformer extends JavaIdentifierTransformer {
+        @Override
         public String transformToJavaIdentifier(String str) {
             if (str == null) {
                 return null;
@@ -100,18 +101,21 @@ public String transformToJavaIdentifier(String str) {
     }
 
     private static final class NoopJavaIdentifierTransformer extends JavaIdentifierTransformer {
+        @Override
         public String transformToJavaIdentifier(String str) {
             return str;
         }
     }
 
     private static final class StrictJavaIdentifierTransformer extends JavaIdentifierTransformer {
+        @Override
         public String transformToJavaIdentifier(String str) {
             throw new JSONException("'" + str + "' is not a valid Java identifier.");
         }
     }
 
     private static final class UnderscoreJavaIdentifierTransformer extends JavaIdentifierTransformer {
+        @Override
         public String transformToJavaIdentifier(String str) {
             if (str == null) {
                 return null;
@@ -142,6 +146,7 @@ public String transformToJavaIdentifier(String str) {
     }
 
     private static final class WhiteSpaceJavaIdentifierTransformer extends JavaIdentifierTransformer {
+        @Override
         public String transformToJavaIdentifier(String str) {
             if (str == null) {
                 return null;
diff --git a/src/main/java/net/sf/json/util/NewBeanInstanceStrategy.java b/src/main/java/net/sf/json/util/NewBeanInstanceStrategy.java
index 6eb56e3..6e545e2 100644
--- a/src/main/java/net/sf/json/util/NewBeanInstanceStrategy.java
+++ b/src/main/java/net/sf/json/util/NewBeanInstanceStrategy.java
@@ -47,6 +47,7 @@ private static final class DefaultNewBeanInstanceStrategy extends NewBeanInstanc
         private static final Object[] EMPTY_ARGS = new Object[0];
         private static final Class[] EMPTY_PARAM_TYPES = new Class[0];
 
+        @Override
         public Object newInstance(Class target, JSONObject source)
                 throws InstantiationException, IllegalAccessException, SecurityException, NoSuchMethodException,
                         InvocationTargetException {
diff --git a/src/main/java/net/sf/json/util/PropertyExclusionClassMatcher.java b/src/main/java/net/sf/json/util/PropertyExclusionClassMatcher.java
index a4b17c9..2534af7 100644
--- a/src/main/java/net/sf/json/util/PropertyExclusionClassMatcher.java
+++ b/src/main/java/net/sf/json/util/PropertyExclusionClassMatcher.java
@@ -40,6 +40,7 @@ public abstract class PropertyExclusionClassMatcher {
     public abstract Object getMatch(Class target, Set set);
 
     private static final class DefaultPropertyExclusionClassMatcher extends PropertyExclusionClassMatcher {
+        @Override
         public Object getMatch(Class target, Set set) {
             if (target != null && set != null && set.contains(target)) {
                 return target;
diff --git a/src/main/java/net/sf/json/util/PropertySetStrategy.java b/src/main/java/net/sf/json/util/PropertySetStrategy.java
index 52ae9d5..2f565ed 100644
--- a/src/main/java/net/sf/json/util/PropertySetStrategy.java
+++ b/src/main/java/net/sf/json/util/PropertySetStrategy.java
@@ -39,10 +39,12 @@ public void setProperty(Object bean, String key, Object value, JsonConfig jsonCo
     }
 
     private static final class DefaultPropertySetStrategy extends PropertySetStrategy {
+        @Override
         public void setProperty(Object bean, String key, Object value) throws JSONException {
             setProperty(bean, key, value, new JsonConfig());
         }
 
+        @Override
         public void setProperty(Object bean, String key, Object value, JsonConfig jsonConfig) throws JSONException {
             if (bean instanceof Map) {
                 ((Map) bean).put(key, value);
diff --git a/src/main/java/net/sf/json/util/WebHijackPreventionStrategy.java b/src/main/java/net/sf/json/util/WebHijackPreventionStrategy.java
index 05b0c8e..575814d 100644
--- a/src/main/java/net/sf/json/util/WebHijackPreventionStrategy.java
+++ b/src/main/java/net/sf/json/util/WebHijackPreventionStrategy.java
@@ -41,12 +41,14 @@ public abstract class WebHijackPreventionStrategy {
     public abstract String protect(String str);
 
     private static final class CommentWebHijackPreventionStrategy extends WebHijackPreventionStrategy {
+        @Override
         public String protect(String str) {
             return "/*" + str + "*/";
         }
     }
 
     private static final class InfiniteLoopWebHijackPreventionStrategy extends WebHijackPreventionStrategy {
+        @Override
         public String protect(String str) {
             return "while(1);" + str;
         }
diff --git a/src/main/java/net/sf/json/xml/XMLSerializer.java b/src/main/java/net/sf/json/xml/XMLSerializer.java
index 699ada1..4821c85 100644
--- a/src/main/java/net/sf/json/xml/XMLSerializer.java
+++ b/src/main/java/net/sf/json/xml/XMLSerializer.java
@@ -1353,6 +1353,7 @@ public XomSerializer(OutputStream out, String encoding) throws UnsupportedEncodi
             super(out, encoding);
         }
 
+        @Override
         protected void write(Text text) throws IOException {
             String value = text.getValue();
             if (value.startsWith("<![CDATA[") && value.endsWith("]]>")) {
@@ -1366,6 +1367,7 @@ protected void write(Text text) throws IOException {
             }
         }
 
+        @Override
         protected void writeEmptyElementTag(Element element) throws IOException {
             if (element instanceof CustomElement && isNamespaceLenient()) {
                 writeTagBeginning((CustomElement) element);
@@ -1375,6 +1377,7 @@ protected void writeEmptyElementTag(Element element) throws IOException {
             }
         }
 
+        @Override
         protected void writeEndTag(Element element) throws IOException {
             if (element instanceof CustomElement && isNamespaceLenient()) {
                 writeRaw("</");
@@ -1385,12 +1388,14 @@ protected void writeEndTag(Element element) throws IOException {
             }
         }
 
+        @Override
         protected void writeNamespaceDeclaration(String prefix, String uri) throws IOException {
             if (!StringUtils.isBlank(uri)) {
                 super.writeNamespaceDeclaration(prefix, uri);
             }
         }
 
+        @Override
         protected void writeStartTag(Element element) throws IOException {
             if (element instanceof CustomElement && isNamespaceLenient()) {
                 writeTagBeginning((CustomElement) element);
diff --git a/src/test/java/net/sf/ezmorph/MorpherRegistryTest.java b/src/test/java/net/sf/ezmorph/MorpherRegistryTest.java
index 157f19b..ecd4b68 100644
--- a/src/test/java/net/sf/ezmorph/MorpherRegistryTest.java
+++ b/src/test/java/net/sf/ezmorph/MorpherRegistryTest.java
@@ -292,10 +292,12 @@ public void testRegistry_standardMorphers() {
     public void testRegistry_wacky_morpher() {
         morpherRegistry.registerMorpher(new Morpher() {
             // no mroph() method
+            @Override
             public Class morphsTo() {
                 return String.class;
             }
 
+            @Override
             public boolean supports(Class clazz) {
                 return true;
             }
@@ -309,6 +311,7 @@ public boolean supports(Class clazz) {
         }
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpherRegistry = new MorpherRegistry();
     }
diff --git a/src/test/java/net/sf/ezmorph/array/AbstractArrayMorpherTestCase.java b/src/test/java/net/sf/ezmorph/array/AbstractArrayMorpherTestCase.java
index 449111c..d16276e 100644
--- a/src/test/java/net/sf/ezmorph/array/AbstractArrayMorpherTestCase.java
+++ b/src/test/java/net/sf/ezmorph/array/AbstractArrayMorpherTestCase.java
@@ -49,10 +49,12 @@ public void testEquals_another_Morpher() {
 
     public void testEquals_different_morpher() {
         assertFalse(getMorpher().equals(new Morpher() {
+            @Override
             public Class morphsTo() {
                 return null;
             }
 
+            @Override
             public boolean supports(Class clazz) {
                 return false;
             }
diff --git a/src/test/java/net/sf/ezmorph/array/BooleanArrayMorpherTest.java b/src/test/java/net/sf/ezmorph/array/BooleanArrayMorpherTest.java
index f9a15c5..24d6776 100644
--- a/src/test/java/net/sf/ezmorph/array/BooleanArrayMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/array/BooleanArrayMorpherTest.java
@@ -99,26 +99,32 @@ public void testMorph_throwException() {
         }
     }
 
+    @Override
     protected AbstractArrayMorpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected AbstractArrayMorpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected AbstractArrayMorpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected AbstractArrayMorpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected Class getMorphsToClass() {
         return boolean[].class;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new BooleanArrayMorpher();
         morpherWithDefaultValue = new BooleanArrayMorpher(true);
diff --git a/src/test/java/net/sf/ezmorph/array/BooleanObjectArrayMorpherTest.java b/src/test/java/net/sf/ezmorph/array/BooleanObjectArrayMorpherTest.java
index 67e5e34..cae644f 100644
--- a/src/test/java/net/sf/ezmorph/array/BooleanObjectArrayMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/array/BooleanObjectArrayMorpherTest.java
@@ -137,26 +137,32 @@ public void testMorph_throwException() {
         }
     }
 
+    @Override
     protected AbstractArrayMorpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected AbstractArrayMorpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected AbstractArrayMorpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected AbstractArrayMorpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected Class getMorphsToClass() {
         return Boolean[].class;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new BooleanObjectArrayMorpher();
         morpherWithDefaultValue = new BooleanObjectArrayMorpher(Boolean.TRUE);
diff --git a/src/test/java/net/sf/ezmorph/array/ByteArrayMorpherTest.java b/src/test/java/net/sf/ezmorph/array/ByteArrayMorpherTest.java
index 8bc23ea..a4ea765 100644
--- a/src/test/java/net/sf/ezmorph/array/ByteArrayMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/array/ByteArrayMorpherTest.java
@@ -99,26 +99,32 @@ public void testMorph_throwException() {
         }
     }
 
+    @Override
     protected AbstractArrayMorpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected AbstractArrayMorpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected AbstractArrayMorpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected AbstractArrayMorpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected Class getMorphsToClass() {
         return byte[].class;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new ByteArrayMorpher();
         morpherWithDefaultValue = new ByteArrayMorpher((byte) 0);
diff --git a/src/test/java/net/sf/ezmorph/array/CharArrayMorpherTest.java b/src/test/java/net/sf/ezmorph/array/CharArrayMorpherTest.java
index 78e0702..c8ce4a5 100644
--- a/src/test/java/net/sf/ezmorph/array/CharArrayMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/array/CharArrayMorpherTest.java
@@ -99,26 +99,32 @@ public void testMorph_throwException() {
         }
     }
 
+    @Override
     protected AbstractArrayMorpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected AbstractArrayMorpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected AbstractArrayMorpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected AbstractArrayMorpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected Class getMorphsToClass() {
         return char[].class;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new CharArrayMorpher();
         morpherWithDefaultValue = new CharArrayMorpher('A');
diff --git a/src/test/java/net/sf/ezmorph/array/CharacterObjectArrayMorpherTest.java b/src/test/java/net/sf/ezmorph/array/CharacterObjectArrayMorpherTest.java
index 6c74f84..5b22bb7 100644
--- a/src/test/java/net/sf/ezmorph/array/CharacterObjectArrayMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/array/CharacterObjectArrayMorpherTest.java
@@ -124,26 +124,32 @@ public void testMorph_strings_twodims() {
         ArrayAssertions.assertEquals(new Character[][] {{new Character('A')}, {new Character('B')}}, actual);
     }
 
+    @Override
     protected AbstractArrayMorpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected AbstractArrayMorpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected AbstractArrayMorpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected AbstractArrayMorpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected Class getMorphsToClass() {
         return Character[].class;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new CharacterObjectArrayMorpher();
         morpherWithDefaultValue = new CharacterObjectArrayMorpher(new Character('A'));
diff --git a/src/test/java/net/sf/ezmorph/array/DoubleArrayMorpherTest.java b/src/test/java/net/sf/ezmorph/array/DoubleArrayMorpherTest.java
index 604ed6b..00edf89 100644
--- a/src/test/java/net/sf/ezmorph/array/DoubleArrayMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/array/DoubleArrayMorpherTest.java
@@ -99,26 +99,32 @@ public void testMorph_throwException() {
         }
     }
 
+    @Override
     protected AbstractArrayMorpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected AbstractArrayMorpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected AbstractArrayMorpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected AbstractArrayMorpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected Class getMorphsToClass() {
         return double[].class;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new DoubleArrayMorpher();
         morpherWithDefaultValue = new DoubleArrayMorpher(0);
diff --git a/src/test/java/net/sf/ezmorph/array/FloatArrayMorpherTest.java b/src/test/java/net/sf/ezmorph/array/FloatArrayMorpherTest.java
index 4b3c098..d80d990 100644
--- a/src/test/java/net/sf/ezmorph/array/FloatArrayMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/array/FloatArrayMorpherTest.java
@@ -99,26 +99,32 @@ public void testMorph_throwException() {
         }
     }
 
+    @Override
     protected AbstractArrayMorpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected AbstractArrayMorpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected AbstractArrayMorpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected AbstractArrayMorpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected Class getMorphsToClass() {
         return float[].class;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new FloatArrayMorpher();
         morpherWithDefaultValue = new FloatArrayMorpher(0);
diff --git a/src/test/java/net/sf/ezmorph/array/IntArrayMorpherTest.java b/src/test/java/net/sf/ezmorph/array/IntArrayMorpherTest.java
index 4a423fe..c787af4 100644
--- a/src/test/java/net/sf/ezmorph/array/IntArrayMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/array/IntArrayMorpherTest.java
@@ -99,26 +99,32 @@ public void testMorph_throwException() {
         }
     }
 
+    @Override
     protected AbstractArrayMorpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected AbstractArrayMorpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected AbstractArrayMorpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected AbstractArrayMorpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected Class getMorphsToClass() {
         return int[].class;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new IntArrayMorpher();
         morpherWithDefaultValue = new IntArrayMorpher(0);
diff --git a/src/test/java/net/sf/ezmorph/array/LongArrayMorpherTest.java b/src/test/java/net/sf/ezmorph/array/LongArrayMorpherTest.java
index c4447d4..59774fa 100644
--- a/src/test/java/net/sf/ezmorph/array/LongArrayMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/array/LongArrayMorpherTest.java
@@ -99,26 +99,32 @@ public void testMorph_throwException() {
         }
     }
 
+    @Override
     protected AbstractArrayMorpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected AbstractArrayMorpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected AbstractArrayMorpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected AbstractArrayMorpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected Class getMorphsToClass() {
         return long[].class;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new LongArrayMorpher();
         morpherWithDefaultValue = new LongArrayMorpher(0);
diff --git a/src/test/java/net/sf/ezmorph/array/ObjectArrayMorpherTest.java b/src/test/java/net/sf/ezmorph/array/ObjectArrayMorpherTest.java
index 5a72145..2cd82a0 100644
--- a/src/test/java/net/sf/ezmorph/array/ObjectArrayMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/array/ObjectArrayMorpherTest.java
@@ -64,10 +64,12 @@ public void testEquals_another_Morpher() {
 
     public void testEquals_different_morpher() {
         assertFalse(getMorpher().equals(new Morpher() {
+            @Override
             public Class morphsTo() {
                 return null;
             }
 
+            @Override
             public boolean supports(Class clazz) {
                 return false;
             }
@@ -141,10 +143,12 @@ public void testMorphsTo() {
     public void testObjectArrayMorpher_illegalMorpher_noMorphMethod() {
         try {
             morpher = new ObjectArrayMorpher(new Morpher() {
+                @Override
                 public Class morphsTo() {
                     return Object.class;
                 }
 
+                @Override
                 public boolean supports(Class clazz) {
                     return false;
                 }
@@ -165,10 +169,12 @@ public void testObjectArrayMorpher_illegalMorpher_nullMorpher() {
     public void testObjectArrayMorpher_illegalMorpher_supportsArray() {
         try {
             morpher = new ObjectArrayMorpher(new Morpher() {
+                @Override
                 public Class morphsTo() {
                     return Object[].class;
                 }
 
+                @Override
                 public boolean supports(Class clazz) {
                     return false;
                 }
@@ -178,6 +184,7 @@ public boolean supports(Class clazz) {
         }
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new ObjectArrayMorpher(StringMorpher.getInstance());
         anotherMorpher = new ObjectArrayMorpher(IdentityObjectMorpher.getInstance());
diff --git a/src/test/java/net/sf/ezmorph/array/ShortArrayMorpherTest.java b/src/test/java/net/sf/ezmorph/array/ShortArrayMorpherTest.java
index 8594360..13b4dab 100644
--- a/src/test/java/net/sf/ezmorph/array/ShortArrayMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/array/ShortArrayMorpherTest.java
@@ -99,26 +99,32 @@ public void testMorph_throwException() {
         }
     }
 
+    @Override
     protected AbstractArrayMorpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected AbstractArrayMorpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected AbstractArrayMorpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected AbstractArrayMorpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected Class getMorphsToClass() {
         return short[].class;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new ShortArrayMorpher();
         morpherWithDefaultValue = new ShortArrayMorpher((short) 0);
diff --git a/src/test/java/net/sf/ezmorph/bean/BeanMorpherTest.java b/src/test/java/net/sf/ezmorph/bean/BeanMorpherTest.java
index d4d5e90..2ad46fa 100644
--- a/src/test/java/net/sf/ezmorph/bean/BeanMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/bean/BeanMorpherTest.java
@@ -407,6 +407,7 @@ public void testMorph_BeanA_to_BeanD() {
         assertEquals(0d, beanD.getDecimal(), 0d);
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpherRegistry = new MorpherRegistry();
         MorphUtils.registerStandardMorphers(morpherRegistry);
diff --git a/src/test/java/net/sf/ezmorph/bean/MorphDynaBeanTest.java b/src/test/java/net/sf/ezmorph/bean/MorphDynaBeanTest.java
index 31a48ef..70e8a52 100644
--- a/src/test/java/net/sf/ezmorph/bean/MorphDynaBeanTest.java
+++ b/src/test/java/net/sf/ezmorph/bean/MorphDynaBeanTest.java
@@ -257,6 +257,7 @@ public void testSet_unmapped() {
         }
     }
 
+    @Override
     protected void setUp() throws Exception {
         Map properties = new HashMap();
         properties.put("byte", Byte.class);
diff --git a/src/test/java/net/sf/ezmorph/bean/sample/BeanA.java b/src/test/java/net/sf/ezmorph/bean/sample/BeanA.java
index 9f1e42f..396f82d 100644
--- a/src/test/java/net/sf/ezmorph/bean/sample/BeanA.java
+++ b/src/test/java/net/sf/ezmorph/bean/sample/BeanA.java
@@ -29,6 +29,7 @@ public class BeanA {
     private int integer = 42;
     private String string = "morph";
 
+    @Override
     public boolean equals(Object obj) {
         if (obj == this) {
             return true;
@@ -50,6 +51,7 @@ public String getString() {
         return string;
     }
 
+    @Override
     public int hashCode() {
         return HashCodeBuilder.reflectionHashCode(this);
     }
@@ -70,6 +72,7 @@ public void setString(String string) {
         this.string = string;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/ezmorph/bean/sample/BeanB.java b/src/test/java/net/sf/ezmorph/bean/sample/BeanB.java
index eb7ed98..bd2c2ff 100644
--- a/src/test/java/net/sf/ezmorph/bean/sample/BeanB.java
+++ b/src/test/java/net/sf/ezmorph/bean/sample/BeanB.java
@@ -33,6 +33,7 @@ public void setIntarray(int[] intarray) {
         this.intarray = intarray;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/ezmorph/bean/sample/BeanC.java b/src/test/java/net/sf/ezmorph/bean/sample/BeanC.java
index b5f1f04..700aecd 100644
--- a/src/test/java/net/sf/ezmorph/bean/sample/BeanC.java
+++ b/src/test/java/net/sf/ezmorph/bean/sample/BeanC.java
@@ -42,6 +42,7 @@ public void setBeanB(BeanB beanB) {
         this.beanB = beanB;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/ezmorph/bean/sample/BeanD.java b/src/test/java/net/sf/ezmorph/bean/sample/BeanD.java
index a79a61e..7850ca0 100644
--- a/src/test/java/net/sf/ezmorph/bean/sample/BeanD.java
+++ b/src/test/java/net/sf/ezmorph/bean/sample/BeanD.java
@@ -29,6 +29,7 @@ public class BeanD {
     private double decimal = 0d;
     private int integer = 42;
 
+    @Override
     public boolean equals(Object obj) {
         if (obj == this) {
             return true;
@@ -50,6 +51,7 @@ public int getInteger() {
         return integer;
     }
 
+    @Override
     public int hashCode() {
         return HashCodeBuilder.reflectionHashCode(this);
     }
@@ -70,6 +72,7 @@ public void setInteger(int integer) {
         this.integer = integer;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/ezmorph/bean/sample/ObjectBean.java b/src/test/java/net/sf/ezmorph/bean/sample/ObjectBean.java
index 2ea3520..56ba936 100644
--- a/src/test/java/net/sf/ezmorph/bean/sample/ObjectBean.java
+++ b/src/test/java/net/sf/ezmorph/bean/sample/ObjectBean.java
@@ -150,6 +150,7 @@ public void setPstring(Object pstring) {
         this.pstring = pstring;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/ezmorph/bean/sample/PrimitiveBean.java b/src/test/java/net/sf/ezmorph/bean/sample/PrimitiveBean.java
index 96dbdb3..0bab49d 100644
--- a/src/test/java/net/sf/ezmorph/bean/sample/PrimitiveBean.java
+++ b/src/test/java/net/sf/ezmorph/bean/sample/PrimitiveBean.java
@@ -152,6 +152,7 @@ public void setPstring(String pstring) {
         this.pstring = pstring;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/ezmorph/bean/sample/TypedBean.java b/src/test/java/net/sf/ezmorph/bean/sample/TypedBean.java
index 721a63c..c8782c9 100644
--- a/src/test/java/net/sf/ezmorph/bean/sample/TypedBean.java
+++ b/src/test/java/net/sf/ezmorph/bean/sample/TypedBean.java
@@ -152,6 +152,7 @@ public void setPstring(String pstring) {
         this.pstring = pstring;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/ezmorph/object/AbstractObjectMorpherTestCase.java b/src/test/java/net/sf/ezmorph/object/AbstractObjectMorpherTestCase.java
index b800534..660546a 100644
--- a/src/test/java/net/sf/ezmorph/object/AbstractObjectMorpherTestCase.java
+++ b/src/test/java/net/sf/ezmorph/object/AbstractObjectMorpherTestCase.java
@@ -49,10 +49,12 @@ public void testEquals_another_Morpher() {
 
     public void testEquals_different_morpher() {
         assertFalse(getMorpher().equals(new Morpher() {
+            @Override
             public Class morphsTo() {
                 return null;
             }
 
+            @Override
             public boolean supports(Class clazz) {
                 return false;
             }
diff --git a/src/test/java/net/sf/ezmorph/object/BigDecimalMorpherTest.java b/src/test/java/net/sf/ezmorph/object/BigDecimalMorpherTest.java
index f0f5879..3a97b7b 100644
--- a/src/test/java/net/sf/ezmorph/object/BigDecimalMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/object/BigDecimalMorpherTest.java
@@ -138,22 +138,27 @@ public void testBigDecimalMorph_useDefault_null() {
         assertEquals(MorphUtils.BIGDECIMAL_ZERO, actual);
     }
 
+    @Override
     protected Morpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected Morpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected Morpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected Morpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new BigDecimalMorpher();
         morpherWithDefaultValue = new BigDecimalMorpher(MorphUtils.BIGDECIMAL_ZERO);
diff --git a/src/test/java/net/sf/ezmorph/object/BigIntegerMorpherTest.java b/src/test/java/net/sf/ezmorph/object/BigIntegerMorpherTest.java
index b2e88a1..5a15ab8 100644
--- a/src/test/java/net/sf/ezmorph/object/BigIntegerMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/object/BigIntegerMorpherTest.java
@@ -152,22 +152,27 @@ public void testBigIntegerMorph_useDefault_null() {
         assertEquals(BigInteger.ZERO, actual);
     }
 
+    @Override
     protected Morpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected Morpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected Morpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected Morpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new BigIntegerMorpher();
         morpherWithDefaultValue = new BigIntegerMorpher(BigInteger.ZERO);
diff --git a/src/test/java/net/sf/ezmorph/object/BooleanObjectMorpherTest.java b/src/test/java/net/sf/ezmorph/object/BooleanObjectMorpherTest.java
index 7c55423..77ebe1b 100644
--- a/src/test/java/net/sf/ezmorph/object/BooleanObjectMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/object/BooleanObjectMorpherTest.java
@@ -93,22 +93,27 @@ public void testBooleanMorphStringValues_true() {
         assertEquals(Boolean.TRUE, new BooleanObjectMorpher().morph("on"));
     }
 
+    @Override
     protected Morpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected Morpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected Morpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected Morpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new BooleanObjectMorpher();
         morpherWithDefaultValue = new BooleanObjectMorpher(Boolean.TRUE);
diff --git a/src/test/java/net/sf/ezmorph/object/CharacterObjectMorpherTest.java b/src/test/java/net/sf/ezmorph/object/CharacterObjectMorpherTest.java
index 36162ed..2f83652 100644
--- a/src/test/java/net/sf/ezmorph/object/CharacterObjectMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/object/CharacterObjectMorpherTest.java
@@ -89,22 +89,27 @@ public void testCharMorph_useDefault_null() {
         assertEquals(new Character('A'), actual);
     }
 
+    @Override
     protected Morpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected Morpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected Morpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected Morpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new CharacterObjectMorpher();
         morpherWithDefaultValue = new CharacterObjectMorpher(new Character('A'));
diff --git a/src/test/java/net/sf/ezmorph/object/ClassMorpherTest.java b/src/test/java/net/sf/ezmorph/object/ClassMorpherTest.java
index 449748a..3b487c5 100644
--- a/src/test/java/net/sf/ezmorph/object/ClassMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/object/ClassMorpherTest.java
@@ -104,6 +104,7 @@ public void testMorph_withtoString() {
     }
 
     public static class MyClass {
+        @Override
         public String toString() {
             return MyClass.class.getName();
         }
diff --git a/src/test/java/net/sf/ezmorph/object/DateMorpherTest.java b/src/test/java/net/sf/ezmorph/object/DateMorpherTest.java
index b9f8a1f..42287ff 100644
--- a/src/test/java/net/sf/ezmorph/object/DateMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/object/DateMorpherTest.java
@@ -128,22 +128,27 @@ public void testMorph_useDefault() {
         assertEquals(expected, actual);
     }
 
+    @Override
     protected Morpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected Morpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected Morpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected Morpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new DateMorpher(new String[] {"yyyy-MM-dd", "MM/dd/yyyy"});
         morpherWithDefaultValue = new DateMorpher(new String[] {"yyyy-MM-dd", "MM/dd/yyyy"}, new Date());
diff --git a/src/test/java/net/sf/ezmorph/object/MapToDateMorpherTest.java b/src/test/java/net/sf/ezmorph/object/MapToDateMorpherTest.java
index 73eaf20..6fc6a26 100644
--- a/src/test/java/net/sf/ezmorph/object/MapToDateMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/object/MapToDateMorpherTest.java
@@ -101,22 +101,27 @@ public void testMorph_useDefault() {
         assertEquals(expected, actual);
     }
 
+    @Override
     protected Morpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected Morpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected Morpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected Morpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new MapToDateMorpher();
         morpherWithDefaultValue = new MapToDateMorpher(new Date());
diff --git a/src/test/java/net/sf/ezmorph/object/NumberMorpherTest.java b/src/test/java/net/sf/ezmorph/object/NumberMorpherTest.java
index 84098d9..07720ad 100644
--- a/src/test/java/net/sf/ezmorph/object/NumberMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/object/NumberMorpherTest.java
@@ -385,22 +385,27 @@ public void testShortConversion_useDefault_null() {
         assertNull(morpher.morph(new Object()));
     }
 
+    @Override
     protected Morpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected Morpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected Morpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected Morpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new NumberMorpher(Integer.class);
         morpherWithDefaultValue = new NumberMorpher(Integer.class, new Integer(0));
diff --git a/src/test/java/net/sf/ezmorph/object/ObjectListMorpherTest.java b/src/test/java/net/sf/ezmorph/object/ObjectListMorpherTest.java
index 5c683b9..178b825 100644
--- a/src/test/java/net/sf/ezmorph/object/ObjectListMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/object/ObjectListMorpherTest.java
@@ -110,10 +110,12 @@ public void testMorph_StringList() {
     public void testObjectListMorpher_illegalMorpher_noMorphMethod() {
         try {
             morpher = new ObjectListMorpher(new Morpher() {
+                @Override
                 public Class morphsTo() {
                     return Object.class;
                 }
 
+                @Override
                 public boolean supports(Class clazz) {
                     return false;
                 }
@@ -134,10 +136,12 @@ public void testObjectListMorpher_illegalMorpher_nullMorpher() {
     public void testObjectListMorpher_illegalMorpher_supportsList() {
         try {
             morpher = new ObjectListMorpher(new Morpher() {
+                @Override
                 public Class morphsTo() {
                     return List.class;
                 }
 
+                @Override
                 public boolean supports(Class clazz) {
                     return false;
                 }
@@ -147,22 +151,27 @@ public boolean supports(Class clazz) {
         }
     }
 
+    @Override
     protected Morpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected Morpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected Morpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected Morpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new ObjectListMorpher(new NumberMorpher(Integer.class));
         morpherWithDefaultValue =
diff --git a/src/test/java/net/sf/ezmorph/object/SwitchingMorpherTest.java b/src/test/java/net/sf/ezmorph/object/SwitchingMorpherTest.java
index 750ff2b..4ad3afc 100644
--- a/src/test/java/net/sf/ezmorph/object/SwitchingMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/object/SwitchingMorpherTest.java
@@ -74,6 +74,7 @@ public void testMorph_null() {
         assertNull(morpher.morph(null));
     }
 
+    @Override
     protected void setUp() throws Exception {
         Map classMap = new HashMap();
         classMap.put(WrapperA.class, BeanA.class);
diff --git a/src/test/java/net/sf/ezmorph/object/sample/BeanA.java b/src/test/java/net/sf/ezmorph/object/sample/BeanA.java
index b19e36c..de96826 100644
--- a/src/test/java/net/sf/ezmorph/object/sample/BeanA.java
+++ b/src/test/java/net/sf/ezmorph/object/sample/BeanA.java
@@ -27,6 +27,7 @@
 public class BeanA {
     private int integer = 42;
 
+    @Override
     public boolean equals(Object obj) {
         if (obj == this) {
             return true;
@@ -44,6 +45,7 @@ public int getInteger() {
         return integer;
     }
 
+    @Override
     public int hashCode() {
         return HashCodeBuilder.reflectionHashCode(this);
     }
@@ -52,6 +54,7 @@ public void setInteger(int integer) {
         this.integer = integer;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/ezmorph/object/sample/BeanB.java b/src/test/java/net/sf/ezmorph/object/sample/BeanB.java
index ef7d7fc..0baee86 100644
--- a/src/test/java/net/sf/ezmorph/object/sample/BeanB.java
+++ b/src/test/java/net/sf/ezmorph/object/sample/BeanB.java
@@ -27,6 +27,7 @@
 public class BeanB {
     private boolean bool = true;
 
+    @Override
     public boolean equals(Object obj) {
         if (obj == this) {
             return true;
@@ -40,6 +41,7 @@ public boolean equals(Object obj) {
         return EqualsBuilder.reflectionEquals(this, obj);
     }
 
+    @Override
     public int hashCode() {
         return HashCodeBuilder.reflectionHashCode(this);
     }
@@ -52,6 +54,7 @@ public void setBool(boolean bool) {
         this.bool = bool;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/ezmorph/object/sample/WrapperA.java b/src/test/java/net/sf/ezmorph/object/sample/WrapperA.java
index 8ec715c..394891b 100644
--- a/src/test/java/net/sf/ezmorph/object/sample/WrapperA.java
+++ b/src/test/java/net/sf/ezmorph/object/sample/WrapperA.java
@@ -27,6 +27,7 @@
 public class WrapperA {
     private String integer = "42";
 
+    @Override
     public boolean equals(Object obj) {
         if (obj == this) {
             return true;
@@ -44,6 +45,7 @@ public String getInteger() {
         return integer;
     }
 
+    @Override
     public int hashCode() {
         return HashCodeBuilder.reflectionHashCode(this);
     }
@@ -52,6 +54,7 @@ public void setInteger(String integer) {
         this.integer = integer;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/ezmorph/object/sample/WrapperB.java b/src/test/java/net/sf/ezmorph/object/sample/WrapperB.java
index 55043a3..f4bc94b 100644
--- a/src/test/java/net/sf/ezmorph/object/sample/WrapperB.java
+++ b/src/test/java/net/sf/ezmorph/object/sample/WrapperB.java
@@ -27,6 +27,7 @@
 public class WrapperB {
     private String bool = "true";
 
+    @Override
     public boolean equals(Object obj) {
         if (obj == this) {
             return true;
@@ -44,6 +45,7 @@ public String getBool() {
         return bool;
     }
 
+    @Override
     public int hashCode() {
         return HashCodeBuilder.reflectionHashCode(this);
     }
@@ -52,6 +54,7 @@ public void setBool(String bool) {
         this.bool = bool;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/ezmorph/primitive/AbstractMorpherTestCase.java b/src/test/java/net/sf/ezmorph/primitive/AbstractMorpherTestCase.java
index 907625f..52856c4 100644
--- a/src/test/java/net/sf/ezmorph/primitive/AbstractMorpherTestCase.java
+++ b/src/test/java/net/sf/ezmorph/primitive/AbstractMorpherTestCase.java
@@ -49,10 +49,12 @@ public void testEquals_another_Morpher() {
 
     public void testEquals_different_morpher() {
         assertFalse(getMorpher().equals(new Morpher() {
+            @Override
             public Class morphsTo() {
                 return null;
             }
 
+            @Override
             public boolean supports(Class clazz) {
                 return false;
             }
diff --git a/src/test/java/net/sf/ezmorph/primitive/BooleanMorpherTest.java b/src/test/java/net/sf/ezmorph/primitive/BooleanMorpherTest.java
index a0dd573..65ec5ea 100644
--- a/src/test/java/net/sf/ezmorph/primitive/BooleanMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/primitive/BooleanMorpherTest.java
@@ -124,26 +124,32 @@ public void testBooleanMorphStringValues_true() {
         assertTrue(((BooleanMorpher) getMorpher()).morph("on"));
     }
 
+    @Override
     protected Morpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected Morpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected Morpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected Morpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected Class getMorphsToClass() {
         return Boolean.TYPE;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new BooleanMorpher();
         morpherWithDefaultValue = new BooleanMorpher(true);
diff --git a/src/test/java/net/sf/ezmorph/primitive/ByteMorpherTest.java b/src/test/java/net/sf/ezmorph/primitive/ByteMorpherTest.java
index 1c11016..d38bb4b 100644
--- a/src/test/java/net/sf/ezmorph/primitive/ByteMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/primitive/ByteMorpherTest.java
@@ -117,26 +117,32 @@ public void testByteMorphMinValue_String() {
         assertEquals(expected, String.valueOf(actual));
     }
 
+    @Override
     protected Morpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected Morpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected Class getMorphsToClass() {
         return Byte.TYPE;
     }
 
+    @Override
     protected Morpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected Morpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new ByteMorpher();
         morpherWithDefaultValue = new ByteMorpher((byte) 0);
diff --git a/src/test/java/net/sf/ezmorph/primitive/CharMorpherTest.java b/src/test/java/net/sf/ezmorph/primitive/CharMorpherTest.java
index a26e2ae..d9e04ce 100644
--- a/src/test/java/net/sf/ezmorph/primitive/CharMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/primitive/CharMorpherTest.java
@@ -82,26 +82,32 @@ public void testCharMorph_useDefault_null() {
         assertEquals('A', actual);
     }
 
+    @Override
     protected Morpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected Morpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected Class getMorphsToClass() {
         return Character.TYPE;
     }
 
+    @Override
     protected Morpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected Morpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new CharMorpher();
         morpherWithDefaultValue = new CharMorpher('A');
diff --git a/src/test/java/net/sf/ezmorph/primitive/DoubleMorpherTest.java b/src/test/java/net/sf/ezmorph/primitive/DoubleMorpherTest.java
index 6443fe8..db1a20f 100644
--- a/src/test/java/net/sf/ezmorph/primitive/DoubleMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/primitive/DoubleMorpherTest.java
@@ -112,26 +112,32 @@ public void testDoubleMorphMinValue_String() {
         assertEquals(expected, String.valueOf(actual));
     }
 
+    @Override
     protected Morpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected Morpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected Class getMorphsToClass() {
         return Double.TYPE;
     }
 
+    @Override
     protected Morpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected Morpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new DoubleMorpher();
         morpherWithDefaultValue = new DoubleMorpher(0);
diff --git a/src/test/java/net/sf/ezmorph/primitive/FloatMorpherTest.java b/src/test/java/net/sf/ezmorph/primitive/FloatMorpherTest.java
index 33c77f3..8368558 100644
--- a/src/test/java/net/sf/ezmorph/primitive/FloatMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/primitive/FloatMorpherTest.java
@@ -117,26 +117,32 @@ public void testFloatMorphMinValue_String() {
         assertEquals(expected, String.valueOf(actual));
     }
 
+    @Override
     protected Morpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected Morpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected Class getMorphsToClass() {
         return Float.TYPE;
     }
 
+    @Override
     protected Morpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected Morpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new FloatMorpher();
         morpherWithDefaultValue = new FloatMorpher(0);
diff --git a/src/test/java/net/sf/ezmorph/primitive/IntMorpherTest.java b/src/test/java/net/sf/ezmorph/primitive/IntMorpherTest.java
index ba00396..7cb1b38 100644
--- a/src/test/java/net/sf/ezmorph/primitive/IntMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/primitive/IntMorpherTest.java
@@ -117,26 +117,32 @@ public void testIntMorphMinValue_String() {
         assertEquals(expected, String.valueOf(actual));
     }
 
+    @Override
     protected Morpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected Morpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected Class getMorphsToClass() {
         return Integer.TYPE;
     }
 
+    @Override
     protected Morpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected Morpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new IntMorpher();
         morpherWithDefaultValue = new IntMorpher(0);
diff --git a/src/test/java/net/sf/ezmorph/primitive/LongMorpherTest.java b/src/test/java/net/sf/ezmorph/primitive/LongMorpherTest.java
index 2ee7c27..b9fe599 100644
--- a/src/test/java/net/sf/ezmorph/primitive/LongMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/primitive/LongMorpherTest.java
@@ -117,26 +117,32 @@ public void testLongMorphMinValue_String() {
         assertEquals(expected, String.valueOf(actual));
     }
 
+    @Override
     protected Morpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected Morpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected Class getMorphsToClass() {
         return Long.TYPE;
     }
 
+    @Override
     protected Morpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected Morpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new LongMorpher();
         morpherWithDefaultValue = new LongMorpher(0);
diff --git a/src/test/java/net/sf/ezmorph/primitive/ShortMorpherTest.java b/src/test/java/net/sf/ezmorph/primitive/ShortMorpherTest.java
index 445a49b..f167f7b 100644
--- a/src/test/java/net/sf/ezmorph/primitive/ShortMorpherTest.java
+++ b/src/test/java/net/sf/ezmorph/primitive/ShortMorpherTest.java
@@ -117,26 +117,32 @@ public void testShortMorphMinValue_String() {
         assertEquals(expected, String.valueOf(actual));
     }
 
+    @Override
     protected Morpher getMorpher() {
         return morpher;
     }
 
+    @Override
     protected Morpher getMorpherWithDefaultValue() {
         return morpherWithDefaultValue;
     }
 
+    @Override
     protected Class getMorphsToClass() {
         return Short.TYPE;
     }
 
+    @Override
     protected Morpher getAnotherMorpher() {
         return anotherMorpher;
     }
 
+    @Override
     protected Morpher getAnotherMorpherWithDefaultValue() {
         return anotherMorpherWithDefaultValue;
     }
 
+    @Override
     protected void setUp() throws Exception {
         morpher = new ShortMorpher();
         morpherWithDefaultValue = new ShortMorpher((short) 0);
diff --git a/src/test/java/net/sf/json/PrefixerPropertyNameProcessor.java b/src/test/java/net/sf/json/PrefixerPropertyNameProcessor.java
index e4a8af0..032b49e 100644
--- a/src/test/java/net/sf/json/PrefixerPropertyNameProcessor.java
+++ b/src/test/java/net/sf/json/PrefixerPropertyNameProcessor.java
@@ -12,6 +12,7 @@ public PrefixerPropertyNameProcessor(String prefix) {
         this.prefix = prefix;
     }
 
+    @Override
     public String processPropertyName(Class beanClass, String name) {
         return prefix + name;
     }
diff --git a/src/test/java/net/sf/json/TestJSONArray.java b/src/test/java/net/sf/json/TestJSONArray.java
index c6f5f0c..cc3e015 100644
--- a/src/test/java/net/sf/json/TestJSONArray.java
+++ b/src/test/java/net/sf/json/TestJSONArray.java
@@ -369,7 +369,6 @@ public void testElement_double() {
 
     public void testElement_index_0_Array() {
         JSONArray array = JSONArray.fromObject("[null,null]");
-        ;
         int[] ints = {0, 2};
         array.element(0, ints);
         Assertions.assertEquals(JSONArray.fromObject(ints), array.getJSONArray(0));
@@ -377,7 +376,6 @@ public void testElement_index_0_Array() {
 
     public void testElement_index_0_Boolean() {
         JSONArray array = JSONArray.fromObject("[null,null]");
-        ;
         array.element(0, Boolean.TRUE);
         Assertions.assertTrue(array.getBoolean(0));
     }
diff --git a/src/test/java/net/sf/json/TestJSONArrayAsJSON.java b/src/test/java/net/sf/json/TestJSONArrayAsJSON.java
index ff54738..e743d91 100644
--- a/src/test/java/net/sf/json/TestJSONArrayAsJSON.java
+++ b/src/test/java/net/sf/json/TestJSONArrayAsJSON.java
@@ -28,34 +28,41 @@ public TestJSONArrayAsJSON(String name) {
         super(name);
     }
 
+    @Override
     protected int getIndent() {
         return 2;
     }
 
+    @Override
     protected int getIndentFactor() {
         return 2;
     }
 
+    @Override
     protected Object[] getIsArrayExpectations() {
         return new Object[] {Boolean.TRUE, new JSONArray()};
     }
 
+    @Override
     protected Object[] getToStringExpectations1() {
         return new Object[] {"[1,true,\"json\"]", JSONArray.fromObject("[1,true,'json']")};
     }
 
+    @Override
     protected Object[] getToStringExpectations2() {
         return new Object[] {
             "[\n" + "  1,\n" + "  true,\n" + "  \"json\"\n" + "]", JSONArray.fromObject("[1,true,'json']")
         };
     }
 
+    @Override
     protected Object[] getToStringExpectations3() {
         return new Object[] {
             "  [\n" + "    1,\n" + "    true,\n" + "    \"json\"\n" + "  ]", JSONArray.fromObject("[1,true,'json']")
         };
     }
 
+    @Override
     protected Object[] getWriteExpectations() {
         return new Object[] {"[1,true,\"json\"]", JSONArray.fromObject("[1,true,'json']")};
     }
diff --git a/src/test/java/net/sf/json/TestJSONArrayAsList.java b/src/test/java/net/sf/json/TestJSONArrayAsList.java
index 66edde6..f29ff83 100644
--- a/src/test/java/net/sf/json/TestJSONArrayAsList.java
+++ b/src/test/java/net/sf/json/TestJSONArrayAsList.java
@@ -127,6 +127,7 @@ public void testSubList() {
      * public void testToArray() { } public void testToArray_array() { }
      */
 
+    @Override
     protected void setUp() throws Exception {
         jsonArray = new JSONArray()
                 .element("1")
diff --git a/src/test/java/net/sf/json/TestJSONArrayEvents.java b/src/test/java/net/sf/json/TestJSONArrayEvents.java
index 2cb8bfb..caabe5b 100644
--- a/src/test/java/net/sf/json/TestJSONArrayEvents.java
+++ b/src/test/java/net/sf/json/TestJSONArrayEvents.java
@@ -112,6 +112,7 @@ public void testFromObject_string() {
         assertEvents();
     }
 
+    @Override
     protected void setUp() throws Exception {
         jsonEventAdpater = new JsonEventAdpater();
         jsonConfig = new JsonConfig();
diff --git a/src/test/java/net/sf/json/TestJSONArrayStaticBuilders_Array_DynaBean.java b/src/test/java/net/sf/json/TestJSONArrayStaticBuilders_Array_DynaBean.java
index 43e242e..5de94ca 100644
--- a/src/test/java/net/sf/json/TestJSONArrayStaticBuilders_Array_DynaBean.java
+++ b/src/test/java/net/sf/json/TestJSONArrayStaticBuilders_Array_DynaBean.java
@@ -33,6 +33,7 @@ public TestJSONArrayStaticBuilders_Array_DynaBean(String name) {
         super(name);
     }
 
+    @Override
     protected Object getSource() {
         Map map = new HashMap();
         String[] props = getProperties();
diff --git a/src/test/java/net/sf/json/TestJSONArrayStaticBuilders_Collection_DynaBean.java b/src/test/java/net/sf/json/TestJSONArrayStaticBuilders_Collection_DynaBean.java
index 765eac1..96e637e 100644
--- a/src/test/java/net/sf/json/TestJSONArrayStaticBuilders_Collection_DynaBean.java
+++ b/src/test/java/net/sf/json/TestJSONArrayStaticBuilders_Collection_DynaBean.java
@@ -35,6 +35,7 @@ public TestJSONArrayStaticBuilders_Collection_DynaBean(String name) {
         super(name);
     }
 
+    @Override
     protected Object getSource() {
         Map map = new HashMap();
         String[] props = getProperties();
diff --git a/src/test/java/net/sf/json/TestJSONArrayStaticBuilders_JSONString.java b/src/test/java/net/sf/json/TestJSONArrayStaticBuilders_JSONString.java
index b165d8e..eaf4308 100644
--- a/src/test/java/net/sf/json/TestJSONArrayStaticBuilders_JSONString.java
+++ b/src/test/java/net/sf/json/TestJSONArrayStaticBuilders_JSONString.java
@@ -28,11 +28,13 @@ public TestJSONArrayStaticBuilders_JSONString(String name) {
         super(name);
     }
 
+    @Override
     protected Object getSource() {
         return new JsonBean();
     }
 
     public static class JsonBean implements JSONString {
+        @Override
         public String toJSONString() {
             return "[{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"class\":\"java.lang.Object\",\"pexcluded\":\"\"}]";
         }
diff --git a/src/test/java/net/sf/json/TestJSONArrayStaticBuilders_String.java b/src/test/java/net/sf/json/TestJSONArrayStaticBuilders_String.java
index b2a7843..f1df4ed 100644
--- a/src/test/java/net/sf/json/TestJSONArrayStaticBuilders_String.java
+++ b/src/test/java/net/sf/json/TestJSONArrayStaticBuilders_String.java
@@ -28,6 +28,7 @@ public TestJSONArrayStaticBuilders_String(String name) {
         super(name);
     }
 
+    @Override
     protected Object getSource() {
         return "[{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"class\":\"java.lang.Object\",\"pexcluded\":\"\"}]";
     }
diff --git a/src/test/java/net/sf/json/TestJSONNullAsJSON.java b/src/test/java/net/sf/json/TestJSONNullAsJSON.java
index 03a077d..ed295b1 100644
--- a/src/test/java/net/sf/json/TestJSONNullAsJSON.java
+++ b/src/test/java/net/sf/json/TestJSONNullAsJSON.java
@@ -28,30 +28,37 @@ public TestJSONNullAsJSON(String name) {
         super(name);
     }
 
+    @Override
     protected int getIndent() {
         return 2;
     }
 
+    @Override
     protected int getIndentFactor() {
         return 2;
     }
 
+    @Override
     protected Object[] getIsArrayExpectations() {
         return new Object[] {Boolean.FALSE, JSONNull.getInstance()};
     }
 
+    @Override
     protected Object[] getToStringExpectations1() {
         return new Object[] {"null", JSONNull.getInstance()};
     }
 
+    @Override
     protected Object[] getToStringExpectations2() {
         return new Object[] {"null", JSONNull.getInstance()};
     }
 
+    @Override
     protected Object[] getToStringExpectations3() {
         return new Object[] {"  null", JSONNull.getInstance()};
     }
 
+    @Override
     protected Object[] getWriteExpectations() {
         return new Object[] {"null", JSONNull.getInstance()};
     }
diff --git a/src/test/java/net/sf/json/TestJSONObject.java b/src/test/java/net/sf/json/TestJSONObject.java
index 5c9395d..e0af541 100644
--- a/src/test/java/net/sf/json/TestJSONObject.java
+++ b/src/test/java/net/sf/json/TestJSONObject.java
@@ -1545,6 +1545,7 @@ public void testToJSONArray() {
         assertTrue(jsonArray.getBoolean(2));
     }
 
+    @Override
     protected void setUp() throws Exception {
         jsonConfig = new JsonConfig();
     }
@@ -1569,6 +1570,7 @@ private MorphDynaBean createDynaBean() throws Exception {
     }
 
     public static class BeanAPropertyExclusionClassMatcher extends PropertyExclusionClassMatcher {
+        @Override
         public Object getMatch(Class target, Set set) {
             for (Iterator i = set.iterator(); i.hasNext(); ) {
                 Class c = (Class) i.next();
@@ -1581,6 +1583,7 @@ public Object getMatch(Class target, Set set) {
     }
 
     public static class BeanAPropertyFilter implements PropertyFilter {
+        @Override
         public boolean apply(Object source, String name, Object value) {
             if ("bool".equals(name) || "integer".equals(name)) {
                 return true;
@@ -1590,6 +1593,7 @@ public boolean apply(Object source, String name, Object value) {
     }
 
     public static class MappingPropertySetStrategy extends PropertySetStrategy {
+        @Override
         public void setProperty(Object bean, String key, Object value) throws JSONException {
             ((MappingBean) bean).addAttribute(key, value);
         }
@@ -1598,12 +1602,14 @@ public void setProperty(Object bean, String key, Object value) throws JSONExcept
     public static class NumberDefaultValueProcessor implements DefaultValueProcessor {
         public static final Integer NUMBER = new Integer(42);
 
+        @Override
         public Object getDefaultValue(Class type) {
             return NUMBER;
         }
     }
 
     public static class NumberDefaultValueProcessorMatcher extends DefaultValueProcessorMatcher {
+        @Override
         public Object getMatch(Class target, Set set) {
             for (Iterator i = set.iterator(); i.hasNext(); ) {
                 Class c = (Class) i.next();
@@ -1616,6 +1622,7 @@ public Object getMatch(Class target, Set set) {
     }
 
     public static class NumberPropertyFilter implements PropertyFilter {
+        @Override
         public boolean apply(Object source, String name, Object value) {
             if (value != null && Number.class.isAssignableFrom(value.getClass())) {
                 return true;
@@ -1625,6 +1632,7 @@ public boolean apply(Object source, String name, Object value) {
     }
 
     public static class SwapPropertyNameProcessor implements PropertyNameProcessor {
+        @Override
         public String processPropertyName(Class beanClass, String name) {
             if (name.equals("bool")) {
                 return "string";
diff --git a/src/test/java/net/sf/json/TestJSONObjectAsMap.java b/src/test/java/net/sf/json/TestJSONObjectAsMap.java
index 513dace..1f04a05 100644
--- a/src/test/java/net/sf/json/TestJSONObjectAsMap.java
+++ b/src/test/java/net/sf/json/TestJSONObjectAsMap.java
@@ -79,6 +79,7 @@ public void testRemove() {
         assertFalse(jsonObject.has("func"));
     }
 
+    @Override
     protected void setUp() throws Exception {
         jsonObject = new JSONObject()
                 .element("int", "1")
diff --git a/src/test/java/net/sf/json/TestJSONObjectEvents.java b/src/test/java/net/sf/json/TestJSONObjectEvents.java
index 64276c8..07d7dce 100644
--- a/src/test/java/net/sf/json/TestJSONObjectEvents.java
+++ b/src/test/java/net/sf/json/TestJSONObjectEvents.java
@@ -102,6 +102,7 @@ public void testFromObject_string() {
         assertEvents();
     }
 
+    @Override
     protected void setUp() throws Exception {
         jsonEventAdpater = new JsonEventAdpater();
         jsonConfig = new JsonConfig();
@@ -109,6 +110,7 @@ protected void setUp() throws Exception {
         jsonConfig.enableEventTriggering();
     }
 
+    @Override
     protected void tearDown() throws Exception {
         jsonEventAdpater.reset();
     }
diff --git a/src/test/java/net/sf/json/TestJSONObjectJdk15.java b/src/test/java/net/sf/json/TestJSONObjectJdk15.java
index 1a43a86..63e715d 100644
--- a/src/test/java/net/sf/json/TestJSONObjectJdk15.java
+++ b/src/test/java/net/sf/json/TestJSONObjectJdk15.java
@@ -205,6 +205,7 @@ public void testFromObject_ignoreAnnotations() {
         assertFalse(json.has("string3"));
     }
 
+    @Override
     protected void setUp() throws Exception {
         Morpher morpher = JSONUtils.getMorpherRegistry().getMorpherFor(JsonEnum.class);
         JSONUtils.getMorpherRegistry().deregisterMorpher(morpher);
diff --git a/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_DynaBean.java b/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_DynaBean.java
index e5d5cba..5cfbcbc 100644
--- a/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_DynaBean.java
+++ b/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_DynaBean.java
@@ -33,6 +33,7 @@ public TestJSONObjectStaticBuilders_DynaBean(String name) {
         super(name);
     }
 
+    @Override
     protected Object getSource() {
         Map map = new HashMap();
         String[] props = getProperties();
diff --git a/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_JSONObject.java b/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_JSONObject.java
index 23a3528..ff793f1 100644
--- a/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_JSONObject.java
+++ b/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_JSONObject.java
@@ -28,6 +28,7 @@ public TestJSONObjectStaticBuilders_JSONObject(String name) {
         super(name);
     }
 
+    @Override
     protected Object getSource() {
         String[] props = getProperties();
         JSONObject jsonObject = new JSONObject();
diff --git a/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_JSONString.java b/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_JSONString.java
index d088c2a..597ca47 100644
--- a/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_JSONString.java
+++ b/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_JSONString.java
@@ -28,12 +28,14 @@ public TestJSONObjectStaticBuilders_JSONString(String name) {
         super(name);
     }
 
+    @Override
     protected Object getSource() {
         return new JsonBean();
     }
 
     public static class JsonBean implements JSONString {
 
+        @Override
         public String toJSONString() {
             return "{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"pexcluded\":\"\"}";
         }
diff --git a/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_JSONTokener.java b/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_JSONTokener.java
index 362d88f..74f6de7 100644
--- a/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_JSONTokener.java
+++ b/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_JSONTokener.java
@@ -30,6 +30,7 @@ public TestJSONObjectStaticBuilders_JSONTokener(String name) {
         super(name);
     }
 
+    @Override
     protected Object getSource() {
         return new JSONTokener(
                 "{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"pexcluded\":\"\"}");
diff --git a/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_Map.java b/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_Map.java
index 30a00b0..e260008 100644
--- a/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_Map.java
+++ b/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_Map.java
@@ -31,6 +31,7 @@ public TestJSONObjectStaticBuilders_Map(String name) {
         super(name);
     }
 
+    @Override
     protected Object getSource() {
         Map map = new HashMap();
         String[] props = getProperties();
diff --git a/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_ObjectBean.java b/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_ObjectBean.java
index e438a8c..339744f 100644
--- a/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_ObjectBean.java
+++ b/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_ObjectBean.java
@@ -31,6 +31,7 @@ public TestJSONObjectStaticBuilders_ObjectBean(String name) {
         super(name);
     }
 
+    @Override
     protected Object getSource() {
         ObjectBean bean = new ObjectBean();
         String[] props = getProperties();
diff --git a/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_PrimitiveBean.java b/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_PrimitiveBean.java
index d53ba94..b4f49fc 100644
--- a/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_PrimitiveBean.java
+++ b/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_PrimitiveBean.java
@@ -31,6 +31,7 @@ public TestJSONObjectStaticBuilders_PrimitiveBean(String name) {
         super(name);
     }
 
+    @Override
     protected Object getSource() {
         PrimitiveBean bean = new PrimitiveBean();
         String[] props = getProperties();
diff --git a/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_String.java b/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_String.java
index f4d3e67..6c38a0f 100644
--- a/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_String.java
+++ b/src/test/java/net/sf/json/TestJSONObjectStaticBuilders_String.java
@@ -28,6 +28,7 @@ public TestJSONObjectStaticBuilders_String(String name) {
         super(name);
     }
 
+    @Override
     protected Object getSource() {
         return "{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"pexcluded\":\"\"}";
     }
diff --git a/src/test/java/net/sf/json/TestJSONObjectWithProcessors.java b/src/test/java/net/sf/json/TestJSONObjectWithProcessors.java
index 85aaa6a..955af98 100644
--- a/src/test/java/net/sf/json/TestJSONObjectWithProcessors.java
+++ b/src/test/java/net/sf/json/TestJSONObjectWithProcessors.java
@@ -140,6 +140,7 @@ public void testNumericValueWithProcessor_Short() {
         assertEquals(new Integer(Short.MAX_VALUE), jsonObject.get("value"));
     }
 
+    @Override
     protected void setUp() throws Exception {
         Calendar c = Calendar.getInstance();
         c.set(Calendar.YEAR, 2007);
diff --git a/src/test/java/net/sf/json/TestJSONSerializer.java b/src/test/java/net/sf/json/TestJSONSerializer.java
index 6d2f082..28e4605 100644
--- a/src/test/java/net/sf/json/TestJSONSerializer.java
+++ b/src/test/java/net/sf/json/TestJSONSerializer.java
@@ -240,6 +240,7 @@ public void testToJSON_String_object() {
         Assertions.assertEquals(JSONObject.fromObject("{\"name\":\"json\"}"), (JSONObject) json);
     }
 
+    @Override
     protected void setUp() throws Exception {
         jsonConfig = new JsonConfig();
     }
diff --git a/src/test/java/net/sf/json/TestUserSubmitted.java b/src/test/java/net/sf/json/TestUserSubmitted.java
index f468c63..0e3b521 100644
--- a/src/test/java/net/sf/json/TestUserSubmitted.java
+++ b/src/test/java/net/sf/json/TestUserSubmitted.java
@@ -904,29 +904,39 @@ public void testBug_3074732() {
     }
     */
     public static class RunnableImpl implements Runnable {
+        @Override
         public void run() {}
     }
 
     public static class JsonErrorDetector implements JsonEventListener {
+        @Override
         public void onArrayEnd() {}
 
+        @Override
         public void onArrayStart() {}
 
+        @Override
         public void onElementAdded(int index, Object element) {}
 
+        @Override
         public void onError(JSONException jsone) {
             fail("An error occurs during JsonProcessing " + jsone.getMessage());
         }
 
+        @Override
         public void onObjectEnd() {}
 
+        @Override
         public void onObjectStart() {}
 
+        @Override
         public void onPropertySet(String key, Object value, boolean accumulated) {}
 
+        @Override
         public void onWarning(String warning) {}
     }
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         jsonConfig = new JsonConfig();
diff --git a/src/test/java/net/sf/json/bugs/TestBug2843623.java b/src/test/java/net/sf/json/bugs/TestBug2843623.java
index b66d056..238e544 100644
--- a/src/test/java/net/sf/json/bugs/TestBug2843623.java
+++ b/src/test/java/net/sf/json/bugs/TestBug2843623.java
@@ -9,7 +9,7 @@
 public class TestBug2843623 extends TestCase {
     public void testSample() {
         Container orig = new Container();
-        List<String> strings = new ArrayList<String>();
+        List<String> strings = new ArrayList<>();
         strings.add("one");
         strings.add("two");
         strings.add("three");
@@ -23,7 +23,7 @@ public void testSample() {
     }
 
     public static class Container {
-        private List<String> myList = new ArrayList<String>();
+        private List<String> myList = new ArrayList<>();
 
         public List<String> getMyList() {
             return myList;
diff --git a/src/test/java/net/sf/json/filters/TestCompositePropertyFilter.java b/src/test/java/net/sf/json/filters/TestCompositePropertyFilter.java
index 9ee6058..e3daaf1 100644
--- a/src/test/java/net/sf/json/filters/TestCompositePropertyFilter.java
+++ b/src/test/java/net/sf/json/filters/TestCompositePropertyFilter.java
@@ -39,6 +39,7 @@ public void testApply_addFilter() {
         assertTrue(filter.apply(null, null, null));
     }
 
+    @Override
     protected void setUp() throws Exception {
         filter = new CompositePropertyFilter();
     }
diff --git a/src/test/java/net/sf/json/filters/TestMappingPropertyFilter.java b/src/test/java/net/sf/json/filters/TestMappingPropertyFilter.java
index 82f5e14..84af6c5 100644
--- a/src/test/java/net/sf/json/filters/TestMappingPropertyFilter.java
+++ b/src/test/java/net/sf/json/filters/TestMappingPropertyFilter.java
@@ -40,6 +40,7 @@ public void testApply() {
     }
 
     public static class SampleMappingPropertyFilter extends MappingPropertyFilter {
+        @Override
         protected boolean keyMatches(Object key, Object source, String name, Object value) {
             return ((Class) key).isAssignableFrom(source.getClass()) && source instanceof Number;
         }
diff --git a/src/test/java/net/sf/json/processors/StartsWithJsonBeanProcessorMatcher.java b/src/test/java/net/sf/json/processors/StartsWithJsonBeanProcessorMatcher.java
index 6b218dd..4557602 100644
--- a/src/test/java/net/sf/json/processors/StartsWithJsonBeanProcessorMatcher.java
+++ b/src/test/java/net/sf/json/processors/StartsWithJsonBeanProcessorMatcher.java
@@ -29,6 +29,7 @@ public StartsWithJsonBeanProcessorMatcher(String pattern) {
         this.pattern = pattern;
     }
 
+    @Override
     public Object getMatch(Class target, Set set) {
         if (target != null && set != null && target.getName().startsWith(pattern)) {
             for (Iterator i = set.iterator(); i.hasNext(); ) {
diff --git a/src/test/java/net/sf/json/processors/TestJsDateJsonBeanProcessor.java b/src/test/java/net/sf/json/processors/TestJsDateJsonBeanProcessor.java
index 08920ec..55187e5 100644
--- a/src/test/java/net/sf/json/processors/TestJsDateJsonBeanProcessor.java
+++ b/src/test/java/net/sf/json/processors/TestJsDateJsonBeanProcessor.java
@@ -78,6 +78,7 @@ public void testProcessBean_sqlDate() {
         assertEquals(150, jsonObject.getInt("milliseconds"));
     }
 
+    @Override
     protected void setUp() throws Exception {
         processor = new JsDateJsonBeanProcessor();
     }
diff --git a/src/test/java/net/sf/json/processors/TestJsDateJsonValueProcessor.java b/src/test/java/net/sf/json/processors/TestJsDateJsonValueProcessor.java
index 379e061..ce6bd6c 100644
--- a/src/test/java/net/sf/json/processors/TestJsDateJsonValueProcessor.java
+++ b/src/test/java/net/sf/json/processors/TestJsDateJsonValueProcessor.java
@@ -79,6 +79,7 @@ public void testProcessBean_sqlDate() {
         assertEquals(150, jsonObject.getInt("milliseconds"));
     }
 
+    @Override
     protected void setUp() throws Exception {
         processor = new JsDateJsonValueProcessor();
     }
diff --git a/src/test/java/net/sf/json/regexp/TestJdkRegexpMatcher.java b/src/test/java/net/sf/json/regexp/TestJdkRegexpMatcher.java
index 311e52b..011b828 100644
--- a/src/test/java/net/sf/json/regexp/TestJdkRegexpMatcher.java
+++ b/src/test/java/net/sf/json/regexp/TestJdkRegexpMatcher.java
@@ -28,6 +28,7 @@ public TestJdkRegexpMatcher(String name) {
         super(name);
     }
 
+    @Override
     protected RegexpMatcher getRegexpMatcher(String pattern) {
         return new JdkRegexpMatcher(pattern);
     }
diff --git a/src/test/java/net/sf/json/regexp/TestPerl5RegexpMatcher.java b/src/test/java/net/sf/json/regexp/TestPerl5RegexpMatcher.java
index f400945..eeacb2a 100644
--- a/src/test/java/net/sf/json/regexp/TestPerl5RegexpMatcher.java
+++ b/src/test/java/net/sf/json/regexp/TestPerl5RegexpMatcher.java
@@ -28,6 +28,7 @@ public TestPerl5RegexpMatcher(String name) {
         super(name);
     }
 
+    @Override
     protected RegexpMatcher getRegexpMatcher(String pattern) {
         return new Perl5RegexpMatcher(pattern);
     }
diff --git a/src/test/java/net/sf/json/sample/ArrayBean.java b/src/test/java/net/sf/json/sample/ArrayBean.java
index 62848e3..2c17104 100644
--- a/src/test/java/net/sf/json/sample/ArrayBean.java
+++ b/src/test/java/net/sf/json/sample/ArrayBean.java
@@ -33,6 +33,7 @@ public void setBeans(BeanA[] beans) {
         this.beans = beans;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/sample/ArrayJSONStringBean.java b/src/test/java/net/sf/json/sample/ArrayJSONStringBean.java
index dd45ed6..08a694f 100644
--- a/src/test/java/net/sf/json/sample/ArrayJSONStringBean.java
+++ b/src/test/java/net/sf/json/sample/ArrayJSONStringBean.java
@@ -33,6 +33,7 @@ public void setValue(String value) {
         this.value = value;
     }
 
+    @Override
     public String toJSONString() {
         return ArrayUtils.toString(value.split(",")).replace('{', '[').replace('}', ']');
     }
diff --git a/src/test/java/net/sf/json/sample/BeanA.java b/src/test/java/net/sf/json/sample/BeanA.java
index 7034874..594394c 100644
--- a/src/test/java/net/sf/json/sample/BeanA.java
+++ b/src/test/java/net/sf/json/sample/BeanA.java
@@ -40,6 +40,7 @@ public BeanA(boolean bool, int integer, String string) {
         this.string = string;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj == this) {
             return true;
@@ -61,6 +62,7 @@ public String getString() {
         return string;
     }
 
+    @Override
     public int hashCode() {
         return HashCodeBuilder.reflectionHashCode(this);
     }
@@ -81,6 +83,7 @@ public void setString(String string) {
         this.string = string;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/sample/BeanA1763699.java b/src/test/java/net/sf/json/sample/BeanA1763699.java
index 6cb304f..4afe3b4 100644
--- a/src/test/java/net/sf/json/sample/BeanA1763699.java
+++ b/src/test/java/net/sf/json/sample/BeanA1763699.java
@@ -33,6 +33,7 @@ public void setBbeans(BeanB1763699[] bbeans) {
         this.bbeans = bbeans;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/sample/BeanB.java b/src/test/java/net/sf/json/sample/BeanB.java
index e6afbfe..1478b47 100644
--- a/src/test/java/net/sf/json/sample/BeanB.java
+++ b/src/test/java/net/sf/json/sample/BeanB.java
@@ -33,6 +33,7 @@ public void setIntarray(int[] intarray) {
         this.intarray = intarray;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/sample/BeanB1763699.java b/src/test/java/net/sf/json/sample/BeanB1763699.java
index 38628a8..95fd446 100644
--- a/src/test/java/net/sf/json/sample/BeanB1763699.java
+++ b/src/test/java/net/sf/json/sample/BeanB1763699.java
@@ -33,6 +33,7 @@ public void setStr(String str) {
         this.str = str;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/sample/BeanC.java b/src/test/java/net/sf/json/sample/BeanC.java
index a762bf0..19002c2 100644
--- a/src/test/java/net/sf/json/sample/BeanC.java
+++ b/src/test/java/net/sf/json/sample/BeanC.java
@@ -42,6 +42,7 @@ public void setBeanB(BeanB beanB) {
         this.beanB = beanB;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/sample/EnumBean.java b/src/test/java/net/sf/json/sample/EnumBean.java
index 9d6e54a..55d214f 100644
--- a/src/test/java/net/sf/json/sample/EnumBean.java
+++ b/src/test/java/net/sf/json/sample/EnumBean.java
@@ -25,7 +25,7 @@
 public class EnumBean {
     private JsonEnum jsonEnum;
     private String string;
-    private Set<JsonEnum> enums = new HashSet<JsonEnum>();
+    private Set<JsonEnum> enums = new HashSet<>();
 
     public JsonEnum getJsonEnum() {
         return jsonEnum;
diff --git a/src/test/java/net/sf/json/sample/FieldBean.java b/src/test/java/net/sf/json/sample/FieldBean.java
index 856c90a..c2eae8d 100644
--- a/src/test/java/net/sf/json/sample/FieldBean.java
+++ b/src/test/java/net/sf/json/sample/FieldBean.java
@@ -34,6 +34,7 @@ public void setValue(int value) {
         this.value = value;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/sample/IdBean.java b/src/test/java/net/sf/json/sample/IdBean.java
index 329f9ce..c66754f 100644
--- a/src/test/java/net/sf/json/sample/IdBean.java
+++ b/src/test/java/net/sf/json/sample/IdBean.java
@@ -44,6 +44,7 @@ public Id(long value) {
             this.value = value;
         }
 
+        @Override
         public boolean equals(Object obj) {
             if (obj == this) {
                 return true;
@@ -62,6 +63,7 @@ public long getValue() {
             return value;
         }
 
+        @Override
         public int hashCode() {
             return getClass().hashCode() + (int) value;
         }
@@ -72,6 +74,7 @@ public void setValue(long value) {
     }
 
     public static class IdMorpher extends AbstractObjectMorpher {
+        @Override
         public Object morph(Object value) {
             if (value != null) {
                 if (value instanceof Number) {
@@ -83,6 +86,7 @@ public Object morph(Object value) {
             return null;
         }
 
+        @Override
         public Class morphsTo() {
             return IdBean.Id.class;
         }
diff --git a/src/test/java/net/sf/json/sample/IdentityJsonValueProcessor.java b/src/test/java/net/sf/json/sample/IdentityJsonValueProcessor.java
index 3e7c125..6aa4567 100644
--- a/src/test/java/net/sf/json/sample/IdentityJsonValueProcessor.java
+++ b/src/test/java/net/sf/json/sample/IdentityJsonValueProcessor.java
@@ -24,10 +24,12 @@
  * @author Andres Almiray <a href="mailto:aalmiray@users.sourceforge.net">aalmiray@users.sourceforge.net</a>
  */
 public class IdentityJsonValueProcessor implements JsonValueProcessor {
+    @Override
     public Object processArrayValue(Object value, JsonConfig jsonConfig) {
         return process(value, jsonConfig);
     }
 
+    @Override
     public Object processObjectValue(String key, Object value, JsonConfig jsonConfig) {
         return process(value, jsonConfig);
     }
diff --git a/src/test/java/net/sf/json/sample/JsonEventAdpater.java b/src/test/java/net/sf/json/sample/JsonEventAdpater.java
index dd90f7c..dba4ff0 100644
--- a/src/test/java/net/sf/json/sample/JsonEventAdpater.java
+++ b/src/test/java/net/sf/json/sample/JsonEventAdpater.java
@@ -64,34 +64,42 @@ public int getWarning() {
         return warning;
     }
 
+    @Override
     public void onArrayEnd() {
         arrayEnd++;
     }
 
+    @Override
     public void onArrayStart() {
         arrayStart++;
     }
 
+    @Override
     public void onElementAdded(int index, Object element) {
         elementAdded++;
     }
 
+    @Override
     public void onError(JSONException jsone) {
         error++;
     }
 
+    @Override
     public void onObjectEnd() {
         objectEnd++;
     }
 
+    @Override
     public void onObjectStart() {
         objectStart++;
     }
 
+    @Override
     public void onPropertySet(String key, Object value, boolean accumulated) {
         propertySet++;
     }
 
+    @Override
     public void onWarning(String warning) {
         this.warning++;
     }
diff --git a/src/test/java/net/sf/json/sample/Media.java b/src/test/java/net/sf/json/sample/Media.java
index 2009fa7..d0c2e4a 100644
--- a/src/test/java/net/sf/json/sample/Media.java
+++ b/src/test/java/net/sf/json/sample/Media.java
@@ -33,6 +33,7 @@ public void setTitle(String title) {
         this.title = title;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/sample/MediaBean.java b/src/test/java/net/sf/json/sample/MediaBean.java
index 65a6452..aed5253 100644
--- a/src/test/java/net/sf/json/sample/MediaBean.java
+++ b/src/test/java/net/sf/json/sample/MediaBean.java
@@ -33,6 +33,7 @@ public void setTitle(String title) {
         this.title = title;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/sample/MediaList.java b/src/test/java/net/sf/json/sample/MediaList.java
index 6b74df8..e439a1c 100644
--- a/src/test/java/net/sf/json/sample/MediaList.java
+++ b/src/test/java/net/sf/json/sample/MediaList.java
@@ -34,6 +34,7 @@ public void setMedia(ArrayList media) {
         this.media = media;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/sample/MediaListBean.java b/src/test/java/net/sf/json/sample/MediaListBean.java
index dcd9588..bfd3cbc 100644
--- a/src/test/java/net/sf/json/sample/MediaListBean.java
+++ b/src/test/java/net/sf/json/sample/MediaListBean.java
@@ -43,6 +43,7 @@ public void setMedia2(List media2) {
         this.media2 = media2;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/sample/NumberArrayBean.java b/src/test/java/net/sf/json/sample/NumberArrayBean.java
index 25ab8fe..465df84 100644
--- a/src/test/java/net/sf/json/sample/NumberArrayBean.java
+++ b/src/test/java/net/sf/json/sample/NumberArrayBean.java
@@ -78,6 +78,7 @@ public void setShorts(short[] shorts) {
         this.shorts = shorts;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/sample/ObjectBean.java b/src/test/java/net/sf/json/sample/ObjectBean.java
index 08f03e6..5359b98 100644
--- a/src/test/java/net/sf/json/sample/ObjectBean.java
+++ b/src/test/java/net/sf/json/sample/ObjectBean.java
@@ -168,6 +168,7 @@ public void setPstring(Object pstring) {
         this.pstring = pstring;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/sample/ObjectJSONStringBean.java b/src/test/java/net/sf/json/sample/ObjectJSONStringBean.java
index 0224fc7..b3ba703 100644
--- a/src/test/java/net/sf/json/sample/ObjectJSONStringBean.java
+++ b/src/test/java/net/sf/json/sample/ObjectJSONStringBean.java
@@ -41,6 +41,7 @@ public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String toJSONString() {
         return new StringBuffer()
                 .append("{")
diff --git a/src/test/java/net/sf/json/sample/PackageProtectedBean.java b/src/test/java/net/sf/json/sample/PackageProtectedBean.java
index b5c64c8..b3cc2bd 100644
--- a/src/test/java/net/sf/json/sample/PackageProtectedBean.java
+++ b/src/test/java/net/sf/json/sample/PackageProtectedBean.java
@@ -35,6 +35,7 @@ public void setValue(int value) {
         this.value = value;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/sample/Player.java b/src/test/java/net/sf/json/sample/Player.java
index a7cb328..10b2739 100644
--- a/src/test/java/net/sf/json/sample/Player.java
+++ b/src/test/java/net/sf/json/sample/Player.java
@@ -33,6 +33,7 @@ public void setMediaList(MediaList mediaList) {
         this.mediaList = mediaList;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/sample/PlayerList.java b/src/test/java/net/sf/json/sample/PlayerList.java
index 9ba2cbc..9c149e8 100644
--- a/src/test/java/net/sf/json/sample/PlayerList.java
+++ b/src/test/java/net/sf/json/sample/PlayerList.java
@@ -34,6 +34,7 @@ public void setPlayer(ArrayList player) {
         this.player = player;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/sample/PrimitiveBean.java b/src/test/java/net/sf/json/sample/PrimitiveBean.java
index 32198a1..64566dc 100644
--- a/src/test/java/net/sf/json/sample/PrimitiveBean.java
+++ b/src/test/java/net/sf/json/sample/PrimitiveBean.java
@@ -180,6 +180,7 @@ public void setPstring(String pstring) {
         this.pstring = pstring;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/sample/PrivateConstructorBean.java b/src/test/java/net/sf/json/sample/PrivateConstructorBean.java
index cfad702..7d30b44 100644
--- a/src/test/java/net/sf/json/sample/PrivateConstructorBean.java
+++ b/src/test/java/net/sf/json/sample/PrivateConstructorBean.java
@@ -35,6 +35,7 @@ public void setValue(int value) {
         this.value = value;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/sample/SetBean.java b/src/test/java/net/sf/json/sample/SetBean.java
index 4fb9203..fa69feb 100644
--- a/src/test/java/net/sf/json/sample/SetBean.java
+++ b/src/test/java/net/sf/json/sample/SetBean.java
@@ -33,6 +33,7 @@ public void addAttribute(Object value) {
         this.attributes.add(value);
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj == this) {
             return true;
@@ -50,6 +51,7 @@ public Set getAttributes() {
         return attributes;
     }
 
+    @Override
     public int hashCode() {
         return HashCodeBuilder.reflectionHashCode(this);
     }
@@ -58,6 +60,7 @@ public void setAttributes(Set attributes) {
         this.attributes = attributes;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/sample/UnstandardBean.java b/src/test/java/net/sf/json/sample/UnstandardBean.java
index 61c1077..4dbc8e5 100644
--- a/src/test/java/net/sf/json/sample/UnstandardBean.java
+++ b/src/test/java/net/sf/json/sample/UnstandardBean.java
@@ -34,6 +34,7 @@ public UnstandardBean(int id) {
         this.id = id;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj == this) {
             return true;
@@ -59,6 +60,7 @@ public String getString() {
         return string;
     }
 
+    @Override
     public int hashCode() {
         return HashCodeBuilder.reflectionHashCode(this);
     }
@@ -79,6 +81,7 @@ public void setString(String string) {
         this.string = string;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/sample/UnstandardBeanInstanceStrategy.java b/src/test/java/net/sf/json/sample/UnstandardBeanInstanceStrategy.java
index 74826b8..e9acf90 100644
--- a/src/test/java/net/sf/json/sample/UnstandardBeanInstanceStrategy.java
+++ b/src/test/java/net/sf/json/sample/UnstandardBeanInstanceStrategy.java
@@ -24,6 +24,7 @@
  * @author Andres Almiray <a href="mailto:aalmiray@users.sourceforge.net">aalmiray@users.sourceforge.net</a>
  */
 public class UnstandardBeanInstanceStrategy extends NewBeanInstanceStrategy {
+    @Override
     public Object newInstance(Class target, JSONObject source)
             throws InstantiationException, IllegalAccessException, SecurityException, NoSuchMethodException,
                     InvocationTargetException {
diff --git a/src/test/java/net/sf/json/sample/ValueBean.java b/src/test/java/net/sf/json/sample/ValueBean.java
index 009d67c..34a0685 100644
--- a/src/test/java/net/sf/json/sample/ValueBean.java
+++ b/src/test/java/net/sf/json/sample/ValueBean.java
@@ -27,6 +27,7 @@
 public class ValueBean {
     private int value;
 
+    @Override
     public boolean equals(Object obj) {
         if (obj == this) {
             return true;
@@ -44,6 +45,7 @@ public int getValue() {
         return value;
     }
 
+    @Override
     public int hashCode() {
         return HashCodeBuilder.reflectionHashCode(this);
     }
@@ -52,6 +54,7 @@ public void setValue(int value) {
         this.value = value;
     }
 
+    @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
diff --git a/src/test/java/net/sf/json/xml/TestXMLSerializer_reads.java b/src/test/java/net/sf/json/xml/TestXMLSerializer_reads.java
index 85d9a41..5e1bf0e 100644
--- a/src/test/java/net/sf/json/xml/TestXMLSerializer_reads.java
+++ b/src/test/java/net/sf/json/xml/TestXMLSerializer_reads.java
@@ -503,6 +503,7 @@ public void testXmlConversionRules() {
         JSONAssert.assertEquals(expected, actual);
     }
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         xmlSerializer = new XMLSerializer();
diff --git a/src/test/java/net/sf/json/xml/TestXMLSerializer_writes.java b/src/test/java/net/sf/json/xml/TestXMLSerializer_writes.java
index 84c9fcd..f58cb58 100644
--- a/src/test/java/net/sf/json/xml/TestXMLSerializer_writes.java
+++ b/src/test/java/net/sf/json/xml/TestXMLSerializer_writes.java
@@ -274,6 +274,7 @@ public void testWriteWithNamespace() throws Exception {
         assertXMLEqual(expected, xml);
     }
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         xmlSerializer = new XMLSerializer();