You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2018/03/16 10:17:49 UTC

[10/22] james-project git commit: JAMES-2352 use @Override instead of javadoc comments

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/handler/MultiLineHandler.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/MultiLineHandler.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/MultiLineHandler.java
index 511881e..6266878 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/MultiLineHandler.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/MultiLineHandler.java
@@ -38,10 +38,7 @@ public abstract class MultiLineHandler<S extends ProtocolSession> implements Lin
 
     private static final String BUFFERED_LINES = "BUFFERED_LINES";
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.handler.LineHandler#onLine(org.apache.james.protocols.api.ProtocolSession, byte[])
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public Response onLine(S session, ByteBuffer line) {
         Collection<ByteBuffer> lines = (List<ByteBuffer>) session.getAttachment(BUFFERED_LINES, State.Transaction);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java
index 8ffd6e5..6b01e5e 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java
@@ -55,10 +55,7 @@ public class ProtocolHandlerChainImpl extends AbstractProtocolHandlerChain imple
         return readyOnly;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#add(java.lang.Object)
-     */
+    @Override
     public boolean add(ProtocolHandler handler) {
         checkReadOnly();
         return handlers.add(handler);
@@ -73,192 +70,129 @@ public class ProtocolHandlerChainImpl extends AbstractProtocolHandlerChain imple
      * (non-Javadoc)
      * @see java.util.List#size()
      */
+    @Override
     public int size() {
         return handlers.size();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#isEmpty()
-     */
+    @Override
     public boolean isEmpty() {
         return handlers.isEmpty();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#contains(java.lang.Object)
-     */
+    @Override
     public boolean contains(Object o) {
         return handlers.contains(o);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#iterator()
-     */
+    @Override
     public Iterator<ProtocolHandler> iterator() {
         return new ProtocolHandlerIterator(handlers.listIterator());
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#toArray()
-     */
+    @Override
     public Object[] toArray() {
         return handlers.toArray();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#toArray(T[])
-     */
+    @Override
     public <T> T[] toArray(T[] a) {
         return handlers.toArray(a);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#remove(java.lang.Object)
-     */
+    @Override
     public boolean remove(Object o) {
         checkReadOnly();
 
         return handlers.remove(o);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#containsAll(java.util.Collection)
-     */
+    @Override
     public boolean containsAll(Collection<?> c) {
         return handlers.containsAll(c);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#addAll(java.util.Collection)
-     */
+    @Override
     public boolean addAll(Collection<? extends ProtocolHandler> c) {
         checkReadOnly();
 
         return handlers.addAll(c);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#addAll(int, java.util.Collection)
-     */
+    @Override
     public boolean addAll(int index, Collection<? extends ProtocolHandler> c) {
         checkReadOnly();
 
         return handlers.addAll(index, c);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#removeAll(java.util.Collection)
-     */
+    @Override
     public boolean removeAll(Collection<?> c) {
         checkReadOnly();
 
         return handlers.removeAll(c);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#retainAll(java.util.Collection)
-     */
+    @Override
     public boolean retainAll(Collection<?> c) {
         return handlers.retainAll(c);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#clear()
-     */
+    @Override
     public void clear() {
         checkReadOnly();
 
         handlers.clear();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#get(int)
-     */
+    @Override
     public ProtocolHandler get(int index) {
         return (ProtocolHandler) handlers.get(index);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#set(int, java.lang.Object)
-     */
+    @Override
     public ProtocolHandler set(int index, ProtocolHandler element) {
         checkReadOnly();
 
         return (ProtocolHandler) handlers.set(index, element);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#add(int, java.lang.Object)
-     */
+    @Override
     public void add(int index, ProtocolHandler element) {
         checkReadOnly();
 
         handlers.add(index, element);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#remove(int)
-     */
+    @Override
     public ProtocolHandler remove(int index) {
         checkReadOnly();
 
         return (ProtocolHandler) handlers.remove(index);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#indexOf(java.lang.Object)
-     */
+    @Override
     public int indexOf(Object o) {
         return handlers.indexOf(o);
     }
 
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#lastIndexOf(java.lang.Object)
-     */
+    @Override
     public int lastIndexOf(Object o) {
         return handlers.lastIndexOf(o);
     }
 
-    /*
-     * 
-     * (non-Javadoc)
-     * @see java.util.List#listIterator()
-     */
+    @Override
     public ListIterator<ProtocolHandler> listIterator() {
         return new ProtocolHandlerIterator(handlers.listIterator());
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#listIterator(int)
-     */
+    @Override
     public ListIterator<ProtocolHandler> listIterator(int index) {
         return new ProtocolHandlerIterator(handlers.listIterator(index));
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#subList(int, int)
-     */
+    @Override
     public List<ProtocolHandler> subList(int fromIndex, int toIndex) {
         List<ProtocolHandler> sList = new ArrayList<>(handlers.subList(fromIndex, toIndex));
         if (readyOnly) {
@@ -284,6 +218,7 @@ public class ProtocolHandlerChainImpl extends AbstractProtocolHandlerChain imple
          * (non-Javadoc)
          * @see java.util.ListIterator#hasNext()
          */
+        @Override
         public boolean hasNext() {
             return handlers.hasNext();
         }
@@ -292,6 +227,7 @@ public class ProtocolHandlerChainImpl extends AbstractProtocolHandlerChain imple
          * (non-Javadoc)
          * @see java.util.ListIterator#next()
          */
+        @Override
         public ProtocolHandler next() {
             return (ProtocolHandler) handlers.next();
         }
@@ -300,6 +236,7 @@ public class ProtocolHandlerChainImpl extends AbstractProtocolHandlerChain imple
          * (non-Javadoc)
          * @see java.util.ListIterator#hasPrevious()
          */
+        @Override
         public boolean hasPrevious() {
             return handlers.hasPrevious();
         }
@@ -308,6 +245,7 @@ public class ProtocolHandlerChainImpl extends AbstractProtocolHandlerChain imple
          * (non-Javadoc)
          * @see java.util.ListIterator#previous()
          */
+        @Override
         public ProtocolHandler previous() {
             return handlers.previous();
         }
@@ -316,6 +254,7 @@ public class ProtocolHandlerChainImpl extends AbstractProtocolHandlerChain imple
          * (non-Javadoc)
          * @see java.util.ListIterator#nextIndex()
          */
+        @Override
         public int nextIndex() {
             return handlers.nextIndex();
         }
@@ -324,6 +263,7 @@ public class ProtocolHandlerChainImpl extends AbstractProtocolHandlerChain imple
          * (non-Javadoc)
          * @see java.util.ListIterator#previousIndex()
          */
+        @Override
         public int previousIndex() {
             return handlers.previousIndex();
         }
@@ -332,6 +272,7 @@ public class ProtocolHandlerChainImpl extends AbstractProtocolHandlerChain imple
          * (non-Javadoc)
          * @see java.util.ListIterator#remove()
          */
+        @Override
         public void remove() {
             checkReadOnly();
 
@@ -342,6 +283,7 @@ public class ProtocolHandlerChainImpl extends AbstractProtocolHandlerChain imple
          * (non-Javadoc)
          * @see java.util.ListIterator#set(java.lang.Object)
          */
+        @Override
         public void set(ProtocolHandler e) {
             checkReadOnly();
 
@@ -352,6 +294,7 @@ public class ProtocolHandlerChainImpl extends AbstractProtocolHandlerChain imple
          * (non-Javadoc)
          * @see java.util.ListIterator#add(java.lang.Object)
          */
+        @Override
         public void add(ProtocolHandler e) {
             checkReadOnly();
             handlers.add(e);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/handler/UnknownCommandHandler.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/UnknownCommandHandler.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/UnknownCommandHandler.java
index 11f0c95..4923d54 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/UnknownCommandHandler.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/UnknownCommandHandler.java
@@ -41,10 +41,7 @@ public abstract class UnknownCommandHandler<S extends ProtocolSession> implement
     
     private static final Collection<String> COMMANDS = ImmutableSet.of(COMMAND_IDENTIFIER);
   
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
-     */
+    @Override
     public Collection<String> getImplCommands() {
         return COMMANDS;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java b/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java
index 1f6bf2e..1e56046 100644
--- a/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java
+++ b/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java
@@ -134,56 +134,69 @@ public class AbstractProtocolTransportTest {
 
         AbstractProtocolTransport transport = new AbstractProtocolTransport() {
 
+            @Override
             public void setReadable(boolean readable) {
                 throw new UnsupportedOperationException();
             }
 
             
+            @Override
             public void popLineHandler() {
                 throw new UnsupportedOperationException();
             }
             
+            @Override
             public boolean isTLSStarted() {
                 throw new UnsupportedOperationException();
             }
             
+            @Override
             public boolean isStartTLSSupported() {
                 throw new UnsupportedOperationException();
             }
             
+            @Override
             public boolean isReadable() {
                 throw new UnsupportedOperationException();
             }
             
+            @Override
             public InetSocketAddress getRemoteAddress() {
                 throw new UnsupportedOperationException();
             }
             
+            @Override
             public int getPushedLineHandlerCount() {
                 throw new UnsupportedOperationException();
             }
             
+            @Override
             public InetSocketAddress getLocalAddress() {
                 throw new UnsupportedOperationException();
             }
             
+            @Override
             public String getId() {
                 throw new UnsupportedOperationException();
             }
             
+            @Override
             protected void writeToClient(InputStream in, ProtocolSession session, boolean startTLS) {
                 throw new UnsupportedOperationException();
             }
             
+            @Override
             protected void writeToClient(byte[] bytes, ProtocolSession session, boolean startTLS) {
                 writtenMessages.add(bytes);
                 latch.countDown();
             }
             
+            @Override
             protected void close() {
                 throw new UnsupportedOperationException();
             }
 
+            @Override
             public void pushLineHandler(LineHandler<? extends ProtocolSession> overrideCommandHandler, ProtocolSession session) {
                 throw new UnsupportedOperationException();                
             }
@@ -217,14 +230,17 @@ public class AbstractProtocolTransportTest {
             this.msg =  UUID.randomUUID().toString();
         }
         
+        @Override
         public String getRetCode() {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public List<CharSequence> getLines() {
             return Arrays.asList((CharSequence)msg);
         }
 
+        @Override
         public boolean isEndSession() {
             return false;
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/test/java/org/apache/james/protocols/api/utils/BogusTrustManagerFactory.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/test/java/org/apache/james/protocols/api/utils/BogusTrustManagerFactory.java b/protocols/api/src/test/java/org/apache/james/protocols/api/utils/BogusTrustManagerFactory.java
index 649be6b..abe48e6 100644
--- a/protocols/api/src/test/java/org/apache/james/protocols/api/utils/BogusTrustManagerFactory.java
+++ b/protocols/api/src/test/java/org/apache/james/protocols/api/utils/BogusTrustManagerFactory.java
@@ -42,10 +42,12 @@ import javax.net.ssl.X509TrustManager;
 public class BogusTrustManagerFactory extends TrustManagerFactorySpi {
 
     private static final TrustManager DUMMY_TRUST_MANAGER = new X509TrustManager() {
+        @Override
         public X509Certificate[] getAcceptedIssuers() {
             return new X509Certificate[0];
         }
 
+        @Override
         public void checkClientTrusted(
                 X509Certificate[] chain, String authType) throws CertificateException {
             // Always trust - it is an example.
@@ -56,6 +58,7 @@ public class BogusTrustManagerFactory extends TrustManagerFactorySpi {
                     "UNKNOWN CLIENT CERTIFICATE: " + chain[0].getSubjectDN());
         }
 
+        @Override
         public void checkServerTrusted(
                 X509Certificate[] chain, String authType) throws CertificateException {
             // Always trust - it is an example.

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java b/protocols/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java
index 7739269..0b313f5 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java
@@ -187,6 +187,7 @@ public final class IdRange implements Iterable<Long>, Comparable<IdRange> {
      * 
      * @return rangeIt
      */
+    @Override
     public Iterator<Long> iterator() {
         long from = getLowVal();
         if (from == Long.MAX_VALUE) {
@@ -210,10 +211,12 @@ public final class IdRange implements Iterable<Long>, Comparable<IdRange> {
             this.current = from;
         }
         
+        @Override
         public boolean hasNext() {
             return current <= to;
         }
 
+        @Override
         public Long next() {
             if (hasNext()) {
                 return current++;
@@ -222,12 +225,14 @@ public final class IdRange implements Iterable<Long>, Comparable<IdRange> {
             }
         }
 
+        @Override
         public void remove() {
             throw new UnsupportedOperationException("Read-Only");
         }
         
     }
 
+    @Override
     public int compareTo(IdRange range2) {
         // Correctly sort and respect "*" and "*:*" ranges. See IMAP-289
         if (getLowVal() == Long.MAX_VALUE && getHighVal() == Long.MAX_VALUE && range2.getLowVal() == Long.MAX_VALUE && range2.getHighVal() == Long.MAX_VALUE) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
index 8329b06..93536c9 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
@@ -846,12 +846,14 @@ public abstract class ImapRequestLineReader {
     }
 
     public static class NoopCharValidator implements CharacterValidator {
+        @Override
         public boolean isValid(char chr) {
             return true;
         }
     }
 
     public static class AtomCharValidator implements CharacterValidator {
+        @Override
         public boolean isValid(char chr) {
             return (isCHAR(chr) && !isAtomSpecial(chr) && !isListWildcard(chr) && !isQuotedSpecial(chr));
         }
@@ -862,6 +864,7 @@ public abstract class ImapRequestLineReader {
     }
 
     public static class TagCharValidator extends AtomCharValidator {
+        @Override
         public boolean isValid(char chr) {
             if (chr == '+') {
                 return false;
@@ -871,6 +874,7 @@ public abstract class ImapRequestLineReader {
     }
 
     public static class MessageSetCharValidator implements CharacterValidator {
+        @Override
         public boolean isValid(char chr) {
             return (isDigit(chr) || chr == ':' || chr == '*' || chr == ',');
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
index e2dbd41..babb6dc 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
@@ -52,17 +52,12 @@ public abstract class AbstractImapCommandParser implements MessagingImapCommandP
         return command;
     }
 
-    /**
-     * @see org.apache.james.imap.decode.MessagingImapCommandParser#getStatusResponseFactory()
-     */
+    @Override
     public final StatusResponseFactory getStatusResponseFactory() {
         return statusResponseFactory;
     }
 
-    /**
-     * @see org.apache.james.imap.decode.MessagingImapCommandParser#setStatusResponseFactory
-     * (org.apache.james.imap.api.message.response.StatusResponseFactory)
-     */
+    @Override
     public final void setStatusResponseFactory(StatusResponseFactory statusResponseFactory) {
         this.statusResponseFactory = statusResponseFactory;
     }
@@ -74,6 +69,7 @@ public abstract class AbstractImapCommandParser implements MessagingImapCommandP
      *            <code>ImapRequestLineReader</code>, not null
      * @return <code>ImapCommandMessage</code>, not null
      */
+    @Override
     public final ImapMessage parse(ImapRequestLineReader request, String tag, ImapSession session) {
         ImapMessage result;
         if (!command.validForState(session.getState())) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
index d1945de..a89b2b9 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
@@ -58,11 +58,7 @@ public class DefaultImapDecoder implements ImapDecoder {
         this.maxInvalidCommands = maxInvalidCommands;
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.ImapDecoder#decode(org.apache.james.imap.decode.ImapRequestLineReader,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     public ImapMessage decode(ImapRequestLineReader request, ImapSession session) {
         ImapMessage message;
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractMessageRangeCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractMessageRangeCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractMessageRangeCommandParser.java
index 27b4e8c..0970406 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractMessageRangeCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractMessageRangeCommandParser.java
@@ -33,6 +33,7 @@ public abstract class AbstractMessageRangeCommandParser extends AbstractUidComma
         super(command);
     }
 
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, boolean useUids, ImapSession session) throws DecodingException {
         IdRange[] idSet = request.parseIdRange(session);
         String mailboxName = request.mailbox();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java
index 494d8b5..fb773be 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java
@@ -43,6 +43,7 @@ public abstract class AbstractSelectionCommandParser extends AbstractImapCommand
 
 
     
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         final String mailboxName = request.mailbox();
         boolean condstore = false;
@@ -80,6 +81,7 @@ public abstract class AbstractSelectionCommandParser extends AbstractImapCommand
                 request.consumeWord(new CharacterValidator() {
                     int pos = 0;
 
+                    @Override
                     public boolean isValid(char chr) {
                         if (pos >= QRESYNC.length) {
                             return false;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java
index 660ad0a..e845d66 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java
@@ -32,6 +32,7 @@ abstract class AbstractUidCommandParser extends AbstractImapCommandParser {
         super(command);
     }
 
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         return decode(command, request, tag, false, session);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java
index 9b6bc91..c15b307 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java
@@ -67,12 +67,7 @@ public class AppendCommandParser extends AbstractImapCommandParser {
         }
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         String mailboxName = request.mailbox();
         Flags flags = optionalAppendFlags(request);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java
index 59680c1..a7058ce 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java
@@ -37,12 +37,7 @@ public class AuthenticateCommandParser extends AbstractImapCommandParser {
         super(ImapCommand.nonAuthenticatedStateCommand(ImapConstants.AUTHENTICATE_COMMAND_NAME));
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         ImapMessage result;
         String authType = request.astring();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java
index 878bcaf..efc667d 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java
@@ -36,12 +36,7 @@ public class CapabilityCommandParser extends AbstractImapCommandParser {
         super(ImapCommand.anyStateCommand(ImapConstants.CAPABILITY_COMMAND_NAME));
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         request.eol();
         return new CapabilityRequest(command, tag);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java
index 6f02697..af447f7 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java
@@ -36,12 +36,7 @@ public class CheckCommandParser extends AbstractImapCommandParser {
         super(ImapCommand.selectedStateCommand(ImapConstants.CHECK_COMMAND_NAME));
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         request.eol();
         return new CheckRequest(command, tag);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java
index bcddc42..585db77 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java
@@ -36,12 +36,7 @@ class CloseCommandParser extends AbstractImapCommandParser {
         super(ImapCommand.selectedStateCommand(ImapConstants.CLOSE_COMMAND_NAME));
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         request.eol();
         return new CloseRequest(command, tag);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CompressCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CompressCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CompressCommandParser.java
index 7c159f3..15f5f94 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CompressCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CompressCommandParser.java
@@ -33,12 +33,7 @@ public class CompressCommandParser extends AbstractImapCommandParser {
         super(ImapCommand.anyStateCommand(ImapConstants.COMPRESS_COMMAND_NAME));
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         String algorithm = request.atom();
         request.eol();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java
index 9ec9d51..55ca7c6 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java
@@ -42,12 +42,7 @@ public class CreateCommandParser extends AbstractImapCommandParser {
         super(ImapCommand.authenticatedStateCommand(ImapConstants.CREATE_COMMAND_NAME));
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         String mailboxName = request.mailbox();
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java
index 266519b..5e3e75f 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java
@@ -36,12 +36,7 @@ public class DeleteCommandParser extends AbstractImapCommandParser {
         super(ImapCommand.authenticatedStateCommand(ImapConstants.DELETE_COMMAND_NAME));
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         String mailboxName = request.mailbox();
         request.eol();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java
index 99a55fb..a004646 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java
@@ -36,12 +36,7 @@ public class ExpungeCommandParser extends AbstractUidCommandParser {
         super(ImapCommand.selectedStateCommand(ImapConstants.EXPUNGE_COMMAND_NAME));
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.parser.AbstractUidCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * boolean, org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, boolean useUids, ImapSession session) throws DecodingException {
         IdRange[] uidSet = null;
         if (useUids) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
index 7576be7..ff2caf1 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
@@ -78,6 +78,7 @@ public class FetchCommandParser extends AbstractUidCommandParser {
                     // Now check for the CHANGEDSINCE option which is part of CONDSTORE
                     request.consumeWord(new CharacterValidator() {
                         int pos = 0;
+                        @Override
                         public boolean isValid(char chr) {
                             if (pos > CHANGEDSINCE.length) {
                                 return false;
@@ -94,6 +95,7 @@ public class FetchCommandParser extends AbstractUidCommandParser {
                     // Check for the VANISHED option which is part of QRESYNC
                     request.consumeWord(new CharacterValidator() {
                         int pos = 0;
+                        @Override
                         public boolean isValid(char chr) {
                             if (pos > VANISHED.length) {
                                 return false;
@@ -267,12 +269,7 @@ public class FetchCommandParser extends AbstractUidCommandParser {
         return next;
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.parser.AbstractUidCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * boolean, org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, boolean useUids, ImapSession session) throws DecodingException {
         IdRange[] idSet = request.parseIdRange(session);
         FetchData fetch = fetchRequest(request);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java
index 9ba170d..ecf43bd 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java
@@ -36,12 +36,7 @@ public class IdleCommandParser extends AbstractImapCommandParser {
         super(ImapCommand.authenticatedStateCommand(ImapConstants.IDLE_COMMAND_NAME));
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         request.eol();
         return new IdleRequest(command, tag);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java
index 8a0287a..de8d619 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java
@@ -114,9 +114,7 @@ public class ImapParserFactory implements ImapCommandParserFactory {
         imapCommands.put(ImapConstants.GETANNOTATION_COMMAND_NAME, GetAnnotationCommandParser.class);
     }
 
-    /**
-     * @see org.apache.james.imap.decode.ImapCommandParserFactory#getParser(java.lang.String)
-     */
+    @Override
     public ImapCommandParser getParser(String commandName) {
         Class<?> cmdClass = imapCommands.get(commandName.toUpperCase(Locale.US));
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
index 97600c0..b5f7f9a 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
@@ -60,6 +60,7 @@ public class ListCommandParser extends AbstractUidCommandParser {
     }
 
     private class ListCharValidator extends AtomCharValidator {
+        @Override
         public boolean isValid(char chr) {
             if (ImapRequestLineReader.isListWildcard(chr)) {
                 return true;
@@ -68,12 +69,7 @@ public class ListCommandParser extends AbstractUidCommandParser {
         }
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.parser.AbstractUidCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * boolean, org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, boolean useUids, ImapSession session) throws DecodingException {
         String referenceName = request.mailbox();
         String mailboxPattern = listMailbox(request);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java
index ed5dac3..dc02f54 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java
@@ -36,12 +36,7 @@ public class LoginCommandParser extends AbstractImapCommandParser {
         super(ImapCommand.nonAuthenticatedStateCommand(ImapConstants.LOGIN_COMMAND_NAME));
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         final String userid = request.astring();
         final String password = request.astring();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java
index 70f027b..8cf0705 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java
@@ -36,12 +36,7 @@ public class LogoutCommandParser extends AbstractImapCommandParser {
         super(ImapCommand.anyStateCommand(ImapConstants.LOGOUT_COMMAND_NAME));
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         request.eol();
         return new LogoutRequest(command, tag);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java
index b99deba..36064dc 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java
@@ -32,11 +32,7 @@ public class LsubCommandParser extends ListCommandParser {
         super(ImapCommand.authenticatedStateCommand(ImapConstants.LSUB_COMMAND_NAME));
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.parser.ListCommandParser#createMessage(org.apache.james.imap.api.ImapCommand,
-     * java.lang.String, java.lang.String, java.lang.String)
-     */
+    @Override
     protected ImapMessage createMessage(ImapCommand command, String referenceName, String mailboxPattern, String tag) {
         return new LsubRequest(command, referenceName, mailboxPattern, tag);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NamespaceCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NamespaceCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NamespaceCommandParser.java
index 2b88b5f..a3aeb52 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NamespaceCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NamespaceCommandParser.java
@@ -36,12 +36,7 @@ public class NamespaceCommandParser extends AbstractImapCommandParser {
         super(ImapCommand.authenticatedStateCommand(ImapConstants.NAMESPACE_COMMAND_NAME));
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         return new NamespaceRequest(command, tag);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java
index c14b9d6..6632089 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java
@@ -36,12 +36,7 @@ public class NoopCommandParser extends AbstractImapCommandParser {
         super(ImapCommand.anyStateCommand(ImapConstants.NOOP_COMMAND_NAME));
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         request.eol();
         return new NoopRequest(command, tag);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java
index c23e824..692e040 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java
@@ -36,12 +36,7 @@ public class RenameCommandParser extends AbstractImapCommandParser {
         super(ImapCommand.authenticatedStateCommand(ImapConstants.RENAME_COMMAND_NAME));
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         final String existingName = request.mailbox();
         final String newName = request.mailbox();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
index 7dfe286..2e4fc37 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
@@ -972,6 +972,7 @@ public class SearchCommandParser extends AbstractUidCommandParser {
         return options;
     }
     
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, boolean useUids, ImapSession session) throws DecodingException {
         try {
             SearchKey recent = null;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java
index fbb84f2f..8cd9e74 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java
@@ -36,12 +36,7 @@ public class StartTLSCommandParser extends AbstractImapCommandParser {
         super(ImapCommand.nonAuthenticatedStateCommand(ImapConstants.STARTTLS));
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         request.eol();
         return new StartTLSRequest(tag, command);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java
index d01fe73..33e1b85 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java
@@ -79,12 +79,7 @@ public class StatusCommandParser extends AbstractImapCommandParser {
         }
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         final String mailboxName = request.mailbox();
         final StatusDataItems statusDataItems = statusDataItems(request);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java
index 4528d81..1e320f0 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java
@@ -42,12 +42,7 @@ public class StoreCommandParser extends AbstractUidCommandParser {
         super(ImapCommand.selectedStateCommand(ImapConstants.STORE_COMMAND_NAME));
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.parser.AbstractUidCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * boolean, org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, boolean useUids, ImapSession session) throws DecodingException {
         final IdRange[] idSet = request.parseIdRange(session);
         final Boolean sign;
@@ -60,6 +55,7 @@ public class StoreCommandParser extends AbstractUidCommandParser {
             
             request.consumeWord(new CharacterValidator() {
                 private int pos = 0;
+                @Override
                 public boolean isValid(char chr) {
                     if (pos >= UNCHANGEDSINCE.length) {
                         return false;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java
index daa5df1..4b5573c 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java
@@ -36,12 +36,7 @@ public class SubscribeCommandParser extends AbstractImapCommandParser {
         super(ImapCommand.authenticatedStateCommand(ImapConstants.SUBSCRIBE_COMMAND_NAME));
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         final String mailboxName = request.mailbox();
         request.eol();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java
index 7c41b71..aad0faa 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java
@@ -44,26 +44,17 @@ public class UidCommandParser extends AbstractImapCommandParser implements Deleg
         super(ImapCommand.selectedStateCommand(ImapConstants.UID_COMMAND_NAME));
     }
 
-    /**
-     * @see org.apache.james.imap.decode.DelegatingImapCommandParser#getParserFactory()
-     */
+    @Override
     public ImapCommandParserFactory getParserFactory() {
         return parserFactory;
     }
 
-    /**
-     * @see org.apache.james.imap.decode.DelegatingImapCommandParser#setParserFactory(ImapCommandParserFactory)
-     */
+    @Override
     public void setParserFactory(ImapCommandParserFactory imapCommandFactory) {
         this.parserFactory = imapCommandFactory;
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         // TODO: check the logic against the specification:
         // TODO: suspect that it is now bust

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnselectCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnselectCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnselectCommandParser.java
index 7dda0f1..78481e3 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnselectCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnselectCommandParser.java
@@ -42,12 +42,7 @@ public class UnselectCommandParser extends AbstractImapCommandParser {
 
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         request.eol();
         return new UnselectRequest(tag, command);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java
index 2ff55f1..eed5bdf 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java
@@ -36,12 +36,7 @@ public class UnsubscribeCommandParser extends AbstractImapCommandParser {
         super(ImapCommand.authenticatedStateCommand(ImapConstants.UNSUBSCRIBE_COMMAND_NAME));
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.base.AbstractImapCommandParser#decode(org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.decode.ImapRequestLineReader, java.lang.String,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException {
         final String mailboxName = request.mailbox();
         request.eol();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/ACLResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/ACLResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/ACLResponseEncoder.java
index f5aa148..dd5a4f0 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/ACLResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/ACLResponseEncoder.java
@@ -50,6 +50,7 @@ public class ACLResponseEncoder extends AbstractChainedImapEncoder {
      * org.apache.james.imap.encode.ImapResponseComposer,
      * org.apache.james.imap.api.process.ImapSession)
      */
+    @Override
     protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
         final ACLResponse aclResponse = (ACLResponse) acceptableMessage;
         final Map<EntryKey, Rfc4314Rights> entries = aclResponse.getAcl().getEntries();
@@ -70,13 +71,7 @@ public class ACLResponseEncoder extends AbstractChainedImapEncoder {
         composer.end();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.james.imap.encode.base.AbstractChainedImapEncoder#isAcceptable
-     * (org.apache.james.imap.api.ImapMessage)
-     */
+    @Override
     public boolean isAcceptable(ImapMessage message) {
         return message instanceof ACLResponse;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/AnnotationResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/AnnotationResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/AnnotationResponseEncoder.java
index 3026647..6b0c36a 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/AnnotationResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/AnnotationResponseEncoder.java
@@ -39,6 +39,7 @@ public class AnnotationResponseEncoder extends AbstractChainedImapEncoder {
         super(next);
     }
 
+    @Override
     protected void doEncode(ImapMessage acceptableMessage, final ImapResponseComposer composer, ImapSession session) throws IOException {
 
         AnnotationResponse response = (AnnotationResponse) acceptableMessage;
@@ -71,6 +72,7 @@ public class AnnotationResponseEncoder extends AbstractChainedImapEncoder {
         }
     }
 
+    @Override
     public boolean isAcceptable(ImapMessage message) {
         return message instanceof AnnotationResponse;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/AuthenticateResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/AuthenticateResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/AuthenticateResponseEncoder.java
index 65a5c93..689a2ca 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/AuthenticateResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/AuthenticateResponseEncoder.java
@@ -31,18 +31,12 @@ public class AuthenticateResponseEncoder  extends AbstractChainedImapEncoder {
         super(next);
     }
 
-    /**
-     * @see org.apache.james.imap.encode.base.AbstractChainedImapEncoder
-     * #isAcceptable(org.apache.james.imap.api.ImapMessage)
-     */
+    @Override
     protected boolean isAcceptable(ImapMessage message) {
         return message instanceof AuthenticateResponse;
     }
 
-    /**
-     * @see org.apache.james.imap.encode.base.AbstractChainedImapEncoder
-     * #doEncode(org.apache.james.imap.api.ImapMessage, org.apache.james.imap.encode.ImapResponseComposer, org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
         composer.continuationResponse("");
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/CapabilityResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/CapabilityResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/CapabilityResponseEncoder.java
index 5ad13d1..df7f96c 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/CapabilityResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/CapabilityResponseEncoder.java
@@ -38,12 +38,7 @@ public class CapabilityResponseEncoder extends AbstractChainedImapEncoder {
         super(next);
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.encode.base.AbstractChainedImapEncoder#doEncode(org.apache.james.imap.api.ImapMessage,
-     * org.apache.james.imap.encode.ImapResponseComposer,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
         final CapabilityResponse response = (CapabilityResponse) acceptableMessage;
         Iterator<String> capabilities = response.getCapabilities().iterator();
@@ -55,11 +50,7 @@ public class CapabilityResponseEncoder extends AbstractChainedImapEncoder {
         composer.end();        
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.encode.base.AbstractChainedImapEncoder#isAcceptable
-     * (org.apache.james.imap.api.ImapMessage)
-     */
+    @Override
     protected boolean isAcceptable(ImapMessage message) {
         return (message instanceof CapabilityResponse);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/ContinuationResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/ContinuationResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/ContinuationResponseEncoder.java
index b31f7ad..f589984 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/ContinuationResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/ContinuationResponseEncoder.java
@@ -39,6 +39,7 @@ public class ContinuationResponseEncoder extends AbstractChainedImapEncoder {
         this.localizer = localizer;
     }
 
+    @Override
     protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
 
         ContinuationResponse response = (ContinuationResponse) acceptableMessage;
@@ -51,6 +52,7 @@ public class ContinuationResponseEncoder extends AbstractChainedImapEncoder {
         return localizer.localize(text, new Locales(new ArrayList<>(), null));
     }
 
+    @Override
     protected boolean isAcceptable(ImapMessage message) {
         return (message instanceof ContinuationResponse);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/ESearchResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/ESearchResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/ESearchResponseEncoder.java
index 440344d..37f349f 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/ESearchResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/ESearchResponseEncoder.java
@@ -38,6 +38,7 @@ public class ESearchResponseEncoder extends AbstractChainedImapEncoder {
         super(next);
     }
 
+    @Override
     protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
         ESearchResponse response = (ESearchResponse) acceptableMessage;
         String tag = response.getTag();
@@ -82,10 +83,7 @@ public class ESearchResponseEncoder extends AbstractChainedImapEncoder {
         composer.end();
     }
 
-    /**
-     * @see org.apache.james.imap.encode.base.AbstractChainedImapEncoder#isAcceptable
-     * (org.apache.james.imap.api.ImapMessage)
-     */
+    @Override
     protected boolean isAcceptable(ImapMessage message) {
         return (message instanceof ESearchResponse);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/EnableResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/EnableResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/EnableResponseEncoder.java
index 818853d..09e52f8 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/EnableResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/EnableResponseEncoder.java
@@ -35,13 +35,7 @@ public class EnableResponseEncoder extends AbstractChainedImapEncoder {
         super(next);
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.encode.base.AbstractChainedImapEncoder#doEncode
-     * (org.apache.james.imap.api.ImapMessage,
-     * org.apache.james.imap.encode.ImapResponseComposer,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
         final EnableResponse response = (EnableResponse) acceptableMessage;
         Set<String> capabilities = response.getCapabilities();
@@ -54,11 +48,7 @@ public class EnableResponseEncoder extends AbstractChainedImapEncoder {
         composer.end();
     }
     
-    /**
-     * @see
-     * org.apache.james.imap.encode.base.AbstractChainedImapEncoder#isAcceptable
-     * (org.apache.james.imap.api.ImapMessage)
-     */
+    @Override
     protected boolean isAcceptable(ImapMessage message) {
         return (message instanceof EnableResponse);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/ExistsResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/ExistsResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/ExistsResponseEncoder.java
index 3faf0c5..ad205cb 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/ExistsResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/ExistsResponseEncoder.java
@@ -34,10 +34,12 @@ public class ExistsResponseEncoder extends AbstractChainedImapEncoder {
         super(next);
     }
 
+    @Override
     public boolean isAcceptable(ImapMessage message) {
         return message instanceof ExistsResponse;
     }
 
+    @Override
     protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
         final ExistsResponse existsResponse = (ExistsResponse) acceptableMessage;
         final long numberOfMessages = existsResponse.getNumberOfMessages();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/ExpungeResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/ExpungeResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/ExpungeResponseEncoder.java
index acf63d2..0308f39 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/ExpungeResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/ExpungeResponseEncoder.java
@@ -33,10 +33,12 @@ public class ExpungeResponseEncoder extends AbstractChainedImapEncoder {
         super(next);
     }
 
+    @Override
     public boolean isAcceptable(ImapMessage message) {
         return (message instanceof ExpungeResponse);
     }
 
+    @Override
     protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
         final ExpungeResponse expungeResponse = (ExpungeResponse) acceptableMessage;
         final int messageSequenceNumber = expungeResponse.getMessageSequenceNumber();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
index 48bc82f..1ae8171 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
@@ -61,10 +61,12 @@ public class FetchResponseEncoder extends AbstractChainedImapEncoder {
         this.neverAddBodyStructureExtensions = neverAddBodyStructureExtensions;
     }
 
+    @Override
     public boolean isAcceptable(ImapMessage message) {
         return (message instanceof FetchResponse);
     }
 
+    @Override
     protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
         if (acceptableMessage instanceof FetchResponse) {
             final FetchResponse fetchResponse = (FetchResponse) acceptableMessage;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/FlagsResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/FlagsResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/FlagsResponseEncoder.java
index 82b6cbe..1d31d66 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/FlagsResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/FlagsResponseEncoder.java
@@ -34,10 +34,12 @@ public class FlagsResponseEncoder extends AbstractChainedImapEncoder {
         super(next);
     }
 
+    @Override
     public boolean isAcceptable(ImapMessage message) {
         return message instanceof FlagsResponse;
     }
 
+    @Override
     protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
         final FlagsResponse flagsResponse = (FlagsResponse) acceptableMessage;
         final Flags flags = flagsResponse.getFlags();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/LSubResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/LSubResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/LSubResponseEncoder.java
index b0c238a..8e47eea 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/LSubResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/LSubResponseEncoder.java
@@ -36,11 +36,13 @@ public class LSubResponseEncoder extends AbstractChainedImapEncoder {
         super(next);
     }
 
+    @Override
     protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
         final AbstractListingResponse response = (AbstractListingResponse) acceptableMessage;
         ListingEncodingUtils.encodeListingResponse(ImapConstants.LSUB_RESPONSE_NAME, composer, response);
     }
 
+    @Override
     protected boolean isAcceptable(ImapMessage message) {
         return (message instanceof LSubResponse);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/ListResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/ListResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/ListResponseEncoder.java
index e15cde1..7485796 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/ListResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/ListResponseEncoder.java
@@ -36,11 +36,13 @@ public class ListResponseEncoder extends AbstractChainedImapEncoder {
         super(next);
     }
 
+    @Override
     protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
         final AbstractListingResponse response = (AbstractListingResponse) acceptableMessage;
         ListingEncodingUtils.encodeListingResponse(ImapConstants.LIST_RESPONSE_NAME, composer, response);
     }
 
+    @Override
     protected boolean isAcceptable(ImapMessage message) {
         return (message instanceof ListResponse);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/ListRightsResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/ListRightsResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/ListRightsResponseEncoder.java
index 96766b4..5c081fd 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/ListRightsResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/ListRightsResponseEncoder.java
@@ -39,13 +39,7 @@ public class ListRightsResponseEncoder extends AbstractChainedImapEncoder {
         super(next);
     }
 
-    /** 
-     * @see
-     * org.apache.james.imap.encode.base.AbstractChainedImapEncoder#doEncode
-     * (org.apache.james.imap.api.ImapMessage,
-     * org.apache.james.imap.encode.ImapResponseComposer,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
         final ListRightsResponse listRightsResponse = (ListRightsResponse) acceptableMessage;
         composer.untagged();
@@ -65,11 +59,7 @@ public class ListRightsResponseEncoder extends AbstractChainedImapEncoder {
         composer.end();
     }
 
-    /** 
-     * @see
-     * org.apache.james.imap.encode.base.AbstractChainedImapEncoder#isAcceptable
-     * (org.apache.james.imap.api.ImapMessage)
-     */
+    @Override
     public boolean isAcceptable(ImapMessage message) {
         return message instanceof ListRightsResponse;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/MailboxStatusResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/MailboxStatusResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/MailboxStatusResponseEncoder.java
index 62cf17d..f4cd8bd 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/MailboxStatusResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/MailboxStatusResponseEncoder.java
@@ -37,6 +37,7 @@ public class MailboxStatusResponseEncoder extends AbstractChainedImapEncoder imp
         super(next);
     }
 
+    @Override
     protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
         MailboxStatusResponse response = (MailboxStatusResponse) acceptableMessage;
         Long messages = response.getMessages();
@@ -91,6 +92,7 @@ public class MailboxStatusResponseEncoder extends AbstractChainedImapEncoder imp
         composer.end();
     }
 
+    @Override
     protected boolean isAcceptable(ImapMessage message) {
         return message != null && message instanceof MailboxStatusResponse;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/MyRightsResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/MyRightsResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/MyRightsResponseEncoder.java
index a70b2d4..1ca6164 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/MyRightsResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/MyRightsResponseEncoder.java
@@ -39,13 +39,7 @@ public class MyRightsResponseEncoder extends AbstractChainedImapEncoder {
         super(next);
     }
 
-    /** 
-     * @see
-     * org.apache.james.imap.encode.base.AbstractChainedImapEncoder#doEncode
-     * (org.apache.james.imap.api.ImapMessage,
-     * org.apache.james.imap.encode.ImapResponseComposer,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
         final MyRightsResponse aclResponse = (MyRightsResponse) acceptableMessage;
         final Rfc4314Rights myRights = aclResponse.getMyRights();
@@ -58,13 +52,7 @@ public class MyRightsResponseEncoder extends AbstractChainedImapEncoder {
         composer.end();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.james.imap.encode.base.AbstractChainedImapEncoder#isAcceptable
-     * (org.apache.james.imap.api.ImapMessage)
-     */
+    @Override
     public boolean isAcceptable(ImapMessage message) {
         return message instanceof MyRightsResponse;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaResponseEncoder.java
index 8f9e515..9cdaa2f 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaResponseEncoder.java
@@ -38,6 +38,7 @@ public class QuotaResponseEncoder extends AbstractChainedImapEncoder {
         super(next);
     }
 
+    @Override
     protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
 
         QuotaResponse quotaResponse = (QuotaResponse) acceptableMessage;
@@ -75,13 +76,7 @@ public class QuotaResponseEncoder extends AbstractChainedImapEncoder {
         composer.message(quota.getLimit().asLong());
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.james.imap.encode.base.AbstractChainedImapEncoder#isAcceptable
-     * (org.apache.james.imap.api.ImapMessage)
-     */
+    @Override
     public boolean isAcceptable(ImapMessage message) {
         return message instanceof QuotaResponse;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaRootResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaRootResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaRootResponseEncoder.java
index 062dd54..e464b78 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaRootResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaRootResponseEncoder.java
@@ -36,6 +36,7 @@ public class QuotaRootResponseEncoder extends AbstractChainedImapEncoder {
         super(next);
     }
 
+    @Override
     protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer, ImapSession session) throws IOException {
 
         QuotaRootResponse quotaRootResponse = (QuotaRootResponse) acceptableMessage;
@@ -51,13 +52,7 @@ public class QuotaRootResponseEncoder extends AbstractChainedImapEncoder {
         composer.end();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.apache.james.imap.encode.base.AbstractChainedImapEncoder#isAcceptable
-     * (org.apache.james.imap.api.ImapMessage)
-     */
+    @Override
     public boolean isAcceptable(ImapMessage message) {
         return message instanceof QuotaRootResponse;
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org