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

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/SearchResponseEncoder.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/SearchResponseEncoder.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/SearchResponseEncoder.java
index fdbc767..f60030c 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/SearchResponseEncoder.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/SearchResponseEncoder.java
@@ -35,6 +35,7 @@ public class SearchResponseEncoder extends 
AbstractChainedImapEncoder {
         super(next);
     }
 
+    @Override
     protected void doEncode(ImapMessage acceptableMessage, 
ImapResponseComposer composer, ImapSession session) throws IOException {
         SearchResponse response = (SearchResponse) acceptableMessage;
         final long[] ids = response.getIds();
@@ -57,6 +58,7 @@ public class SearchResponseEncoder extends 
AbstractChainedImapEncoder {
         composer.end();
     }
 
+    @Override
     protected boolean isAcceptable(ImapMessage message) {
         return (message instanceof SearchResponse);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java
index 6f0bf25..92b0a25 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java
@@ -43,6 +43,7 @@ public class StatusResponseEncoder extends 
AbstractChainedImapEncoder {
         this.localizer = localizer;
     }
 
+    @Override
     protected void doEncode(ImapMessage acceptableMessage, 
ImapResponseComposer composer, ImapSession session) throws IOException {
         StatusResponse response = (StatusResponse) acceptableMessage;
         final Type serverResponseType = response.getServerResponseType();
@@ -126,6 +127,7 @@ public class StatusResponseEncoder extends 
AbstractChainedImapEncoder {
         return result;
     }
 
+    @Override
     protected boolean isAcceptable(ImapMessage message) {
         return (message instanceof StatusResponse);
     }

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

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/base/AbstractChainedImapEncoder.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/base/AbstractChainedImapEncoder.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/base/AbstractChainedImapEncoder.java
index 177dbec..65e750e 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/base/AbstractChainedImapEncoder.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/base/AbstractChainedImapEncoder.java
@@ -45,6 +45,7 @@ public abstract class AbstractChainedImapEncoder implements 
ImapEncoder {
      * Encode the {@link ImapMessage} if {@link #isAcceptable(ImapMessage)}
      * return true, if not pass it to the next encoder in the chain
      */
+    @Override
     public void encode(ImapMessage message, ImapResponseComposer composer, 
ImapSession session) throws IOException {
         final boolean isAcceptable = isAcceptable(message);
         if (isAcceptable) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/base/EndImapEncoder.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/base/EndImapEncoder.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/base/EndImapEncoder.java
index 7a48f73..ad9892d 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/base/EndImapEncoder.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/base/EndImapEncoder.java
@@ -36,11 +36,7 @@ import org.slf4j.LoggerFactory;
 public class EndImapEncoder implements ImapEncoder {
     private static final Logger LOGGER = 
LoggerFactory.getLogger(EndImapEncoder.class);
 
-    /**
-     * @see
-     * 
org.apache.james.imap.encode.ImapEncoder#encode(org.apache.james.imap.api.ImapMessage,
 org.apache.james.imap.encode.ImapResponseComposer,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     public void encode(ImapMessage message, ImapResponseComposer composer, 
ImapSession session) throws IOException {
         LOGGER.warn("Unknown message {}", message);
         LOGGER.debug("Chain end reached for {}", message);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
index 7594834..5707af5 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
@@ -66,11 +66,7 @@ public class ImapResponseComposerImpl implements 
ImapConstants, ImapResponseComp
         this(writer, DEFAULT_BUFFER_SIZE);
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.encode.ImapResponseComposer#untaggedNoResponse
-     * (java.lang.String, java.lang.String)
-     */
+    @Override
     public ImapResponseComposer untaggedNoResponse(String displayMessage, 
String responseCode) throws IOException {
         untagged();
         message(NO);
@@ -80,11 +76,7 @@ public class ImapResponseComposerImpl implements 
ImapConstants, ImapResponseComp
         return this;
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.encode.ImapResponseComposer#continuationResponse
-     * (java.lang.String)
-     */
+    @Override
     public ImapResponseComposer continuationResponse(String message) throws 
IOException {
         writeASCII(CONTINUATION + SP + message);
         end();
@@ -93,11 +85,7 @@ public class ImapResponseComposerImpl implements 
ImapConstants, ImapResponseComp
 
 
 
-    /**
-     * @see
-     * 
org.apache.james.imap.encode.ImapResponseComposer#commandResponse(org.apache.james.imap.api.ImapCommand,
-     * java.lang.String)
-     */
+    @Override
     public ImapResponseComposer commandResponse(ImapCommand command, String 
message) throws IOException {
         untagged();
         commandName(command.getName());
@@ -106,10 +94,7 @@ public class ImapResponseComposerImpl implements 
ImapConstants, ImapResponseComp
         return this;
     }
 
-    /**
-     * @see
-     * 
org.apache.james.imap.encode.ImapResponseComposer#taggedResponse(java.lang.String,
 java.lang.String)
-     */
+    @Override
     public ImapResponseComposer taggedResponse(String message, String tag) 
throws IOException {
         tag(tag);
         message(message);
@@ -117,10 +102,7 @@ public class ImapResponseComposerImpl implements 
ImapConstants, ImapResponseComp
         return this;
     }
 
-    /**
-     * @see
-     * 
org.apache.james.imap.encode.ImapResponseComposer#untaggedResponse(java.lang.String)
-     */
+    @Override
     public ImapResponseComposer untaggedResponse(String message) throws 
IOException {
         untagged();
         message(message);
@@ -129,18 +111,13 @@ public class ImapResponseComposerImpl implements 
ImapConstants, ImapResponseComp
     }
 
    
-    /**
-     * @see org.apache.james.imap.encode.ImapResponseComposer#untagged()
-     */
+    @Override
     public ImapResponseComposer untagged() throws IOException {
         writeASCII(UNTAGGED);
         return this;
     }
 
-    /**
-     * @see
-     * 
org.apache.james.imap.encode.ImapResponseComposer#message(java.lang.String)
-     */
+    @Override
     public ImapResponseComposer message(String message) throws IOException {
         if (message != null) {
             // TODO: consider message normalisation
@@ -161,9 +138,7 @@ public class ImapResponseComposerImpl implements 
ImapConstants, ImapResponseComp
         }
     }
 
-    /**
-     * @see org.apache.james.imap.encode.ImapResponseComposer#end()
-     */
+    @Override
     public ImapResponseComposer end() throws IOException {
         buffer.write(LINE_END.getBytes());
         writer.write(buffer.toByteArray());
@@ -171,26 +146,19 @@ public class ImapResponseComposerImpl implements 
ImapConstants, ImapResponseComp
         return this;
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.encode.ImapResponseComposer#tag(java.lang.String)
-     */
+    @Override
     public ImapResponseComposer tag(String tag) throws IOException {
         writeASCII(tag);
         return this;
     }
 
-    /**
-     * @see org.apache.james.imap.encode.ImapResponseComposer#closeParen()
-     */
+    @Override
     public ImapResponseComposer closeParen() throws IOException {
         closeBracket(BYTE_CLOSING_PARENTHESIS);
         return this;
     }
 
-    /**
-     * @see org.apache.james.imap.encode.ImapResponseComposer#openParen()
-     */
+    @Override
     public ImapResponseComposer openParen() throws IOException {
         openBracket(BYTE_OPENING_PARENTHESIS);
         return this;
@@ -198,10 +166,7 @@ public class ImapResponseComposerImpl implements 
ImapConstants, ImapResponseComp
 
 
 
-    /**
-     * @see
-     * 
org.apache.james.imap.encode.ImapResponseComposer#flags(javax.mail.Flags)
-     */
+    @Override
     public ImapResponseComposer flags(Flags flags) throws IOException {
         message(FLAGS);
         openParen();
@@ -232,18 +197,13 @@ public class ImapResponseComposerImpl implements 
ImapConstants, ImapResponseComp
         return this;
     }
 
-    /**
-     * @see org.apache.james.imap.encode.ImapResponseComposer#nil()
-     */
+    @Override
     public ImapResponseComposer nil() throws IOException {
         message(NIL);
         return this;
     }
 
-    /**
-     * @see
-     * 
org.apache.james.imap.encode.ImapResponseComposer#upperCaseAscii(java.lang.String)
-     */
+    @Override
     public ImapResponseComposer upperCaseAscii(String message) throws 
IOException {
         if (message == null) {
             nil();
@@ -253,11 +213,7 @@ public class ImapResponseComposerImpl implements 
ImapConstants, ImapResponseComp
         return this;
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.encode.ImapResponseComposer#quoteUpperCaseAscii
-     * (java.lang.String)
-     */
+    @Override
     public ImapResponseComposer quoteUpperCaseAscii(String message) throws 
IOException {
         if (message == null) {
             nil();
@@ -272,37 +228,27 @@ public class ImapResponseComposerImpl implements 
ImapConstants, ImapResponseComp
         buffer.write(string.getBytes(usAscii));
     }
 
-    /**
-     * @see org.apache.james.imap.encode.ImapResponseComposer#message(long)
-     */
+    @Override
     public ImapResponseComposer message(long number) throws IOException {
         space();
         writeASCII(Long.toString(number));
         return this;
     }
     
-    /**
-     * @see 
org.apache.james.imap.encode.ImapResponseComposer#mailbox(java.lang.String)
-     */
+    @Override
     public ImapResponseComposer mailbox(String mailboxName) throws IOException 
{
         quote(CharsetUtil.encodeModifiedUTF7(mailboxName));
         return this;
     }
 
-    /**
-     * @see
-     * 
org.apache.james.imap.encode.ImapResponseComposer#commandName(java.lang.String)
-     */
+    @Override
     public ImapResponseComposer commandName(String commandName) throws 
IOException {
         space();
         writeASCII(commandName);
         return this;
     }
 
-    /**
-     * @see
-     * 
org.apache.james.imap.encode.ImapResponseComposer#quote(java.lang.String)
-     */
+    @Override
     public ImapResponseComposer quote(String message) throws IOException {
         space();
         final int length = message.length();
@@ -340,9 +286,7 @@ public class ImapResponseComposerImpl implements 
ImapConstants, ImapResponseComp
         skipNextSpace = false;
     }
 
-    /**
-     * @see org.apache.james.imap.encode.ImapResponseComposer#skipNextSpace()
-     */
+    @Override
     public ImapResponseComposer skipNextSpace() {
         skipNextSpace = true;
         return this;
@@ -356,10 +300,7 @@ public class ImapResponseComposerImpl implements 
ImapConstants, ImapResponseComp
         }
     }
 
-    /**
-     * @see
-     * 
org.apache.james.imap.encode.ImapResponseComposer#literal(org.apache.james.imap.message.response.Literal)
-     */
+    @Override
     public ImapResponseComposer literal(Literal literal) throws IOException {
         space();
         buffer.write(BYTE_OPEN_BRACE);
@@ -373,11 +314,13 @@ public class ImapResponseComposerImpl implements 
ImapConstants, ImapResponseComp
         return this;
     }
 
+    @Override
     public ImapResponseComposer closeSquareBracket() throws IOException {
         closeBracket(BYTE_CLOSE_SQUARE_BRACKET);
         return this;
     }
 
+    @Override
     public ImapResponseComposer openSquareBracket() throws IOException {
         openBracket(BYTE_OPEN_SQUARE_BRACKET);
         return this;
@@ -402,6 +345,7 @@ public class ImapResponseComposerImpl implements 
ImapConstants, ImapResponseComp
         }
     }
 
+    @Override
     public ImapResponseComposer sequenceSet(UidRange[] ranges) throws 
IOException {
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < ranges.length; i++) {
@@ -414,6 +358,7 @@ public class ImapResponseComposerImpl implements 
ImapConstants, ImapResponseComp
         return message(sb.toString());
     }
 
+    @Override
     public ImapResponseComposer sequenceSet(IdRange[] ranges) throws 
IOException {
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < ranges.length; i++) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java
index ce2e24a..974604f 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java
@@ -115,9 +115,7 @@ public class DefaultImapEncoderFactory implements 
ImapEncoderFactory {
         this.neverAddBodyStructureExtensions = neverAddBodyStructureExtensions;
     }
 
-    /**
-     * @see org.apache.james.imap.encode.ImapEncoderFactory#buildImapEncoder()
-     */
+    @Override
     public ImapEncoder buildImapEncoder() {
         return createDefaultEncoder(localizer, 
neverAddBodyStructureExtensions);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/encode/main/DefaultLocalizer.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/main/DefaultLocalizer.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/main/DefaultLocalizer.java
index e28c77a..d160a01 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/encode/main/DefaultLocalizer.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/encode/main/DefaultLocalizer.java
@@ -32,9 +32,7 @@ import org.apache.james.imap.api.display.Localizer;
  */
 public class DefaultLocalizer implements Localizer {
 
-    /**
-     * @see Localizer#localize(HumanReadableText, Locales)
-     */
+    @Override
     public String localize(HumanReadableText text, Locales locales) {
         
         String result;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/main/AbstractImapRequestHandler.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/main/AbstractImapRequestHandler.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/main/AbstractImapRequestHandler.java
index fb3cc90..23cebdb 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/main/AbstractImapRequestHandler.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/main/AbstractImapRequestHandler.java
@@ -84,6 +84,7 @@ public abstract class AbstractImapRequestHandler {
      */
     public static final class SilentResponder implements Responder {
 
+        @Override
         public void respond(ImapResponseMessage message) {
             // Swallow
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java
index f636035..a6de072 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java
@@ -38,6 +38,7 @@ public class DefaultImapDecoderFactory implements 
ImapDecoderFactory {
         return new DefaultImapDecoder(unpooledStatusResponseFactory, 
imapCommands);
     }
 
+    @Override
     public ImapDecoder buildImapDecoder() {
         return createDecoder();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/main/ResponseEncoder.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/main/ResponseEncoder.java 
b/protocols/imap/src/main/java/org/apache/james/imap/main/ResponseEncoder.java
index e875533..f7e0d42 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/main/ResponseEncoder.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/main/ResponseEncoder.java
@@ -41,6 +41,7 @@ public class ResponseEncoder implements Responder {
         this.session = session;
     }
 
+    @Override
     public void respond(ImapResponseMessage message) {
         try {
             encoder.encode(message, composer, session);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/message/request/AbstractImapRequest.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/message/request/AbstractImapRequest.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/message/request/AbstractImapRequest.java
index d10a2f6..0198181 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/message/request/AbstractImapRequest.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/message/request/AbstractImapRequest.java
@@ -40,6 +40,7 @@ public abstract class AbstractImapRequest implements 
ImapRequest {
      * 
      * @see org.apache.james.imap.api.message.request.ImapRequest#getCommand()
      */
+    @Override
     public final ImapCommand getCommand() {
         return command;
     }
@@ -49,6 +50,7 @@ public abstract class AbstractImapRequest implements 
ImapRequest {
      * 
      * @see org.apache.james.imap.api.message.request.ImapRequest#getTag()
      */
+    @Override
     public final String getTag() {
         return tag;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/message/response/AbstactStatusResponseFactory.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/message/response/AbstactStatusResponseFactory.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/message/response/AbstactStatusResponseFactory.java
index 062da0a..b291ee9 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/message/response/AbstactStatusResponseFactory.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/message/response/AbstactStatusResponseFactory.java
@@ -33,66 +33,82 @@ public abstract class AbstactStatusResponseFactory 
implements StatusResponseFact
 
     protected abstract StatusResponse createResponse(StatusResponse.Type type, 
String tag, ImapCommand command, HumanReadableText displayTextKey, ResponseCode 
code);
 
+    @Override
     public StatusResponse bye(HumanReadableText displayTextKey, ResponseCode 
code) {
         return createResponse(StatusResponse.Type.BYE, null, null, 
displayTextKey, code);
     }
 
+    @Override
     public StatusResponse bye(HumanReadableText displayTextKey) {
         return bye(displayTextKey, null);
     }
 
+    @Override
     public StatusResponse preauth(HumanReadableText displayTextKey, 
ResponseCode code) {
         return createResponse(StatusResponse.Type.PREAUTH, null, null, 
displayTextKey, code);
     }
 
+    @Override
     public StatusResponse preauth(HumanReadableText displayTextKey) {
         return preauth(displayTextKey, null);
     }
 
+    @Override
     public StatusResponse taggedBad(String tag, ImapCommand command, 
HumanReadableText displayTextKey, ResponseCode code) {
         return createResponse(StatusResponse.Type.BAD, tag, command, 
displayTextKey, code);
     }
 
+    @Override
     public StatusResponse taggedBad(String tag, ImapCommand command, 
HumanReadableText displayTextKey) {
         return taggedBad(tag, command, displayTextKey, null);
     }
 
+    @Override
     public StatusResponse taggedNo(String tag, ImapCommand command, 
HumanReadableText displayTextKey, ResponseCode code) {
         return createResponse(StatusResponse.Type.NO, tag, command, 
displayTextKey, code);
     }
 
+    @Override
     public StatusResponse taggedNo(String tag, ImapCommand command, 
HumanReadableText displayTextKey) {
         return taggedNo(tag, command, displayTextKey, null);
     }
 
+    @Override
     public StatusResponse taggedOk(String tag, ImapCommand command, 
HumanReadableText displayTextKey, ResponseCode code) {
         return createResponse(StatusResponse.Type.OK, tag, command, 
displayTextKey, code);
     }
 
+    @Override
     public StatusResponse taggedOk(String tag, ImapCommand command, 
HumanReadableText displayTextKey) {
         return taggedOk(tag, command, displayTextKey, null);
     }
 
+    @Override
     public StatusResponse untaggedBad(HumanReadableText displayTextKey, 
ResponseCode code) {
         return taggedBad(null, null, displayTextKey, code);
     }
 
+    @Override
     public StatusResponse untaggedBad(HumanReadableText displayTextKey) {
         return untaggedBad(displayTextKey, null);
     }
 
+    @Override
     public StatusResponse untaggedNo(HumanReadableText displayTextKey, 
ResponseCode code) {
         return taggedNo(null, null, displayTextKey, code);
     }
 
+    @Override
     public StatusResponse untaggedNo(HumanReadableText displayTextKey) {
         return untaggedNo(displayTextKey, null);
     }
 
+    @Override
     public StatusResponse untaggedOk(HumanReadableText displayTextKey, 
ResponseCode code) {
         return taggedOk(null, null, displayTextKey, code);
     }
 
+    @Override
     public StatusResponse untaggedOk(HumanReadableText displayTextKey) {
         return untaggedOk(displayTextKey, null);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/message/response/ImmutableStatusResponse.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/message/response/ImmutableStatusResponse.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/message/response/ImmutableStatusResponse.java
index 8adba0a..5ab2d7d 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/message/response/ImmutableStatusResponse.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/message/response/ImmutableStatusResponse.java
@@ -51,37 +51,27 @@ public class ImmutableStatusResponse implements 
StatusResponse {
         this.command = command;
     }
 
-    /**
-     * @see StatusResponse#getResponseCode()
-     */
+    @Override
     public ResponseCode getResponseCode() {
         return responseCode;
     }
 
-    /**
-     * @see StatusResponse#getServerResponseType()
-     */
+    @Override
     public Type getServerResponseType() {
         return serverResponseType;
     }
 
-    /**
-     * @see StatusResponse#getTag()
-     */
+    @Override
     public String getTag() {
         return tag;
     }
 
-    /**
-     * @see StatusResponse#getTextKey()
-     */
+    @Override
     public HumanReadableText getTextKey() {
         return textKey;
     }
 
-    /**
-     * @see StatusResponse#getCommand()
-     */
+    @Override
     public ImapCommand getCommand() {
         return command;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactory.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactory.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactory.java
index 9345781..0bc17c6 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactory.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactory.java
@@ -28,6 +28,7 @@ import 
org.apache.james.imap.api.message.response.StatusResponseFactory;
 
 public class UnpooledStatusResponseFactory extends 
AbstactStatusResponseFactory implements StatusResponseFactory {
 
+    @Override
     protected StatusResponse createResponse(Type type, String tag, ImapCommand 
command, HumanReadableText displayTextKey, ResponseCode code) {
         return new ImmutableStatusResponse(type, tag, command, displayTextKey, 
code);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
index 95b4470..5d817b5 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
@@ -76,13 +76,7 @@ abstract class AbstractSelectionProcessor<M extends 
AbstractMailboxSelectionRequ
 
     }
 
-    /**
-     * @see
-     * 
org.apache.james.imap.processor.AbstractMailboxProcessor#doProcess(org.apache.james.imap.api.message.request.ImapRequest,
-     * org.apache.james.imap.api.process.ImapSession, java.lang.String,
-     * org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.api.process.ImapProcessor.Responder)
-     */
+    @Override
     protected void doProcess(M request, ImapSession session, String tag, 
ImapCommand command, Responder responder) {
         final String mailboxName = request.getMailboxName();
         try {
@@ -434,23 +428,17 @@ abstract class AbstractSelectionProcessor<M extends 
AbstractMailboxSelectionRequ
         }
     }
 
-    /**
-     * @see 
org.apache.james.imap.processor.CapabilityImplementingProcessor#getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
-     */
-    public List<String> getImplementedCapabilities(ImapSession session) {      
  
+    @Override
+    public List<String> getImplementedCapabilities(ImapSession session) {
         return CAPS;
     }
 
-    /**
-     * @see 
org.apache.james.imap.processor.PermitEnableCapabilityProcessor#getPermitEnableCapabilities(org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     public List<String> getPermitEnableCapabilities(ImapSession session) {
         return CAPS;
     }
 
-    /**
-     * @see 
org.apache.james.imap.processor.PermitEnableCapabilityProcessor#enable(org.apache.james.imap.api.ImapMessage,
 org.apache.james.imap.api.process.ImapProcessor.Responder, 
org.apache.james.imap.api.process.ImapSession, java.lang.String)
-     */
+    @Override
     public void enable(ImapMessage message, Responder responder, ImapSession 
session, String capability) throws EnableException {
 
         if 
(EnableProcessor.getEnabledCapabilities(session).contains(capability) == false) 
{

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
index b538f9e..31951fe 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
@@ -62,13 +62,7 @@ public class AppendProcessor extends 
AbstractMailboxProcessor<AppendRequest> {
         super(AppendRequest.class, next, mailboxManager, 
statusResponseFactory, metricFactory);
     }
 
-    /**
-     * @see
-     * 
org.apache.james.imap.processor.AbstractMailboxProcessor#doProcess(org.apache.james.imap.api.message.request.ImapRequest,
-     * org.apache.james.imap.api.process.ImapSession, java.lang.String,
-     * org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.api.process.ImapProcessor.Responder)
-     */
+    @Override
     protected void doProcess(AppendRequest request, ImapSession session, 
String tag, ImapCommand command, Responder responder) {
         final String mailboxName = request.getMailboxName();
         final InputStream messageIn = request.getMessage();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java
index 8963e2c..0c6a302 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java
@@ -56,13 +56,7 @@ public class AuthenticateProcessor extends 
AbstractAuthProcessor<AuthenticateReq
         super(AuthenticateRequest.class, next, mailboxManager, factory, 
metricFactory);
     }
 
-    /**
-     * @see
-     * 
org.apache.james.imap.processor.AbstractMailboxProcessor#doProcess(org.apache.james.imap.api.message.request.ImapRequest,
-     * org.apache.james.imap.api.process.ImapSession, java.lang.String,
-     * org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.api.process.ImapProcessor.Responder)
-     */
+    @Override
     protected void doProcess(AuthenticateRequest request, ImapSession session, 
final String tag, final ImapCommand command, final Responder responder) {
         final String authType = request.getAuthType();
         if (authType.equalsIgnoreCase(PLAIN)) {
@@ -147,10 +141,7 @@ public class AuthenticateProcessor extends 
AbstractAuthProcessor<AuthenticateReq
         }
     }
 
-    /**
-     * @see org.apache.james.imap.processor.CapabilityImplementingProcessor
-     * 
#getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         List<String> caps = new ArrayList<>();
         // Only ounce AUTH=PLAIN if the session does allow plain auth or TLS 
is active.

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java
index eba6757..6003191 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java
@@ -96,13 +96,7 @@ public class CapabilityProcessor extends 
AbstractMailboxProcessor<CapabilityRequ
                 && !disabledCaps.contains(SUPPORTS_CONDSTORE);
     }
 
-    /**
-     * @see
-     * 
org.apache.james.imap.processor.AbstractMailboxProcessor#doProcess(org.apache.james.imap.api.message.request.ImapRequest,
-     * org.apache.james.imap.api.process.ImapSession, java.lang.String,
-     * org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.api.process.ImapProcessor.Responder)
-     */
+    @Override
     protected void doProcess(CapabilityRequest request, ImapSession session, 
String tag, ImapCommand command, Responder responder) {
         final CapabilityResponse result = new 
CapabilityResponse(getSupportedCapabilities(session));        
         responder.respond(result);
@@ -120,10 +114,7 @@ public class CapabilityProcessor extends 
AbstractMailboxProcessor<CapabilityRequ
         capabilities.add(implementor);
     }
 
-    /**
-     * @see org.apache.james.imap.processor.CapabilityImplementingProcessor
-     * 
#getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         return CAPS;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/CheckProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/CheckProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/CheckProcessor.java
index 4f9e092..c0d3824 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/CheckProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/CheckProcessor.java
@@ -37,6 +37,7 @@ public class CheckProcessor extends 
AbstractMailboxProcessor<CheckRequest> {
         super(CheckRequest.class, next, mailboxManager, factory, 
metricFactory);
     }
 
+    @Override
     protected void doProcess(CheckRequest message, ImapSession session, String 
tag, ImapCommand command, Responder responder) {
         unsolicitedResponses(session, responder, false);
         okComplete(command, tag, responder);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
index 4594157..2bb518c 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
@@ -47,6 +47,7 @@ public class CloseProcessor extends 
AbstractMailboxProcessor<CloseRequest> {
         super(CloseRequest.class, next, mailboxManager, factory, 
metricFactory);
     }
 
+    @Override
     protected void doProcess(CloseRequest message, ImapSession session, String 
tag, ImapCommand command, Responder responder) {
         try {
             MessageManager mailbox = getSelectedMailbox(session);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/CompressProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/CompressProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/CompressProcessor.java
index 4bf1d18..2dc3a40 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/CompressProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/CompressProcessor.java
@@ -44,12 +44,7 @@ public class CompressProcessor extends 
AbstractChainedProcessor<CompressRequest>
         this.factory = factory;
     }
 
-    /**
-     * @see
-     * 
org.apache.james.imap.processor.base.AbstractChainedProcessor#doProcess(org.apache.james.imap.api.ImapMessage,
-     * org.apache.james.imap.api.process.ImapProcessor.Responder,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected void doProcess(CompressRequest request, Responder responder, 
ImapSession session) {
         if (session.isCompressionSupported()) {
             Object obj = session.getAttribute(COMPRESSED);
@@ -71,10 +66,7 @@ public class CompressProcessor extends 
AbstractChainedProcessor<CompressRequest>
         }
     }
 
-    /**
-     * @see org.apache.james.imap.processor.CapabilityImplementingProcessor
-     * 
#getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public List<String> getImplementedCapabilities(ImapSession session) {
         if (session.isCompressionSupported()) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
index c32fae3..a056bdd 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
@@ -47,13 +47,7 @@ public class CreateProcessor extends 
AbstractMailboxProcessor<CreateRequest> {
         super(CreateRequest.class, next, mailboxManager, factory, 
metricFactory);
     }
 
-    /**
-     * @see
-     * 
org.apache.james.imap.processor.AbstractMailboxProcessor#doProcess(org.apache.james.imap.api.message.request.ImapRequest,
-     * org.apache.james.imap.api.process.ImapSession, java.lang.String,
-     * org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.api.process.ImapProcessor.Responder)
-     */
+    @Override
     protected void doProcess(CreateRequest request, ImapSession session, 
String tag, ImapCommand command, Responder responder) {
         final MailboxPath mailboxPath = 
PathConverter.forSession(session).buildFullPath(request.getMailboxName());
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java
index 57b8857..6492a72 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java
@@ -137,12 +137,7 @@ public class DeleteACLProcessor extends 
AbstractMailboxProcessor<DeleteACLReques
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.imap.processor.CapabilityImplementingProcessor#
-     * 
getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         return CAPABILITIES;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
index fce0489..aeecfb5 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
@@ -49,13 +49,7 @@ public class DeleteProcessor extends 
AbstractMailboxProcessor<DeleteRequest> {
         super(DeleteRequest.class, next, mailboxManager, factory, 
metricFactory);
     }
 
-    /**
-     * @see
-     * 
org.apache.james.imap.processor.AbstractMailboxProcessor#doProcess(org.apache.james.imap.api.message.request.ImapRequest,
-     * org.apache.james.imap.api.process.ImapSession, java.lang.String,
-     * org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.api.process.ImapProcessor.Responder)
-     */
+    @Override
     protected void doProcess(DeleteRequest request, ImapSession session, 
String tag, ImapCommand command, Responder responder) {
         final MailboxPath mailboxPath = 
PathConverter.forSession(session).buildFullPath(request.getMailboxName());
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java
index 488ea9d..76b8ac0 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java
@@ -67,12 +67,7 @@ public class EnableProcessor extends 
AbstractMailboxProcessor<EnableRequest> imp
     }
 
 
-    /**
-     * @see org.apache.james.imap.processor.AbstractMailboxProcessor
-     * #doProcess(org.apache.james.imap.api.message.request.ImapRequest,
-     * org.apache.james.imap.api.process.ImapSession, java.lang.String,
-     * org.apache.james.imap.api.ImapCommand, 
org.apache.james.imap.api.process.ImapProcessor.Responder)
-     */
+    @Override
     protected void doProcess(EnableRequest request, ImapSession session, 
String tag, ImapCommand command, Responder responder) {
         try {
 
@@ -132,10 +127,7 @@ public class EnableProcessor extends 
AbstractMailboxProcessor<EnableRequest> imp
         return caps;
     }
     
-    /**
-     * @see org.apache.james.imap.processor.CapabilityImplementingProcessor
-     * 
#getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         return CAPS;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
index 2649d5f..aa4d577 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
@@ -60,6 +60,7 @@ public class ExpungeProcessor extends 
AbstractMailboxProcessor<ExpungeRequest> i
         super(ExpungeRequest.class, next, mailboxManager, factory, 
metricFactory);
     }
 
+    @Override
     protected void doProcess(ExpungeRequest request, ImapSession session, 
String tag, ImapCommand command, Responder responder) {
         try {
             final MessageManager mailbox = getSelectedMailbox(session);
@@ -121,10 +122,7 @@ public class ExpungeProcessor extends 
AbstractMailboxProcessor<ExpungeRequest> i
         return expunged;
     }
 
-    /**
-     * @see org.apache.james.imap.processor.CapabilityImplementingProcessor
-     * 
#getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         return UIDPLUS;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java
index 000efbc..2599dc7 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java
@@ -111,12 +111,7 @@ public class GetACLProcessor extends 
AbstractMailboxProcessor<GetACLRequest> imp
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.imap.processor.CapabilityImplementingProcessor#
-     * 
getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         return CAPABILITIES;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java
index 96b15eb..85e71d7 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java
@@ -62,12 +62,14 @@ public class GetAnnotationProcessor extends 
AbstractMailboxProcessor<GetAnnotati
         super(GetAnnotationRequest.class, next, mailboxManager, factory, 
metricFactory);
     }
 
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         return ImmutableList.of(ImapConstants.SUPPORTS_ANNOTATION);
     }
 
+    @Override
     protected void doProcess(GetAnnotationRequest message, ImapSession 
session, String tag, ImapCommand command,
-            Responder responder) {
+                             Responder responder) {
         try {
             proceed(message, session, tag, command, responder);
         } catch (MailboxNotFoundException e) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaProcessor.java
index 1e24ccc..35cbef0 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaProcessor.java
@@ -64,12 +64,7 @@ public class GetQuotaProcessor extends 
AbstractMailboxProcessor<GetQuotaRequest>
         this.quotaRootResolver = quotaRootResolver;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.apache.james.imap.processor.CapabilityImplementingProcessor#
-     * 
getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         return CAPABILITIES;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaRootProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaRootProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaRootProcessor.java
index a1e5185..f564364 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaRootProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaRootProcessor.java
@@ -65,6 +65,7 @@ public class GetQuotaRootProcessor extends 
AbstractMailboxProcessor<GetQuotaRoot
         this.quotaManager = quotaManager;
     }
 
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         return CAPABILITIES;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
index caa128f..f5a4c9d 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
@@ -82,6 +82,7 @@ public class IdleProcessor extends 
AbstractMailboxProcessor<IdleRequest> impleme
         }
     }
 
+    @Override
     protected void doProcess(IdleRequest message, final ImapSession session, 
final String tag, final ImapCommand command, final Responder responder) {
 
         try {
@@ -106,6 +107,7 @@ public class IdleProcessor extends 
AbstractMailboxProcessor<IdleRequest> impleme
                  * org.apache.james.imap.api.process.ImapLineHandler
                  * #onLine(org.apache.james.imap.api.process.ImapSession, 
byte[])
                  */
+                @Override
                 public void onLine(ImapSession session, byte[] data) {
                     String line;
                     if (data.length > 2) {
@@ -137,6 +139,7 @@ public class IdleProcessor extends 
AbstractMailboxProcessor<IdleRequest> impleme
             if (enableIdle) {
                 heartbeatExecutor.schedule(new Runnable() {
 
+                    @Override
                     public void run() {
                         // check if we need to cancel the Runnable
                         // See IMAP-275
@@ -175,6 +178,7 @@ public class IdleProcessor extends 
AbstractMailboxProcessor<IdleRequest> impleme
     * @see org.apache.james.imap.processor.CapabilityImplementingProcessor
     * 
#getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
     */
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         return CAPS;
     }
@@ -189,6 +193,7 @@ public class IdleProcessor extends 
AbstractMailboxProcessor<IdleRequest> impleme
             this.responder = responder;
         }
 
+        @Override
         public void event(Event event) {
             if (event instanceof Added || event instanceof Expunged || event 
instanceof FlagsUpdated) {
                 unsolicitedResponses(session, responder, false);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
index 3386baf..3befe65 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
@@ -52,13 +52,7 @@ public class LSubProcessor extends 
AbstractSubscriptionProcessor<LsubRequest> {
         super(LsubRequest.class, next, mailboxManager, subscriptionManager, 
factory, metricFactory);
     }
 
-    /**
-     * @see org.apache.james.imap.processor.AbstractSubscriptionProcessor
-     * #doProcessRequest(org.apache.james.imap.api.message.request.ImapRequest,
-     * org.apache.james.imap.api.process.ImapSession, java.lang.String,
-     * org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.api.process.ImapProcessor.Responder)
-     */
+    @Override
     protected void doProcessRequest(LsubRequest request, ImapSession session, 
String tag, ImapCommand command, Responder responder) {
         String referenceName = request.getBaseReferenceName();
         String mailboxPattern = request.getMailboxPattern();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java
index 0fe39ee..ec66922 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java
@@ -59,14 +59,7 @@ public class ListProcessor extends 
AbstractMailboxProcessor<ListRequest> {
         super(ListRequest.class, next, mailboxManager, factory, metricFactory);
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.processor.AbstractMailboxProcessor
-     * #doProcess(org.apache.james.imap.api.message.request.ImapRequest,
-     * org.apache.james.imap.api.process.ImapSession, java.lang.String,
-     * org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.api.process.ImapProcessor.Responder)
-     */
+    @Override
     protected void doProcess(ListRequest request, ImapSession session, String 
tag, ImapCommand command, Responder responder) {
         final String baseReferenceName = request.getBaseReferenceName();
         final String mailboxPatternString = request.getMailboxPattern();
@@ -130,18 +123,22 @@ public class ListProcessor extends 
AbstractMailboxProcessor<ListRequest> {
                 results = new ArrayList<>(1);
                 results.add(new MailboxMetaData() {
 
+                    @Override
                     public Children inferiors() {
                         return Children.CHILDREN_ALLOWED_BUT_UNKNOWN;
                     }
 
+                    @Override
                     public Selectability getSelectability() {
                         return Selectability.NOSELECT;
                     }
                     
+                    @Override
                     public char getHierarchyDelimiter() {
                         return mailboxSession.getPathDelimiter();
                     }
 
+                    @Override
                     public MailboxPath getPath() {
                         return rootPath;
                     }
@@ -225,6 +222,7 @@ public class ListProcessor extends 
AbstractMailboxProcessor<ListRequest> {
         return result;
     }
 
+    @Override
     protected boolean isAcceptable(ImapMessage message) {
         return ListRequest.class.equals(message.getClass());
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java
index 753077b..bf11609 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java
@@ -126,12 +126,7 @@ public class ListRightsProcessor extends 
AbstractMailboxProcessor<ListRightsRequ
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.imap.processor.CapabilityImplementingProcessor#
-     * 
getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         return CAPABILITIES;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java
index ede2f0a..d36ef95 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java
@@ -47,12 +47,7 @@ public class LoginProcessor extends 
AbstractAuthProcessor<LoginRequest> implemen
         super(LoginRequest.class, next, mailboxManager, factory, 
metricFactory);
     }
 
-    /**
-     * @see org.apache.james.imap.processor.AbstractMailboxProcessor
-     * #doProcess(org.apache.james.imap.api.message.request.ImapRequest,
-     * org.apache.james.imap.api.process.ImapSession, java.lang.String,
-     * org.apache.james.imap.api.ImapCommand, 
org.apache.james.imap.api.process.ImapProcessor.Responder)
-     */
+    @Override
     protected void doProcess(LoginRequest request, ImapSession session, String 
tag, ImapCommand command, Responder responder) {
             // check if the login is allowed with LOGIN command. See IMAP-304
             if (session.isPlainAuthDisallowed() && session.isTLSActive() == 
false) {
@@ -63,10 +58,7 @@ public class LoginProcessor extends 
AbstractAuthProcessor<LoginRequest> implemen
             }
     }
 
-    /**
-     * @see org.apache.james.imap.processor.CapabilityImplementingProcessor
-     * 
#getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         // Announce LOGINDISABLED if plain auth / login is deactivated and the 
session is not using
         // TLS. See IMAP-304

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
index 94dbbec..4b9a09a 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
@@ -44,6 +44,7 @@ public class LogoutProcessor extends 
AbstractMailboxProcessor<LogoutRequest> {
         super(LogoutRequest.class, next, mailboxManager, factory, 
metricFactory);
     }
 
+    @Override
     protected void doProcess(LogoutRequest request, ImapSession session, 
String tag, ImapCommand command, Responder responder) {
         final MailboxSession mailboxSession = 
ImapSessionUtils.getMailboxSession(session);
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/MyRightsProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/MyRightsProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/MyRightsProcessor.java
index 2f382bb..f252f4a 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/MyRightsProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/MyRightsProcessor.java
@@ -109,10 +109,7 @@ public class MyRightsProcessor extends 
AbstractMailboxProcessor<MyRightsRequest>
 
     }
 
-    /**
-     * @see org.apache.james.imap.processor.CapabilityImplementingProcessor#
-     * 
getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         return CAPABILITIES;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java
index 2da6173..cdccf3f 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java
@@ -104,10 +104,7 @@ public class NamespaceProcessor extends 
AbstractMailboxProcessor<NamespaceReques
         return sharedNamespaces;
     }
 
-    /**
-     * @see org.apache.james.imap.processor.CapabilityImplementingProcessor
-     * 
#getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         return CAPS;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/NoopProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/NoopProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/NoopProcessor.java
index 4d88c2b..084ba89 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/NoopProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/NoopProcessor.java
@@ -37,6 +37,7 @@ public class NoopProcessor extends 
AbstractMailboxProcessor<NoopRequest> {
         super(NoopRequest.class, next, mailboxManager, factory, metricFactory);
     }
 
+    @Override
     protected void doProcess(NoopRequest message, ImapSession session, String 
tag, ImapCommand command, Responder responder) {
         // So, unsolicated responses are returned to check for new mail
         unsolicitedResponses(session, responder, false);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
index 7dc9a0f..e580d64 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
@@ -50,14 +50,7 @@ public class RenameProcessor extends 
AbstractMailboxProcessor<RenameRequest> {
         super(RenameRequest.class, next, mailboxManager, factory, 
metricFactory);
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.processor.AbstractMailboxProcessor
-     * #doProcess(org.apache.james.imap.api.message.request.ImapRequest,
-     * org.apache.james.imap.api.process.ImapSession, java.lang.String,
-     * org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.api.process.ImapProcessor.Responder)
-     */
+    @Override
     protected void doProcess(RenameRequest request, ImapSession session, 
String tag, ImapCommand command, Responder responder) {
         PathConverter pathConverter = PathConverter.forSession(session);
         MailboxPath existingPath = 
pathConverter.buildFullPath(request.getExistingName());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
index e0c592e..c7e9301 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
@@ -80,6 +80,7 @@ public class SearchProcessor extends 
AbstractMailboxProcessor<SearchRequest> imp
         super(SearchRequest.class, next, mailboxManager, factory, 
metricFactory);
     }
 
+    @Override
     protected void doProcess(SearchRequest request, ImapSession session, 
String tag, ImapCommand command, Responder responder) {
         final SearchOperation operation = request.getSearchOperation();
         final SearchKey searchKey = operation.getSearchKey();
@@ -493,10 +494,7 @@ public class SearchProcessor extends 
AbstractMailboxProcessor<SearchRequest> imp
         return SearchQuery.and(criteria);
     }
 
-    /**
-     * @see org.apache.james.imap.processor.CapabilityImplementingProcessor
-     * 
#getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         return CAPS;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java
index 414563a..e8eefb8 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java
@@ -154,12 +154,7 @@ public class SetACLProcessor extends 
AbstractMailboxProcessor<SetACLRequest> imp
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.imap.processor.CapabilityImplementingProcessor#
-     * 
getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         return CAPABILITIES;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/SetAnnotationProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetAnnotationProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/SetAnnotationProcessor.java
index 1a27e83..c0787c4 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetAnnotationProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/SetAnnotationProcessor.java
@@ -53,12 +53,14 @@ public class SetAnnotationProcessor extends 
AbstractMailboxProcessor<SetAnnotati
         super(SetAnnotationRequest.class, next, mailboxManager, factory, 
metricFactory);
     }
 
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         return ImmutableList.of(ImapConstants.SUPPORTS_ANNOTATION);
     }
 
+    @Override
     protected void doProcess(SetAnnotationRequest message, ImapSession 
session, String tag, ImapCommand command,
-            Responder responder) {
+                             Responder responder) {
         final MailboxManager mailboxManager = getMailboxManager();
         final MailboxSession mailboxSession = 
ImapSessionUtils.getMailboxSession(session);
         final String mailboxName = message.getMailboxName();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/SetQuotaProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetQuotaProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/SetQuotaProcessor.java
index 1e7c68c..b0a4dbc 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetQuotaProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/SetQuotaProcessor.java
@@ -40,6 +40,7 @@ import org.apache.james.util.MDCBuilder;
 public class SetQuotaProcessor extends 
AbstractMailboxProcessor<SetQuotaRequest> implements 
CapabilityImplementingProcessor {
     private static final List<String> CAPABILITIES = 
Collections.singletonList(ImapConstants.SUPPORTS_QUOTA);
 
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         return CAPABILITIES;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java
index 5d9f1f4..60cb5e6 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java
@@ -45,13 +45,7 @@ public class StartTLSProcessor extends 
AbstractChainedProcessor<StartTLSRequest>
         this.factory = factory;
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.processor.base.AbstractChainedProcessor
-     * #doProcess(org.apache.james.imap.api.ImapMessage,
-     * org.apache.james.imap.api.process.ImapProcessor.Responder,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     protected void doProcess(StartTLSRequest request, Responder responder, 
ImapSession session) {
         if (session.supportStartTLS()) {
             responder.respond(factory.taggedOk(request.getTag(), 
request.getCommand(), HumanReadableText.STARTTLS));
@@ -63,10 +57,7 @@ public class StartTLSProcessor extends 
AbstractChainedProcessor<StartTLSRequest>
 
     }
 
-    /**
-     * @see org.apache.james.imap.processor.CapabilityImplementingProcessor
-     * 
#getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         if (session.supportStartTLS()) {
             return STARTTLS_CAP;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
index 174a745..138c1d8 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
@@ -50,14 +50,7 @@ public class StatusProcessor extends 
AbstractMailboxProcessor<StatusRequest> {
         super(StatusRequest.class, next, mailboxManager, factory, 
metricFactory);
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.processor.AbstractMailboxProcessor
-     * #doProcess(org.apache.james.imap.api.message.request.ImapRequest,
-     * org.apache.james.imap.api.process.ImapSession, java.lang.String,
-     * org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.api.process.ImapProcessor.Responder)
-     */
+    @Override
     protected void doProcess(StatusRequest request, ImapSession session, 
String tag, ImapCommand command, Responder responder) {
         final MailboxPath mailboxPath = 
PathConverter.forSession(session).buildFullPath(request.getMailboxName());
         final StatusDataItems statusDataItems = request.getStatusDataItems();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
index 6b5a05c..c15fa1f 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
@@ -74,12 +74,7 @@ public class StoreProcessor extends 
AbstractMailboxProcessor<StoreRequest> {
         super(StoreRequest.class, next, mailboxManager, factory, 
metricFactory);
     }
 
-    /**
-     * @see org.apache.james.imap.processor.AbstractMailboxProcessor
-     * #doProcess(org.apache.james.imap.api.message.request.ImapRequest,
-     * org.apache.james.imap.api.process.ImapSession, java.lang.String,
-     * org.apache.james.imap.api.ImapCommand, 
org.apache.james.imap.api.process.ImapProcessor.Responder)
-     */
+    @Override
     protected void doProcess(StoreRequest request, ImapSession session, String 
tag, ImapCommand command, Responder responder) {
         final IdRange[] idSet = request.getIdSet();
         final boolean useUids = request.isUseUids();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java
index 6bbe84c..8f875b5 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java
@@ -45,13 +45,7 @@ public class SubscribeProcessor extends 
AbstractSubscriptionProcessor<SubscribeR
         super(SubscribeRequest.class, next, mailboxManager, 
subscriptionManager, factory, metricFactory);
     }
 
-    /**
-     * @see org.apache.james.imap.processor.AbstractSubscriptionProcessor
-     * #doProcessRequest(org.apache.james.imap.api.message.request.ImapRequest,
-     * org.apache.james.imap.api.process.ImapSession, java.lang.String,
-     * org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.api.process.ImapProcessor.Responder)
-     */
+    @Override
     protected void doProcessRequest(SubscribeRequest request, ImapSession 
session, String tag, ImapCommand command, Responder responder) {
         final String mailboxName = request.getMailboxName();
         final MailboxSession mailboxSession = 
ImapSessionUtils.getMailboxSession(session);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/UnselectProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/UnselectProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/UnselectProcessor.java
index 6d99d46..ab861d2 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/UnselectProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/UnselectProcessor.java
@@ -47,14 +47,7 @@ public class UnselectProcessor extends 
AbstractMailboxProcessor<UnselectRequest>
         super(UnselectRequest.class, next, mailboxManager, factory, 
metricFactory);
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.processor.AbstractMailboxProcessor
-     * #doProcess(org.apache.james.imap.api.message.request.ImapRequest,
-     * org.apache.james.imap.api.process.ImapSession, java.lang.String,
-     * org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.api.process.ImapProcessor.Responder)
-     */
+    @Override
     protected void doProcess(UnselectRequest message, ImapSession session, 
String tag, ImapCommand command, Responder responder) {
         if (session.getSelected() != null) {
             session.deselect();
@@ -65,10 +58,7 @@ public class UnselectProcessor extends 
AbstractMailboxProcessor<UnselectRequest>
 
     }
 
-    /**
-     * @see org.apache.james.imap.processor.CapabilityImplementingProcessor
-     * 
#getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         return UNSELECT;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java
index 529020c..7c7c80f 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java
@@ -45,13 +45,7 @@ public class UnsubscribeProcessor extends 
AbstractSubscriptionProcessor<Unsubscr
         super(UnsubscribeRequest.class, next, mailboxManager, 
subscriptionManager, factory, metricFactory);
     }
 
-    /**
-     * @see org.apache.james.imap.processor.AbstractSubscriptionProcessor
-     * #doProcessRequest(org.apache.james.imap.api.message.request.ImapRequest,
-     * org.apache.james.imap.api.process.ImapSession, java.lang.String,
-     * org.apache.james.imap.api.ImapCommand,
-     * org.apache.james.imap.api.process.ImapProcessor.Responder)
-     */
+    @Override
     protected void doProcessRequest(UnsubscribeRequest request, ImapSession 
session, String tag, ImapCommand command, Responder responder) {
         final String mailboxName = request.getMailboxName();
         final MailboxSession mailboxSession = 
ImapSessionUtils.getMailboxSession(session);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/XListProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/XListProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/XListProcessor.java
index df4322a..a30281c 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/XListProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/XListProcessor.java
@@ -55,10 +55,7 @@ public class XListProcessor extends ListProcessor implements 
CapabilityImplement
         this.mailboxTyper = mailboxTyper;
     }
 
-    /**
-     * @see org.apache.james.imap.processor.CapabilityImplementingProcessor
-     * 
#getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
-     */
+    @Override
     public List<String> getImplementedCapabilities(ImapSession session) {
         // if there's no mailboxTyper, do not annnoyce XLIST capability
         if (mailboxTyper == null) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/base/AbstractChainedProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/AbstractChainedProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/AbstractChainedProcessor.java
index 2efb535..0de3dbf 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/AbstractChainedProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/AbstractChainedProcessor.java
@@ -48,12 +48,6 @@ public abstract class AbstractChainedProcessor<M extends 
ImapMessage> implements
         this.acceptableClass = acceptableClass;
     }
 
-    /**
-     * @see
-     * 
org.apache.james.imap.api.process.ImapProcessor#process(org.apache.james.imap.api.ImapMessage,
-     * org.apache.james.imap.api.process.ImapProcessor.Responder,
-     * org.apache.james.imap.api.process.ImapSession)
-     */
     @Override
     @SuppressWarnings("unchecked")
     public void process(ImapMessage message, Responder responder, ImapSession 
session) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/base/ImapResponseMessageProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/ImapResponseMessageProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/ImapResponseMessageProcessor.java
index 720dfa6..d6d28be 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/ImapResponseMessageProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/ImapResponseMessageProcessor.java
@@ -32,6 +32,7 @@ public class ImapResponseMessageProcessor extends 
AbstractChainedProcessor<ImapR
         super(ImapResponseMessage.class, next);
     }
 
+    @Override
     protected void doProcess(ImapResponseMessage acceptableMessage, Responder 
responder, ImapSession session) {
         responder.respond(acceptableMessage);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
index bdb6583..dcac60b 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
@@ -119,6 +119,7 @@ public class SelectedMailboxImpl implements 
SelectedMailbox, MailboxListener {
         return uidMsnConverter.getLastUid();
     }
 
+    @Override
     public synchronized void deselect() {
         MailboxSession mailboxSession = 
ImapSessionUtils.getMailboxSession(session);
 
@@ -225,6 +226,7 @@ public class SelectedMailboxImpl implements 
SelectedMailbox, MailboxListener {
 
     
     
+    @Override
     public synchronized void resetExpungedUids() {
         expungedUids.clear();
     }
@@ -256,6 +258,7 @@ public class SelectedMailboxImpl implements 
SelectedMailbox, MailboxListener {
      * @return true if new messages have been added, false otherwise
      */
 
+    @Override
     public final synchronized boolean isSizeChanged() {
         return sizeChanged;
     }
@@ -267,6 +270,7 @@ public class SelectedMailboxImpl implements 
SelectedMailbox, MailboxListener {
      *         otherwise
      */
 
+    @Override
     public final synchronized boolean isDeletedByOtherSession() {
         return isDeletedByOtherSession;
     }
@@ -292,21 +296,25 @@ public class SelectedMailboxImpl implements 
SelectedMailbox, MailboxListener {
         
     }
 
+    @Override
     public synchronized Flags getApplicableFlags() {
         return new Flags(applicableFlags);
     }
 
     
+    @Override
     public synchronized boolean hasNewApplicableFlags() {
         return applicableFlagsChanged;
     }
 
     
+    @Override
     public synchronized void resetNewApplicableFlags() {
         applicableFlagsChanged = false;
     }
 
     
+    @Override
     public synchronized void event(Event event) {
 
         if (event instanceof MailboxEvent) {
@@ -414,6 +422,7 @@ public class SelectedMailboxImpl implements 
SelectedMailbox, MailboxListener {
     }
 
     
+    @Override
     public synchronized long existsCount() {
         return uidMsnConverter.getNumMessage();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/base/UnknownRequestProcessor.java
----------------------------------------------------------------------
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/UnknownRequestProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/UnknownRequestProcessor.java
index 7f246fa..d327bdd 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/UnknownRequestProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/UnknownRequestProcessor.java
@@ -55,6 +55,7 @@ public class UnknownRequestProcessor implements ImapProcessor 
{
         return result;
     }
 
+    @Override
     public void process(ImapMessage message, Responder responder, ImapSession 
session) {
         final ImapResponseMessage response = process(message);
         responder.respond(response);


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

Reply via email to