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:40 UTC

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

Repository: james-project
Updated Branches:
  refs/heads/master 10ba38a72 -> 5f74a3005


http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/queue/queue-api/src/test/java/org/apache/james/queue/api/PriorityManageableMailQueueContract.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/PriorityManageableMailQueueContract.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/PriorityManageableMailQueueContract.java
index 8351a48..789bc1d 100644
--- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/PriorityManageableMailQueueContract.java
+++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/PriorityManageableMailQueueContract.java
@@ -27,6 +27,7 @@ import org.junit.jupiter.api.Test;
 
 public interface PriorityManageableMailQueueContract extends ManageableMailQueueContract, PriorityMailQueueContract {
 
+    @Override
     ManageableMailQueue getManageableMailQueue();
 
     @Test


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


[18/22] james-project git commit: JAMES-2352 Enhance a bit NamingExceptionRetryHandlerTest

Posted by ma...@apache.org.
JAMES-2352 Enhance a bit NamingExceptionRetryHandlerTest


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/414f3e64
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/414f3e64
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/414f3e64

Branch: refs/heads/master
Commit: 414f3e649853a82753575d02c4056f60b14b2872
Parents: ff4d0b0
Author: benwa <bt...@linagora.com>
Authored: Thu Mar 15 09:46:20 2018 +0700
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Fri Mar 16 11:12:50 2018 +0100

----------------------------------------------------------------------
 .../naming/NamingExceptionRetryHandlerTest.java | 41 ++++++--------------
 1 file changed, 11 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/414f3e64/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java b/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
index 4b96735..7e0bd34 100644
--- a/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
+++ b/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
@@ -31,24 +31,9 @@ import org.apache.james.util.retry.api.RetrySchedule;
 import org.junit.Before;
 import org.junit.Test;
 
-/**
- * <code>ExceptionRetryHandlerTest</code>
- */
 public class NamingExceptionRetryHandlerTest {
 
-    private Class<?>[] exceptionClasses = null;
-    private ExceptionRetryingProxy proxy = null;
-    private RetrySchedule schedule = null;
-
-    @Before
-    public void setUp() throws Exception {
-        exceptionClasses = new Class<?>[]{NamingException.class};
-        proxy = new TestRetryingProxy();
-        schedule = new TestRetrySchedule();
-    }
-
-    private class TestRetryingProxy implements ExceptionRetryingProxy {
-
+    private static class TestRetryingProxy implements ExceptionRetryingProxy {
         @Override
         public Context getDelegate() {
             return null;
@@ -64,19 +49,19 @@ public class NamingExceptionRetryHandlerTest {
         }
     }
 
-    private class TestRetrySchedule implements RetrySchedule {
+    private Class<?>[] exceptionClasses;
+    private ExceptionRetryingProxy proxy;
+    private RetrySchedule schedule;
 
-        @Override
-        public long getInterval(int index) {
-            return index;
-        }
+    @Before
+    public void setUp() throws Exception {
+        exceptionClasses = new Class<?>[]{NamingException.class};
+        proxy = new TestRetryingProxy();
+        schedule = i -> i;
     }
 
-    /**
-     * Test method for .
-     */
     @Test
-    public final void testExceptionRetryHandler() {
+    public void testExceptionRetryHandler() {
         assertTrue(RetryHandler.class.isAssignableFrom(new NamingExceptionRetryHandler(
             exceptionClasses, proxy, schedule, 0) {
 
@@ -87,12 +72,8 @@ public class NamingExceptionRetryHandlerTest {
         }.getClass()));
     }
 
-    /**
-     * Test method for .
-     * @throws Exception
-     */
     @Test
-    public final void testPerform() throws NamingException {
+    public void testPerform() throws NamingException {
         Object result = new NamingExceptionRetryHandler(
             exceptionClasses, proxy, schedule, 0) {
 


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


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

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java b/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java
index f19b94a..9e3ea5d 100644
--- a/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java
+++ b/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java
@@ -64,6 +64,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig {
      * Called by the mailer container to indicate to a mailet that the
      * mailet is being taken out of service.
      */
+    @Override
     public void destroy() {
         //Do nothing
     }
@@ -123,6 +124,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig {
      * @param name - a String specifying the name of the initialization parameter
      * @return a String containing the value of the initalization parameter
      */
+    @Override
     public String getInitParameter(String name) {
         return config.getInitParameter(name);
     }
@@ -159,6 +161,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig {
      * @return an Iterator of String objects containing the names of
      *          the mailet's initialization parameters
      */
+    @Override
     public Iterator<String> getInitParameterNames() {
         return config.getInitParameterNames();
     }
@@ -168,6 +171,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig {
      *
      * @return the MailetConfig object that initialized this mailet
      */
+    @Override
     public MailetConfig getMailetConfig() {
         return config;
     }
@@ -178,6 +182,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig {
      *
      * @return the MailetContext object passed to this mailet by the init method
      */
+    @Override
     public MailetContext getMailetContext() {
         return getMailetConfig().getMailetContext();
     }
@@ -189,6 +194,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig {
      *
      * @return information about this mailet, by default an empty string
      */
+    @Override
     public String getMailetInfo() {
         return "";
     }
@@ -198,6 +204,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig {
      *
      * @return the name of this mailet instance
      */
+    @Override
     public String getMailetName() {
         return config.getMailetName();
     }
@@ -216,6 +223,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig {
      * @throws MessagingException
      *          if an exception occurs that interrupts the mailet's normal operation
      */
+    @Override
     public void init(MailetConfig newConfig) throws MessagingException {
         config = newConfig;
         init();
@@ -270,6 +278,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig {
      *          routing information
      * @throws javax.mail.MessagingException - if an exception occurs that interferes with the mailet's normal operation
      */
+    @Override
     public abstract void service(Mail mail) throws javax.mail.MessagingException;
     
     

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java b/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java
index 9dc25dc..3c997ab 100644
--- a/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java
+++ b/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java
@@ -51,6 +51,7 @@ public abstract class GenericMatcher implements Matcher, MatcherConfig {
      * Called by the mailet container to indicate to a matcher that the
      * matcher is being taken out of service.
      */
+    @Override
     public void destroy() {
         //Do nothing
     }
@@ -64,6 +65,7 @@ public abstract class GenericMatcher implements Matcher, MatcherConfig {
      *
      * @return String a String containing the value of the initalization parameter
      */
+    @Override
     public String getCondition() {
         return config.getCondition();
     }
@@ -73,6 +75,7 @@ public abstract class GenericMatcher implements Matcher, MatcherConfig {
      *
      * @return MatcherConfig the MatcherConfig object that initialized this matcher
      */
+    @Override
     public MatcherConfig getMatcherConfig() {
         return config;
     }
@@ -83,6 +86,7 @@ public abstract class GenericMatcher implements Matcher, MatcherConfig {
      *
      * @return MailetContext the MailetContext object passed to this matcher by the init method
      */
+    @Override
     public MailetContext getMailetContext() {
         return getMatcherConfig().getMailetContext();
     }
@@ -94,6 +98,7 @@ public abstract class GenericMatcher implements Matcher, MatcherConfig {
      *
      * @return String information about this matcher, by default an empty string
      */
+    @Override
     public String getMatcherInfo() {
         return "";
     }
@@ -103,6 +108,7 @@ public abstract class GenericMatcher implements Matcher, MatcherConfig {
      *
      * @return the name of this matcher instance
      */
+    @Override
     public String getMatcherName() {
         return config.getMatcherName();
     }
@@ -121,6 +127,7 @@ public abstract class GenericMatcher implements Matcher, MatcherConfig {
      * @throws MessagingException
      *          if an exception occurs that interrupts the matcher's normal operation
      */
+    @Override
     public void init(MatcherConfig newConfig) throws MessagingException {
         config = newConfig;
         init();
@@ -178,5 +185,6 @@ public abstract class GenericMatcher implements Matcher, MatcherConfig {
      * @throws javax.mail.MessagingException - if an exception occurs that interferes with the mailet's normal operation
      *          occurred
      */
+    @Override
     public abstract Collection<MailAddress> match(Mail mail) throws MessagingException;
 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java b/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java
index f63a6cd..ab50830 100644
--- a/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java
+++ b/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java
@@ -48,6 +48,7 @@ public abstract class GenericRecipientMatcher extends GenericMatcher {
      * @param mail - the message and routing information to determine whether to match
      * @return Collection the Collection of MailAddress objects that have been matched
      */
+    @Override
     public final Collection<MailAddress> match(Mail mail) throws MessagingException {
         Collection<MailAddress> matching = new ArrayList<>();
         for (MailAddress recipient : mail.getRecipients()) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java b/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java
index 97ad423..d009d70 100644
--- a/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java
+++ b/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java
@@ -42,30 +42,22 @@ public class MatcherInverter implements Matcher {
         this.wrappedMatcher = wrappedMatcher;
     }
 
-    /**
-     * @see org.apache.mailet.Matcher#destroy()
-     */
+    @Override
     public void destroy() {
         wrappedMatcher.destroy();
     }
 
-    /**
-     * @see org.apache.mailet.Matcher#getMatcherConfig()
-     */
+    @Override
     public MatcherConfig getMatcherConfig() {
         return wrappedMatcher.getMatcherConfig();
     }
 
-    /**
-     * @see org.apache.mailet.Matcher#getMatcherInfo()
-     */
+    @Override
     public String getMatcherInfo() {
         return wrappedMatcher.getMatcherInfo();
     }
 
-    /**
-     * @see org.apache.mailet.Matcher#destroy()
-     */
+    @Override
     public void init(MatcherConfig config) throws MessagingException {
         wrappedMatcher.init(config);
     }
@@ -74,6 +66,7 @@ public class MatcherInverter implements Matcher {
      * Return a Collection of "not matched" recipients
      *
      */
+    @Override
     public Collection<MailAddress> match(Mail mail) throws MessagingException {
         // Create a new recipient Collection cause mail.getRecipients() give a reference to the internal 
         // list of recipients. If we make changes there the original collection whould be corrupted

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/main/java/org/apache/mailet/base/mail/AbstractDataContentHandler.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/main/java/org/apache/mailet/base/mail/AbstractDataContentHandler.java b/mailet/base/src/main/java/org/apache/mailet/base/mail/AbstractDataContentHandler.java
index 56ed750..16c7b5c 100644
--- a/mailet/base/src/main/java/org/apache/mailet/base/mail/AbstractDataContentHandler.java
+++ b/mailet/base/src/main/java/org/apache/mailet/base/mail/AbstractDataContentHandler.java
@@ -63,9 +63,7 @@ public abstract class AbstractDataContentHandler implements DataContentHandler {
         fieldDataFlavor = aDataFlavor;
     }
 
-    /**
-     * @see javax.activation.DataContentHandler#getContent(javax.activation.DataSource)
-     */
+    @Override
     public Object getContent(DataSource aDataSource) throws IOException {
         Object content = null;
         try {
@@ -86,10 +84,7 @@ public abstract class AbstractDataContentHandler implements DataContentHandler {
     protected abstract Object computeContent(DataSource aDataSource)
             throws MessagingException;
 
-    /**
-     * @see javax.activation.DataContentHandler#getTransferData(java.awt.datatransfer.DataFlavor,
-     *      javax.activation.DataSource)
-     */
+    @Override
     public Object getTransferData(DataFlavor aDataFlavor, DataSource aDataSource)
             throws UnsupportedFlavorException, IOException {
         Object content = null;
@@ -99,9 +94,7 @@ public abstract class AbstractDataContentHandler implements DataContentHandler {
         return content;
     }
 
-    /**
-     * @see javax.activation.DataContentHandler#getTransferDataFlavors()
-     */
+    @Override
     public DataFlavor[] getTransferDataFlavors() {
         return new DataFlavor[]{getDataFlavor()};
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/main/java/org/apache/mailet/base/mail/MessageDispositionNotification.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/main/java/org/apache/mailet/base/mail/MessageDispositionNotification.java b/mailet/base/src/main/java/org/apache/mailet/base/mail/MessageDispositionNotification.java
index 128b757..49177b3 100644
--- a/mailet/base/src/main/java/org/apache/mailet/base/mail/MessageDispositionNotification.java
+++ b/mailet/base/src/main/java/org/apache/mailet/base/mail/MessageDispositionNotification.java
@@ -53,17 +53,13 @@ public class MessageDispositionNotification extends AbstractDataContentHandler {
         super();
     }
 
-    /**
-     * @see org.apache.mailet.base.mail.AbstractDataContentHandler#computeDataFlavor()
-     */
+    @Override
     protected ActivationDataFlavor computeDataFlavor() {
         return new ActivationDataFlavor(String.class,
                 "message/disposition-notification", "Message String");
     }
 
-    /**
-     * @see org.apache.mailet.base.mail.AbstractDataContentHandler#computeContent(javax.activation.DataSource)
-     */
+    @Override
     protected Object computeContent(DataSource aDataSource)
             throws MessagingException {
         String encoding = getCharacterSet(aDataSource.getContentType());
@@ -100,10 +96,7 @@ public class MessageDispositionNotification extends AbstractDataContentHandler {
         return content;
     }
 
-    /**
-     * @see javax.activation.DataContentHandler#writeTo(java.lang.Object,
-     *      java.lang.String, java.io.OutputStream)
-     */
+    @Override
     public void writeTo(Object aPart, String aMimeType, OutputStream aStream)
             throws IOException {
         if (!(aPart instanceof String)) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/main/java/org/apache/mailet/base/mail/MultipartReport.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/main/java/org/apache/mailet/base/mail/MultipartReport.java b/mailet/base/src/main/java/org/apache/mailet/base/mail/MultipartReport.java
index f9979c5..c17be64 100644
--- a/mailet/base/src/main/java/org/apache/mailet/base/mail/MultipartReport.java
+++ b/mailet/base/src/main/java/org/apache/mailet/base/mail/MultipartReport.java
@@ -42,18 +42,13 @@ public class MultipartReport extends AbstractDataContentHandler {
         super();
     }
 
-    /**
-     * @see org.apache.mailet.base.mail.AbstractDataContentHandler#computeDataFlavor()
-     */
+    @Override
     protected ActivationDataFlavor computeDataFlavor() {
         return new ActivationDataFlavor(MimeMultipartReport.class,
                 "multipart/report", "Multipart Report");
     }
 
-    /**
-     * @see javax.activation.DataContentHandler#writeTo(java.lang.Object,
-     *      java.lang.String, java.io.OutputStream)
-     */
+    @Override
     public void writeTo(Object aPart, String aMimeType, OutputStream aStream)
             throws IOException {
         if (!(aPart instanceof MimeMultipartReport)) {
@@ -67,9 +62,7 @@ public class MultipartReport extends AbstractDataContentHandler {
         }
     }
 
-    /**
-     * @see org.apache.mailet.base.mail.AbstractDataContentHandler#computeContent(javax.activation.DataSource)
-     */
+    @Override
     protected Object computeContent(DataSource aDataSource)
             throws MessagingException {
         return new MimeMultipartReport(aDataSource);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/test/java/org/apache/mailet/base/MatcherInverterTest.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/test/java/org/apache/mailet/base/MatcherInverterTest.java b/mailet/base/src/test/java/org/apache/mailet/base/MatcherInverterTest.java
index ddcf874..d95001c 100644
--- a/mailet/base/src/test/java/org/apache/mailet/base/MatcherInverterTest.java
+++ b/mailet/base/src/test/java/org/apache/mailet/base/MatcherInverterTest.java
@@ -39,6 +39,7 @@ public class MatcherInverterTest {
     public void testAllMatch() throws MessagingException {
         MatcherInverter inverter = new MatcherInverter(new GenericMatcher() {
 
+            @Override
             public Collection<MailAddress> match(Mail mail) throws MessagingException {
                 return null;
             }
@@ -57,6 +58,7 @@ public class MatcherInverterTest {
 
         MatcherInverter inverter = new MatcherInverter(new GenericMatcher() {
 
+            @Override
             public Collection<MailAddress> match(Mail mail) throws MessagingException {
                 return mail.getRecipients();
             }
@@ -75,6 +77,7 @@ public class MatcherInverterTest {
 
         MatcherInverter inverter = new MatcherInverter(new GenericMatcher() {
 
+            @Override
             public Collection<MailAddress> match(Mail mail) throws MessagingException {
                 return Arrays.asList(address1);
             }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java
index f7d279b..829d9f7 100644
--- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java
+++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java
@@ -366,10 +366,12 @@ public class FakeMailContext implements MailetContext {
         this.postmaster = postmaster;
     }
 
+    @Override
     public void bounce(Mail mail, String message) throws MessagingException {
         bouncedMails.add(new BouncedMail(fromMail(mail), message, Optional.empty()));
     }
 
+    @Override
     public void bounce(Mail mail, String message, MailAddress bouncer) throws MessagingException {
         bouncedMails.add(new BouncedMail(fromMail(mail), message, Optional.ofNullable(bouncer)));
     }
@@ -377,34 +379,42 @@ public class FakeMailContext implements MailetContext {
     /**
      * @deprecated use the generic dnsLookup method
      */
+    @Override
     public Collection<String> getMailServers(String host) {
         return null;  // trivial implementation
     }
 
+    @Override
     public MailAddress getPostmaster() {
         return postmaster;
     }
 
+    @Override
     public Object getAttribute(String name) {
         return attributes.get(name);
     }
 
+    @Override
     public Iterator<String> getAttributeNames() {
         return attributes.keySet().iterator();
     }
 
+    @Override
     public int getMajorVersion() {
         return 0;  // trivial implementation
     }
 
+    @Override
     public int getMinorVersion() {
         return 0;  // trivial implementation
     }
 
+    @Override
     public String getServerInfo() {
         return "Mock Server";
     }
 
+    @Override
     public boolean isLocalServer(String serverName) {
         return serverName.equals("localhost");  // trivial implementation
     }
@@ -412,10 +422,12 @@ public class FakeMailContext implements MailetContext {
     /**
      * @deprecated use {@link #isLocalEmail(MailAddress)} instead 
      */
+    @Override
     public boolean isLocalUser(String userAccount) {
         return false;  // trivial implementation
     }
 
+    @Override
     public boolean isLocalEmail(MailAddress mailAddress) {
         return false;  // trivial implementation
     }
@@ -423,6 +435,7 @@ public class FakeMailContext implements MailetContext {
     /**
      * @deprecated use {@link #log(LogLevel level, String message)}
      */
+    @Override
     public void log(String message) {
         System.out.println(message);
     }
@@ -430,15 +443,18 @@ public class FakeMailContext implements MailetContext {
     /**
      * @deprecated use {@link #log(LogLevel level, String message, Throwable t)}
      */
+    @Override
     public void log(String message, Throwable t) {
         System.out.println(message);
         t.printStackTrace(System.out);
     }
 
+    @Override
     public void removeAttribute(String name) {
         // trivial implementation
     }
 
+    @Override
     public void sendMail(MimeMessage mimemessage) throws MessagingException {
         sentMails.add(sentMailBuilder()
             .message(mimemessage)
@@ -446,6 +462,7 @@ public class FakeMailContext implements MailetContext {
             .build());
     }
 
+    @Override
     public void sendMail(MailAddress sender, Collection<MailAddress> recipients, MimeMessage msg) throws MessagingException {
         sentMails.add(sentMailBuilder()
             .recipients(recipients)
@@ -455,6 +472,7 @@ public class FakeMailContext implements MailetContext {
             .build());
     }
 
+    @Override
     public void sendMail(MailAddress sender, Collection<MailAddress> recipients, MimeMessage msg, String state) throws MessagingException {
         sentMails.add(sentMailBuilder()
             .recipients(recipients)
@@ -501,14 +519,17 @@ public class FakeMailContext implements MailetContext {
     /**
      * @deprecated use the generic dnsLookup method
      */
+    @Override
     public Iterator<HostAddress> getSMTPHostAddresses(String domainName) {
         return null;  // trivial implementation
     }
 
+    @Override
     public void setAttribute(String name, Object value) {
         throw new UnsupportedOperationException("MOCKed method");
     }
 
+    @Override
     public void log(LogLevel level, String message) {
         if (logger.isPresent()) {
             switch (level) {
@@ -529,6 +550,7 @@ public class FakeMailContext implements MailetContext {
         }
     }
 
+    @Override
     public void log(LogLevel level, String message, Throwable t) {
         if (logger.isPresent()) {
             switch (level) {
@@ -550,6 +572,7 @@ public class FakeMailContext implements MailetContext {
         }
     }
 
+    @Override
     public List<String> dnsLookup(String name, RecordType type) throws LookupException {
         return null;   // trivial implementation
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailetConfig.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailetConfig.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailetConfig.java
index d86f793..73289d7 100644
--- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailetConfig.java
+++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailetConfig.java
@@ -84,18 +84,22 @@ public class FakeMailetConfig implements MailetConfig {
         this.properties = properties;
     }
 
+    @Override
     public String getInitParameter(String name) {
         return properties.getProperty(name);
     }
 
+    @Override
     public Iterator<String> getInitParameterNames() {
         return properties.stringPropertyNames().iterator();
     }
 
+    @Override
     public MailetContext getMailetContext() {
         return mailetContext;
     }
 
+    @Override
     public String getMailetName() {
         return mailetName;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java
----------------------------------------------------------------------
diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java b/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java
index a4438c8..c594c4d 100644
--- a/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java
+++ b/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java
@@ -226,6 +226,7 @@ public class SMIMEKeyHolder implements KeyHolder {
      * @param message The message to sign.
      * @return The signed <CODE>MimeMultipart</CODE>.
      */    
+    @Override
     public MimeMultipart generate(MimeMessage message) throws CertStoreException, NoSuchAlgorithmException, NoSuchProviderException,
         SMIMEException, OperatorCreationException, CertificateEncodingException {
         
@@ -242,6 +243,7 @@ public class SMIMEKeyHolder implements KeyHolder {
      * @param content The content to sign.
      * @return The signed <CODE>MimeMultipart</CODE>.
      */
+    @Override
     public MimeMultipart generate(MimeBodyPart content) throws CertStoreException, NoSuchAlgorithmException, NoSuchProviderException,
         SMIMEException, OperatorCreationException, CertificateEncodingException {
         
@@ -293,6 +295,7 @@ public class SMIMEKeyHolder implements KeyHolder {
      * @return Value of property signerDistinguishedName.
      * @see #getSignerDistinguishedName(X509Certificate)
      */
+    @Override
     public String getSignerDistinguishedName() {
         return getSignerDistinguishedName(getCertificate());
     }
@@ -302,6 +305,7 @@ public class SMIMEKeyHolder implements KeyHolder {
      * @return Value of property signerCN.
      * @see #getSignerCN(X509Certificate)
      */
+    @Override
     public String getSignerCN() {
         return getSignerCN(getCertificate());
     }
@@ -311,6 +315,7 @@ public class SMIMEKeyHolder implements KeyHolder {
      * @return Value of property signerMailAddress.
      * @see #getSignerAddress(X509Certificate)
      */
+    @Override
     public String getSignerAddress() {
         return getSignerAddress(getCertificate());
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java
----------------------------------------------------------------------
diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java
index ab83934..8b266a9 100644
--- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java
+++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java
@@ -426,9 +426,7 @@ public abstract class AbstractSign extends GenericMailet {
     /* ****************** End of setters and getters ********************** */
     /* ******************************************************************** */    
     
-    /**
-     * Mailet initialization routine.
-     */
+    @Override
     public void init() throws MessagingException {
         
         // check that all init parameters have been declared in allowedInitParameters
@@ -467,6 +465,7 @@ public abstract class AbstractSign extends GenericMailet {
      * @param mail the mail to sign
      * @throws MessagingException if a problem arises signing the mail
      */
+    @Override
     public void service(Mail mail) throws MessagingException {
         
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java
----------------------------------------------------------------------
diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java
index 1697239..6fd176e 100644
--- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java
+++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java
@@ -116,6 +116,7 @@ public class SMIMECheckSignature extends GenericMailet {
 
     }
 
+    @Override
     public void init() throws MessagingException {
         MailetConfig config = getMailetConfig();
 
@@ -152,6 +153,7 @@ public class SMIMECheckSignature extends GenericMailet {
 
     }
 
+    @Override
     public void service(Mail mail) throws MessagingException {
         // I extract the MimeMessage from the mail object and I check if the
         // mime type of the mail is one of the mime types that can contain a

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMEDecrypt.java
----------------------------------------------------------------------
diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMEDecrypt.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMEDecrypt.java
index e5f372d..2e2019b 100644
--- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMEDecrypt.java
+++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMEDecrypt.java
@@ -81,6 +81,7 @@ public class SMIMEDecrypt extends GenericMailet {
     private X509CertificateHolder certificateHolder;
     protected String mailAttribute = "org.apache.james.SMIMEDecrypt";
     
+    @Override
     public void init() throws MessagingException {
         super.init();
         
@@ -120,9 +121,7 @@ public class SMIMEDecrypt extends GenericMailet {
         }
     }
     
-    /**
-     * @see org.apache.mailet.Mailet#service(org.apache.mailet.Mail)
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public void service(Mail mail) throws MessagingException {
         MimeMessage message = mail.getMessage();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMESign.java
----------------------------------------------------------------------
diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMESign.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMESign.java
index 5024baa..dad9cb9 100644
--- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMESign.java
+++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMESign.java
@@ -62,13 +62,12 @@ public class SMIMESign extends Sign {
      *
      * @return a string describing this mailet
      */
+    @Override
     public String getMailetInfo() {
         return "SMIME Signature Mailet";
     }
     
-    /**
-     *
-     */
+    @Override
     protected  String[] getAllowedInitParameters() {
         return new String[]{
             "debug",
@@ -107,6 +106,7 @@ public class SMIMESign extends Sign {
      *     "[signerName]" <[signerAddress]>
      * </code></pre>
      */
+    @Override
     public String getExplanationText() {
         String explanationText = super.getExplanationText();
         if (explanationText == null) {
@@ -129,6 +129,7 @@ public class SMIMESign extends Sign {
      * Initializer for property keyHolderClass.
      * Hardcodes it to {@link org.apache.james.transport.SMIMEKeyHolder}.
      */
+    @Override
     protected void initKeyHolderClass() throws MessagingException {
         String keyHolderClassName = "org.apache.james.transport.SMIMEKeyHolder";
         try {
@@ -144,6 +145,7 @@ public class SMIMESign extends Sign {
     /**
      * If the <CODE>&lt;postmasterSigns&gt;</CODE> init parameter is missing sets it to <I>true</I>.
      */
+    @Override
     protected void initPostmasterSigns() {
         setPostmasterSigns((getInitParameter("postmasterSigns") == null) ? true : Boolean.valueOf(getInitParameter("postmasterSigns")));
     }
@@ -151,6 +153,7 @@ public class SMIMESign extends Sign {
     /**
      * If the <CODE>&lt;rebuildFrom&gt;</CODE> init parameter is missing sets it to <I>true</I>.
      */
+    @Override
     protected void initRebuildFrom() throws MessagingException {
         setRebuildFrom((getInitParameter("rebuildFrom") == null) ? true : Boolean.valueOf(getInitParameter("rebuildFrom")));
         if (isDebug()) {
@@ -170,6 +173,7 @@ public class SMIMESign extends Sign {
      * A text file with the massaged contents of {@link #getExplanationText}
      * is attached to the original message.
      */    
+    @Override
     protected MimeBodyPart getWrapperBodyPart(Mail mail) throws MessagingException, IOException {
         
         String explanationText = getExplanationText();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/crypto/src/main/java/org/apache/james/transport/mailets/Sign.java
----------------------------------------------------------------------
diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/Sign.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/Sign.java
index 6ab17b1..ecf8cd0 100644
--- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/Sign.java
+++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/Sign.java
@@ -68,13 +68,12 @@ public class Sign extends AbstractSign {
      *
      * @return a string describing this mailet
      */
+    @Override
     public String getMailetInfo() {
         return "Signature Mailet";
     }
     
-    /**
-     *
-     */
+    @Override
     protected  String[] getAllowedInitParameters() {
         return new String[]{
             "keyHolderClass",
@@ -114,6 +113,7 @@ public class Sign extends AbstractSign {
      *     "[signerName]" <[signerAddress]>
      * </code></pre>
      */
+    @Override
     public String getExplanationText() {
         String explanationText = super.getExplanationText();
         if (explanationText == null) {
@@ -135,6 +135,7 @@ public class Sign extends AbstractSign {
     /**
      * If the <CODE>&lt;postmasterSigns&gt;</CODE> init parameter is missing sets it to <I>true</I>.
      */
+    @Override
     protected void initPostmasterSigns() {
         setPostmasterSigns((getInitParameter("postmasterSigns") == null) ? true : Boolean.valueOf(getInitParameter("postmasterSigns")));
     }
@@ -142,6 +143,7 @@ public class Sign extends AbstractSign {
     /**
      * If the <CODE>&lt;rebuildFrom&gt;</CODE> init parameter is missing sets it to <I>true</I>.
      */
+    @Override
     protected void initRebuildFrom() throws MessagingException {
         setRebuildFrom((getInitParameter("rebuildFrom") == null) ? true : Boolean.valueOf(getInitParameter("rebuildFrom")));
         if (isDebug()) {
@@ -161,6 +163,7 @@ public class Sign extends AbstractSign {
      * A text file with the massaged contents of {@link #getExplanationText}
      * is attached to the original message.
      */    
+    @Override
     protected MimeBodyPart getWrapperBodyPart(Mail mail) throws MessagingException, IOException {
         
         String explanationText = getExplanationText();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMEEncrypted.java
----------------------------------------------------------------------
diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMEEncrypted.java b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMEEncrypted.java
index 4358375..067ec79 100644
--- a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMEEncrypted.java
+++ b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMEEncrypted.java
@@ -35,9 +35,7 @@ import org.apache.mailet.base.GenericMatcher;
  */
 public class IsSMIMEEncrypted extends GenericMatcher {
 
-    /**
-     * @see org.apache.mailet.Matcher#match(org.apache.mailet.Mail)
-     */
+    @Override
     public Collection<MailAddress> match(Mail mail) throws MessagingException {
         if (mail == null) {
             return null;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMESigned.java
----------------------------------------------------------------------
diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMESigned.java b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMESigned.java
index a730339..a38c31c 100644
--- a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMESigned.java
+++ b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMESigned.java
@@ -35,9 +35,7 @@ import org.apache.mailet.base.GenericMatcher;
  */
 public class IsSMIMESigned extends GenericMatcher {
 
-    /**
-     * @see org.apache.mailet.Matcher#match(org.apache.mailet.Mail)
-     */
+    @Override
     public Collection<MailAddress> match(Mail mail) throws MessagingException {
         if (mail == null) {
             return null;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java
----------------------------------------------------------------------
diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java
index 2c28328..db3dbf0 100644
--- a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java
+++ b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java
@@ -52,6 +52,7 @@ public class IsX509CertificateSubject extends GenericMatcher {
     protected String sourceAttribute;
     protected String check;
     
+    @Override
     public void init() throws MessagingException {
         String condition = getCondition();
         if (condition == null || !condition.contains(";")) {
@@ -63,6 +64,7 @@ public class IsX509CertificateSubject extends GenericMatcher {
         check = condition.substring(pos + 1, condition.length());
     }
     
+    @Override
     @SuppressWarnings("unchecked")
     public Collection<MailAddress> match(Mail mail) throws MessagingException {
         List<X509Certificate> certificates;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AbstractMailetdocsReport.java
----------------------------------------------------------------------
diff --git a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AbstractMailetdocsReport.java b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AbstractMailetdocsReport.java
index 3630bfa..0e11422 100644
--- a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AbstractMailetdocsReport.java
+++ b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AbstractMailetdocsReport.java
@@ -69,11 +69,13 @@ public abstract class AbstractMailetdocsReport extends AbstractMavenReport {
             this.type = typeMatcher;
         }
 
+        @Override
         public boolean evaluate(Object subject) {
             return ((MailetMatcherDescriptor) subject).getType() == type;
         }
     }
 
+    @Override
     protected void executeReport(Locale locale) throws MavenReportException {
         
         getLog().info("Executing Mailets/Matchers Report");
@@ -234,26 +236,32 @@ public abstract class AbstractMailetdocsReport extends AbstractMavenReport {
         getSink().section1_();
     }
 
+    @Override
     protected MavenProject getProject() {
         return project;
     }
 
+    @Override
     protected String getOutputDirectory() {
         return outputDirectory;
     }
 
+    @Override
     protected Renderer getSiteRenderer() {
         return siteRenderer;
     }
 
+    @Override
     public String getDescription(Locale arg0) {
         return "Documentation about bundled mailets";
     }
 
+    @Override
     public String getName(Locale arg0) {
         return "Mailet Reference";
     }
 
+    @Override
     public String getOutputName() {
         return "mailet-report";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AggregateMailetdocsReport.java
----------------------------------------------------------------------
diff --git a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AggregateMailetdocsReport.java b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AggregateMailetdocsReport.java
index 3a55340..4ff3485 100644
--- a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AggregateMailetdocsReport.java
+++ b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AggregateMailetdocsReport.java
@@ -53,6 +53,7 @@ public class AggregateMailetdocsReport extends AbstractMailetdocsReport {
      * within subprojects.
      * @param project not null
      */
+    @Override
     protected final List<MailetMatcherDescriptor> buildDescriptors(MavenProject project) {
         final DefaultDescriptorsExtractor extractor = new DefaultDescriptorsExtractor();
         if (project.isExecutionRoot()) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetMatcherDescriptor.java
----------------------------------------------------------------------
diff --git a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetMatcherDescriptor.java b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetMatcherDescriptor.java
index 6f16793..5a368f6 100644
--- a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetMatcherDescriptor.java
+++ b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetMatcherDescriptor.java
@@ -50,9 +50,7 @@ public class MailetMatcherDescriptor {
             return name;
         }
 
-        /**
-         * @see #getName()
-         */
+        @Override
         public String toString() {
             return getName();
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetdocsReport.java
----------------------------------------------------------------------
diff --git a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetdocsReport.java b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetdocsReport.java
index 575a86a..a8d1a06 100644
--- a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetdocsReport.java
+++ b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetdocsReport.java
@@ -43,6 +43,7 @@ public class MailetdocsReport extends AbstractMailetdocsReport {
      * without recursion.
      * @param project not null
      */
+    @Override
     protected List<MailetMatcherDescriptor> buildDescriptors(MavenProject project) {
         logProject(project);
         return new DefaultDescriptorsExtractor().extract(project, getLog()).descriptors();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java
index d9cb0aa..688b3cc 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java
@@ -98,6 +98,7 @@ public class AddHabeasWarrantMark extends GenericMailet {
      * @throws javax.mail.MessagingException - if an message or address parsing exception occurs or
      *      an exception that interferes with the mailet's normal operation
      */
+    @Override
     public void service(Mail mail) throws MessagingException {
         MimeMessage message = mail.getMessage();
 
@@ -113,6 +114,7 @@ public class AddHabeasWarrantMark extends GenericMailet {
      *
      * @return a string describing this mailet
      */
+    @Override
     public String getMailetInfo() {
         return "Add Habeas Warrant Mark.  Must be used in accordance with a license from Habeas (see http://www.habeas.com for details).";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java
index cdb0c49..a06495f 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java
@@ -243,11 +243,7 @@ public class ClamAVScan extends GenericMailet {
      */
     private int nextAddressIndex;
 
-    /**
-     * Return a string describing this mailet.
-     *
-     * @return a string describing this mailet
-     */
+    @Override
     public String getMailetInfo() {
         return "Antivirus Check using ClamAV (CLAMD)";
     }
@@ -554,9 +550,7 @@ public class ClamAVScan extends GenericMailet {
         }
     }
 
-    /**
-     * Mailet initialization routine.
-     */
+    @Override
     public void init() throws MessagingException {
 
         // check that all init parameters have been declared in allowedInitParameters
@@ -591,6 +585,7 @@ public class ClamAVScan extends GenericMailet {
      * @param mail the mail to scan
      * @throws MessagingException if a problem arises
      */
+    @Override
     public void service(Mail mail) throws MessagingException {
 
         // if already checked no action

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java
index fd500df..33e556b 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java
@@ -52,9 +52,7 @@ public class ClassifyBounce extends GenericMailet {
      */
     private String headerName;
 
-    /**
-     * Initialize the mailet.
-     */
+    @Override
     public void init() throws MessagingException {
         headerName = getInitParameter("headerName");
 
@@ -70,6 +68,7 @@ public class ClassifyBounce extends GenericMailet {
      * @param mail the mail being processed
      * @throws MessagingException if an error arises during message processing
      */
+    @Override
     public void service(Mail mail) throws MessagingException {
         MimeMessage message = mail.getMessage();
         Classifier classifier = new Classifier(message);
@@ -80,11 +79,7 @@ public class ClassifyBounce extends GenericMailet {
         //}
     }
 
-    /**
-     * Return a string describing this mailet.
-     *
-     * @return a string describing this mailet
-     */
+    @Override
     public String getMailetInfo() {
         return "SetMimeHeader Mailet";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java
index bbd1a67..02ec697 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java
@@ -68,9 +68,7 @@ public class HeadersToHTTP extends GenericMailet {
     private String parameterValue = null;
     private boolean passThrough = true;
 
-    /**
-     * Initialize the mailet.
-     */
+    @Override
     public void init() throws MessagingException {
 
         passThrough = (getInitParameter("passThrough", "true").compareToIgnoreCase("true") == 0);
@@ -109,6 +107,7 @@ public class HeadersToHTTP extends GenericMailet {
      *            the mail being processed
      * 
      */
+    @Override
     public void service(Mail mail) {
         try {
             LOGGER.debug("{} HeadersToHTTP: Starting", mail.getName());
@@ -187,11 +186,7 @@ public class HeadersToHTTP extends GenericMailet {
         return pairs;
     }
 
-    /**
-     * Return a string describing this mailet.
-     * 
-     * @return a string describing this mailet
-     */
+    @Override
     public String getMailetInfo() {
         return "HTTP POST serialised message";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/OnlyText.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/OnlyText.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/OnlyText.java
index b4d6f02..1c90259 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/OnlyText.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/OnlyText.java
@@ -53,15 +53,12 @@ public class OnlyText extends GenericMailet {
     private String optionsNotextProcessor = null;
     private final HashMap<String, String> charMap = new HashMap<>();
 
-    /**
-     * returns a String describing this mailet.
-     *
-     * @return A desciption of this mailet
-     */
+    @Override
     public String getMailetInfo() {
         return "OnlyText";
     }
 
+    @Override
     public void init() throws MailetException {
         optionsNotextProcessor = getInitParameter(PARAMETER_NAME_NOTEXT_PROCESSOR);
         initEntityTable();
@@ -96,6 +93,7 @@ public class OnlyText extends GenericMailet {
 
     }
 
+    @Override
     public void service(Mail mail) throws MailetException {
         try {
             Object content = mail.getMessage().getContent();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java
index 3366c86..9a539d9 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java
@@ -46,6 +46,7 @@ public class PostmasterAlias extends GenericMailet {
      *
      * @throws MessagingException if an error is encountered while modifying the message
      */
+    @Override
     public void service(Mail mail) throws MessagingException {
         Collection<MailAddress> postmasterAliases = mail.getRecipients()
             .stream()
@@ -69,11 +70,7 @@ public class PostmasterAlias extends GenericMailet {
             && !getMailetContext().isLocalEmail(addr);
     }
 
-    /**
-     * Return a string describing this mailet.
-     *
-     * @return a string describing this mailet
-     */
+    @Override
     public String getMailetInfo() {
         return "Postmaster aliasing mailet";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java
index 8f9ede6..26d50b6 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java
@@ -66,11 +66,7 @@ public class RecoverAttachment extends GenericMailet {
 
     private String attributeName = null;
 
-    /**
-     * Checks if the mandatory parameters are present
-     * 
-     * @throws MailetException
-     */
+    @Override
     public void init() throws MailetException {
         attributeName = getInitParameter(ATTRIBUTE_PARAMETER_NAME);
 
@@ -91,6 +87,7 @@ public class RecoverAttachment extends GenericMailet {
      * @throws MailetException
      *             Thrown when an error situation is encountered.
      */
+    @Override
     public void service(Mail mail) throws MailetException {
         @SuppressWarnings("unchecked")
         Map<String, byte[]> attachments = (Map<String, byte[]>) mail.getAttribute(attributeName);
@@ -137,11 +134,7 @@ public class RecoverAttachment extends GenericMailet {
         }
     }
 
-    /**
-     * returns a String describing this mailet.
-     * 
-     * @return A desciption of this mailet
-     */
+    @Override
     public String getMailetInfo() {
         return "RecoverAttachment Mailet";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java
index 4a3b14c..72a39d0 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java
@@ -53,6 +53,7 @@ public class RemoveMailAttribute extends GenericMailet {
 
     private ImmutableList<String> attributesToRemove;
 
+    @Override
     public String getMailetInfo() {
         return "Remove Mail Attribute Mailet";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java
index 58c6d20..3dde0d1 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java
@@ -69,9 +69,7 @@ public class SerialiseToHTTP extends GenericMailet {
     private String messageKeyName = "message";
     private boolean passThrough = true;
 
-    /**
-     * Initialize the mailet.
-     */
+    @Override
     public void init() throws MessagingException {
 
         passThrough = (getInitParameter("passThrough", "true").compareToIgnoreCase("true") == 0);
@@ -118,6 +116,7 @@ public class SerialiseToHTTP extends GenericMailet {
      *            the mail being processed
      *
      */
+    @Override
     public void service(Mail mail) {
         try {
             MimeMessage message = mail.getMessage();
@@ -202,11 +201,7 @@ public class SerialiseToHTTP extends GenericMailet {
         return data;
     }
 
-    /**
-     * Return a string describing this mailet.
-     * 
-     * @return a string describing this mailet
-     */
+    @Override
     public String getMailetInfo() {
         return "HTTP POST serialised message";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/ServerTime.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ServerTime.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ServerTime.java
index b58015c..bf7ed37 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ServerTime.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ServerTime.java
@@ -44,6 +44,7 @@ public class ServerTime extends GenericMailet {
      *
      * @throws javax.mail.MessagingException if an error is encountered while formulating the reply message
      */
+    @Override
     public void service(Mail mail) throws javax.mail.MessagingException {
         MimeMessage response = (MimeMessage)mail.getMessage().reply(false);
         response.setSubject("The time is now...");
@@ -67,11 +68,7 @@ public class ServerTime extends GenericMailet {
         getMailetContext().sendMail(response);
     }
 
-    /**
-     * Return a string describing this mailet.
-     *
-     * @return a string describing this mailet
-     */
+    @Override
     public String getMailetInfo() {
         return "ServerTime Mailet";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java
index 9462731..891c448 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java
@@ -239,11 +239,6 @@ public class StripAttachment extends GenericMailet {
         }
     }
 
-    /**
-     * returns a String describing this mailet.
-     * 
-     * @return A desciption of this mailet
-     */
     @Override
     public String getMailetInfo() {
         return "StripAttachment";

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/UnwrapText.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/UnwrapText.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/UnwrapText.java
index 8353644..6959839 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/UnwrapText.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/UnwrapText.java
@@ -59,19 +59,17 @@ public class UnwrapText extends GenericMailet {
     
     private int quotewidth;
     
-    /**
-     * returns a String describing this mailet.
-     * 
-     * @return A desciption of this mailet
-     */
+    @Override
     public String getMailetInfo() {
         return "UnwrapText";
     }
 
+    @Override
     public void init() throws MailetException {
         quotewidth = Integer.parseInt(getInitParameter(PARAMETER_NAME_QUOTEWIDTH, "-10"));
     }
 
+    @Override
     public void service(Mail mail) throws MailetException {
         try {
             // TODO replace non standard quotes (at least "> " with ">", otherwise the widely used  "> > >" will not work.

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java
index 876d790..63deea9 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java
@@ -83,6 +83,7 @@ public class UseHeaderRecipients extends GenericMailet {
      * <p/>
      * initializes the DEBUG flag
      */
+    @Override
     public void init() {
         isDebug = (getInitParameter("debug") == null) ? false : Boolean.valueOf(getInitParameter("debug"));
     }
@@ -94,6 +95,7 @@ public class UseHeaderRecipients extends GenericMailet {
      *
      * @param mail incoming email
      */
+    @Override
     public void service(Mail mail) throws MessagingException {
         MimeMessage message = mail.getMessage();
 
@@ -122,11 +124,7 @@ public class UseHeaderRecipients extends GenericMailet {
     }
 
 
-    /**
-     * Return a string describing this mailet.
-     *
-     * @return a string describing this mailet
-     */
+    @Override
     public String getMailetInfo() {
         return "UseHeaderRecipients Mailet";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/WrapText.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/WrapText.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/WrapText.java
index d67f02c..a7adc7f 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/WrapText.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/WrapText.java
@@ -40,20 +40,18 @@ public class WrapText extends GenericMailet {
     private boolean optionFlowedDelsp = false;
     private int optionWidth = FlowedMessageUtils.RFC2646_WIDTH;
     
-    /**
-     * returns a String describing this mailet.
-     * 
-     * @return A desciption of this mailet
-     */
+    @Override
     public String getMailetInfo() {
         return "WrapText";
     }
     
+    @Override
     public void init() throws MailetException {
         optionFlowedDelsp = getBooleanParameter(getInitParameter(PARAMETER_NAME_FLOWED_DELSP), optionFlowedDelsp);
         optionWidth = Integer.parseInt(getInitParameter(PARAMETER_NAME_WIDTH, "" + optionWidth));
     }
 
+    @Override
     public void service(Mail mail) throws MailetException {
         // TODO We could even manage the flow when the message is quoted-printable
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Counter.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Counter.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Counter.java
index 63fbe4c..c96a879 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Counter.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Counter.java
@@ -44,6 +44,7 @@ public class Counter extends GenericMailet {
      *
      * @param mail the mail to process
      */
+    @Override
     public void service(Mail mail) {
         counter++;
         LOGGER.info("{}", counter);
@@ -55,6 +56,7 @@ public class Counter extends GenericMailet {
      *
      * @return a string describing this mailet
      */
+    @Override
     public String getMailetInfo() {
         return "Counter Mailet";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/DumpSystemErr.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/DumpSystemErr.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/DumpSystemErr.java
index f3c4a95..4223551 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/DumpSystemErr.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/DumpSystemErr.java
@@ -45,6 +45,7 @@ public class DumpSystemErr extends GenericMailet {
      *
      * @throws MessagingException if an error occurs while writing the message
      */
+    @Override
     public void service(Mail mail) throws MessagingException {
         try {
             MimeMessage message = mail.getMessage();
@@ -54,11 +55,7 @@ public class DumpSystemErr extends GenericMailet {
         }
     }
 
-    /**
-     * Return a string describing this mailet.
-     *
-     * @return a string describing this mailet
-     */
+    @Override
     public String getMailetInfo() {
         return "Dumps message to System.err";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java
index 27d8067..dec449a 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java
@@ -40,15 +40,12 @@ public class ExceptionThrowingMailet extends GenericMailet {
      *
      * @throws MailetException in all cases
      */
+    @Override
     public void service(Mail mail) throws MessagingException {
         throw new MailetException("General protection fault");
     }
 
-    /**
-     * Return a string describing this mailet.
-     *
-     * @return a string describing this mailet
-     */
+    @Override
     public String getMailetInfo() {
         return "ExceptionThrowingMailet Mailet";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Identity.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Identity.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Identity.java
index 533bc01..bb0589e 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Identity.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Identity.java
@@ -30,20 +30,12 @@ import org.apache.mailet.base.GenericMailet;
  */
 public class Identity extends GenericMailet {
 
-    /**
-     * Do nothing.
-     *
-     * @param mail the mail to be processed
-     */
+    @Override
     public void service(Mail mail) {
         //Do nothing
     }
 
-    /**
-     * Return a string describing this mailet.
-     *
-     * @return a string describing this mailet
-     */
+    @Override
     public String getMailetInfo() {
         return "Identity Mailet";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java
index ca626cc..e097e8e 100755
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java
@@ -54,6 +54,7 @@ public abstract class AbstractQuotaMatcher extends GenericMatcher {
      *
      * @throws MessagingException if either <CODE>isSenderChecked</CODE> or isRecipientChecked throw an exception
      */    
+    @Override
     public final Collection<MailAddress> match(Mail mail) throws MessagingException {
         Collection<MailAddress> matching = null;
         if (isSenderChecked(mail.getSender())) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/All.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/All.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/All.java
index 4df2e50..0f85cb0 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/All.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/All.java
@@ -31,10 +31,7 @@ import org.apache.mailet.base.GenericMatcher;
 public class All extends GenericMatcher {
     
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.mailet.base.GenericMatcher#match(org.apache.mailet.Mail)
-     */
+    @Override
     public Collection<MailAddress> match(Mail mail) {
         return mail.getRecipients();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java
index f5b0b89..9d21236 100755
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java
@@ -93,10 +93,7 @@ public class AttachmentFileNameIs extends GenericMatcher {
     protected boolean unzipIsRequested;
     
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.mailet.base.GenericMatcher#init()
-     */
+    @Override
     public void init() throws MessagingException {
         /* sets up fileNameMasks variable by parsing the condition */
         
@@ -135,6 +132,7 @@ public class AttachmentFileNameIs extends GenericMatcher {
      * @param mail
      * @throws MessagingException if no matching attachment is found and at least one exception was thrown
      */
+    @Override
     public Collection<MailAddress> match(Mail mail) throws MessagingException {
         
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java
index 9f977cd..cecf833 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java
@@ -39,19 +39,13 @@ public class CommandForListserv extends GenericRecipientMatcher {
     private MailAddress listservAddress;
 
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.mailet.base.GenericMatcher#init()
-     */
+    @Override
     public void init() throws MessagingException {
         listservAddress = new MailAddress(getCondition());
     }
 
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.mailet.base.GenericRecipientMatcher#matchRecipient(org.apache.mailet.MailAddress)
-     */
+    @Override
     public boolean matchRecipient(MailAddress recipient) {
         if (recipient.getDomain().equals(listservAddress.getDomain())) {
             if (recipient.getLocalPart().equals(listservAddress.getLocalPart() + "-on")

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java
index bea2b2c..57ca67d 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java
@@ -46,10 +46,7 @@ public class CommandListservMatcher extends GenericRecipientMatcher {
 
     private MailAddress listservAddress;
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.mailet.base.GenericMatcher#init()
-     */
+    @Override
     public void init() throws MessagingException {
         listservAddress = new MailAddress(getCondition());
     }
@@ -60,6 +57,7 @@ public class CommandListservMatcher extends GenericRecipientMatcher {
      * @param recipient
      * @return true if matches, false otherwise
      */
+    @Override
     public boolean matchRecipient(MailAddress recipient) {
         if (recipient.getDomain().equals(listservAddress.getDomain())) {
             if (recipient.getLocalPart().startsWith(listservAddress.getLocalPart() + "-")) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java
index b7a284f..44f3260 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java
@@ -64,10 +64,7 @@ public class CompareNumericHeaderValue extends GenericMatcher {
     
     private Double headerValue;
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.mailet.base.GenericMatcher#init()
-     */
+    @Override
     public void init() throws MessagingException {
         StringTokenizer st = new StringTokenizer(getCondition(), " \t", false);
         if (st.hasMoreTokens()) {
@@ -115,10 +112,7 @@ public class CompareNumericHeaderValue extends GenericMatcher {
     }
 
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.mailet.base.GenericMatcher#match(org.apache.mailet.Mail)
-     */
+    @Override
     public Collection<MailAddress> match(Mail mail) throws MessagingException {
         if (headerName == null) {
             // should never get here

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java
index db28d4c..3d5892d 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java
@@ -43,6 +43,7 @@ public class FetchedFrom extends GenericMatcher {
 
     public static final String X_FETCHED_FROM = "X-fetched-from";
 
+    @Override
     public Collection<MailAddress> match(Mail mail) throws MessagingException {
         MimeMessage message = mail.getMessage();
         String fetchHeaderValue = message.getHeader(X_FETCHED_FROM, null);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/FileRegexMatcher.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/FileRegexMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/FileRegexMatcher.java
index 47f6c4d..1f1c082 100755
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/FileRegexMatcher.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/FileRegexMatcher.java
@@ -35,9 +35,7 @@ import org.apache.mailet.Experimental;
 @Experimental
 public class FileRegexMatcher extends GenericRegexMatcher {
     
-    /**
-     * @see org.apache.james.transport.matchers.GenericRegexMatcher#init()
-     */
+    @Override
     public void init() throws MessagingException {
         java.io.RandomAccessFile patternSource = null;
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java
index 385f772..ca32879 100755
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java
@@ -56,14 +56,10 @@ public abstract class GenericRegexMatcher extends GenericMatcher {
         }
     }
 
-    /**
-     * @see org.apache.mailet.GenericMatcher#GenericMatcher()
-     */
+    @Override
     public abstract void init() throws MessagingException;
 
-    /**
-     * @see org.apache.mailet.GenericMatcher#match(Mail)
-     */
+    @Override
     public Collection<MailAddress> match(Mail mail) throws MessagingException {
         MimeMessage message = mail.getMessage();
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasAttachment.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasAttachment.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasAttachment.java
index c1fa48a..e3557ae 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasAttachment.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasAttachment.java
@@ -45,6 +45,7 @@ public class HasAttachment extends GenericMatcher {
      * Either every recipient is matching or neither of them.
      * @throws MessagingException if no attachment is found and at least one exception was thrown
      */
+    @Override
     public Collection<MailAddress> match(Mail mail) throws MessagingException {
         
         Exception anException = null;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java
index 8ee224e..2c5e930 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java
@@ -87,6 +87,7 @@ public class HasHabeasWarrantMark extends GenericMatcher {
         { "X-Habeas-SWE-9", "mark in spam to <http://www.habeas.com/report/>." }, 
     };
 
+    @Override
     public Collection<MailAddress> match(Mail mail) throws MessagingException {
         MimeMessage message = mail.getMessage();
 
@@ -125,6 +126,7 @@ public class HasHabeasWarrantMark extends GenericMatcher {
      * @return a String containing matcher information
      */
 
+    @Override
     public String getMatcherInfo() {
         return "Habeas Warrant Mark Matcher (see http://www.habeas.com for details).";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java
index d83623b..e4c8cbb 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java
@@ -93,6 +93,7 @@ public class HasHeader extends GenericMatcher {
 
     private List<HeaderCondition> headerConditions;
 
+    @Override
     public void init() throws MessagingException {
         headerConditions = new ArrayList<>();
         StringTokenizer conditionTokenizer = new StringTokenizer(getCondition(), CONDITION_SEPARATOR);
@@ -114,6 +115,7 @@ public class HasHeader extends GenericMatcher {
         }
     }
 
+    @Override
     public Collection<MailAddress> match(Mail mail) throws javax.mail.MessagingException {
         for (HeaderCondition headerCondition : headerConditions) {
             if (!headerCondition.isMatching(mail.getMessage())) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeaderWithPrefix.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeaderWithPrefix.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeaderWithPrefix.java
index b71ad88..78f1d75 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeaderWithPrefix.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeaderWithPrefix.java
@@ -52,6 +52,7 @@ public class HasHeaderWithPrefix extends GenericMatcher {
         }
     }
 
+    @Override
     public String getMatcherInfo() {
         return "HasHeaderWithPrefix Matcher";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java
index 3f2d64f..ffe6666 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java
@@ -44,15 +44,12 @@ public class HasMailAttribute extends GenericMatcher {
     
     private String attributeName;
 
-    /**
-     * Return a string describing this matcher.
-     *
-     * @return a string describing this matcher
-     */
+    @Override
     public String getMatcherInfo() {
         return "Has Mail Attribute Matcher";
     }
 
+    @Override
     public void init() throws MessagingException {
         attributeName = getCondition();
     }
@@ -63,6 +60,7 @@ public class HasMailAttribute extends GenericMatcher {
      * set on the mail
      *
      **/
+    @Override
     public Collection<MailAddress> match(Mail mail) throws MessagingException {
         if (mail.getAttribute(attributeName) != null) {
             return mail.getRecipients();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java
index 8f45d1f..ac02bee 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java
@@ -84,6 +84,7 @@ public class HasMailAttributeWithValue extends GenericMatcher {
      * 
      * @param mail
      */
+    @Override
     public Collection<MailAddress> match(Mail mail) throws MessagingException {
         Object attributeValue = mail.getAttribute(getAttributeName());
 
@@ -126,10 +127,7 @@ public class HasMailAttributeWithValue extends GenericMatcher {
         fieldAttributeValue = attributeValue;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.mailet.base.GenericMatcher#init()
-     */
+    @Override
     public void init() throws MessagingException {
         String condition = getCondition().trim();
         int commaPosition = condition.indexOf(',');
@@ -146,11 +144,7 @@ public class HasMailAttributeWithValue extends GenericMatcher {
         setAttributeValue(condition.substring(commaPosition + 1).trim());
     }
     
-    /**
-     * Return a string describing this matcher.
-     *
-     * @return a string describing this matcher
-     */
+    @Override
     public String getMatcherInfo() {
         return "Has Mail Attribute With Value Matcher";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java
index 4c8bc5d..9dc822e 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java
@@ -52,15 +52,12 @@ public class HasMailAttributeWithValueRegex extends GenericMatcher {
     private String attributeName;
     private Pattern pattern   = null;
 
-    /**
-     * Return a string describing this matcher.
-     *
-     * @return a string describing this matcher
-     */
+    @Override
     public String getMatcherInfo() {
         return "Has Mail Attribute Value Matcher";
     }
 
+    @Override
     public void init(MatcherConfig conf) throws MessagingException {
         String condition = conf.getCondition();
         int idx = condition.indexOf(',');
@@ -84,6 +81,7 @@ public class HasMailAttributeWithValueRegex extends GenericMatcher {
      * interpreted as a regular expression matches the toString value of the
      * corresponding attributes value.
      **/
+    @Override
     public Collection<MailAddress> match(Mail mail) throws MessagingException {
         Serializable obj = mail.getAttribute(attributeName);
         //to be a little more generic the toString of the value is what is matched against

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMimeType.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMimeType.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMimeType.java
index deaf188..1dc2ecf 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMimeType.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMimeType.java
@@ -51,10 +51,12 @@ public class HasMimeType extends GenericMatcher {
 
     private Set<String> acceptedContentTypes;
 
+    @Override
     public void init() throws javax.mail.MessagingException {
         acceptedContentTypes = ImmutableSet.copyOf(Splitter.on(",").trimResults().split(getCondition()));
     }
 
+    @Override
     public Collection<MailAddress> match(Mail mail) throws javax.mail.MessagingException {
         Optional<String> mimeTypes = getMimeTypeFromMessage(mail.getMessage());
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIs.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIs.java
index 36c0684..5225255 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIs.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIs.java
@@ -36,10 +36,7 @@ public class HostIs extends GenericRecipientMatcher {
 
     private Collection<String> hosts;
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.mailet.base.GenericMatcher#init()
-     */
+    @Override
     public void init() {
         StringTokenizer st = new StringTokenizer(getCondition(), ", ", false);
         hosts = new Vector<>();
@@ -48,10 +45,7 @@ public class HostIs extends GenericRecipientMatcher {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.mailet.base.GenericRecipientMatcher#matchRecipient(org.apache.mailet.MailAddress)
-     */
+    @Override
     public boolean matchRecipient(MailAddress recipient) {
         return hosts.contains(recipient.getDomain().toLowerCase(Locale.US));
     }


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


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

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/AddressImpl.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/AddressImpl.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/AddressImpl.java
index 527bef3..018d519 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/AddressImpl.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/AddressImpl.java
@@ -41,30 +41,22 @@ final class AddressImpl implements FetchResponse.Envelope.Address {
         this.personalName = personalName;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Envelope.Address#getAtDomainList()
-     */
+    @Override
     public String getAtDomainList() {
         return atDomainList;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Envelope.Address#getHostName()
-     */
+    @Override
     public String getHostName() {
         return hostName;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Envelope.Address#getMailboxName()
-     */
+    @Override
     public String getMailboxName() {
         return mailboxName;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Envelope.Address#getPersonalName()
-     */
+    @Override
     public String getPersonalName() {
         return personalName;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java
index 5d87729..93dda65 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java
@@ -40,17 +40,12 @@ class ContentBodyElement implements BodyElement {
         this.content = content;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.BodyElement#getName()
-     */
+    @Override
     public String getName() {
         return name;
     }
 
-    /**
-     * @throws MailboxException 
-     * @see org.apache.james.imap.message.response.FetchResponse.BodyElement#size()
-     */
+    @Override
     public long size() throws IOException {
         try {
             return content.size();
@@ -60,9 +55,7 @@ class ContentBodyElement implements BodyElement {
     }
 
 
-    /**
-     * @see org.apache.james.imap.message.response.Literal#getInputStream()
-     */
+    @Override
     public InputStream getInputStream() throws IOException {
         return content.getInputStream();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EmptyContent.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EmptyContent.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EmptyContent.java
index 53c3978..a92e646 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EmptyContent.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EmptyContent.java
@@ -33,13 +33,12 @@ public class EmptyContent implements Content {
     /**
      * Return 0 as this {@link Content} is empty
      */
+    @Override
     public long size() {
         return 0;
     }
 
-    /**
-     * @see org.apache.james.mailbox.Content#getInputStream()
-     */
+    @Override
     public InputStream getInputStream() throws IOException {
         return new ByteArrayInputStream("".getBytes());
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeImpl.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeImpl.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeImpl.java
index dc25a2c..615558f 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeImpl.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeImpl.java
@@ -60,72 +60,52 @@ final class EnvelopeImpl implements FetchResponse.Envelope {
         this.to = to;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Envelope#getBcc()
-     */
+    @Override
     public Address[] getBcc() {
         return bcc;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Envelope#getCc()
-     */
+    @Override
     public Address[] getCc() {
         return cc;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Envelope#getDate()
-     */
+    @Override
     public String getDate() {
         return date;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Envelope#getFrom()
-     */
+    @Override
     public Address[] getFrom() {
         return from;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Envelope#getInReplyTo()
-     */
+    @Override
     public String getInReplyTo() {
         return inReplyTo;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Envelope#getMessageId()
-     */
+    @Override
     public String getMessageId() {
         return messageId;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Envelope#getReplyTo()
-     */
+    @Override
     public Address[] getReplyTo() {
         return replyTo;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Envelope#getSender()
-     */
+    @Override
     public Address[] getSender() {
         return sender;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Envelope#getSubject()
-     */
+    @Override
     public String getSubject() {
         return subject;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Envelope#getTo()
-     */
+    @Override
     public Address[] getTo() {
         return to;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
index bd95d25..611f2f1 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
@@ -63,13 +63,7 @@ public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> {
         super(FetchRequest.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(FetchRequest request, ImapSession session, String tag, ImapCommand command, Responder responder) {
         final boolean useUids = request.isUseUids();
         final IdRange[] idSet = request.getIdSet();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java
index 7e2afa2..9d8466a 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java
@@ -52,10 +52,7 @@ public class MimeBodyElement implements BodyElement {
         
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.message.response.FetchResponse.BodyElement#getName()
-     */
+    @Override
     public String getName() {
         return name;
     }
@@ -75,18 +72,13 @@ public class MimeBodyElement implements BodyElement {
         return result;
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.message.response.FetchResponse.BodyElement#size()
-     */
+    @Override
     public long size() {
         return size;
     }
 
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.BodyElement#getInputStream()
-     */
+    @Override
     public InputStream getInputStream() throws IOException {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java
index 6e723ec..59c01ae 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java
@@ -97,114 +97,82 @@ final class MimeDescriptorStructure implements FetchResponse.Structure {
         return results;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Structure#getDescription()
-     */
+    @Override
     public String getDescription() {
         return descriptor.getContentDescription();
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Structure#getEncoding()
-     */
+    @Override
     public String getEncoding() {
         return descriptor.getTransferContentEncoding();
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Structure#getId()
-     */
+    @Override
     public String getId() {
         return descriptor.getContentID();
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Structure#getLines()
-     */
+    @Override
     public long getLines() {
         return descriptor.getLines();
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Structure#getMediaType()
-     */
+    @Override
     public String getMediaType() {
         return descriptor.getMimeType();
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Structure#getOctets()
-     */
+    @Override
     public long getOctets() {
         return descriptor.getBodyOctets();
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Structure#getParameters()
-     */
+    @Override
     public List<String> getParameters() {
         return parameters;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Structure#getSubType()
-     */
+    @Override
     public String getSubType() {
         return descriptor.getMimeSubType();
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Structure#parts()
-     */
+    @Override
     public Iterator<Structure> parts() {
         return parts.iterator();
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Structure#getDisposition()
-     */
+    @Override
     public String getDisposition() {
         return disposition;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Structure#getLocation()
-     */
+    @Override
     public String getLocation() {
         return location;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Structure#getMD5()
-     */
+    @Override
     public String getMD5() {
         return md5;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Structure#getLanguages()
-     */
+    @Override
     public List<String> getLanguages() {
         return languages;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Structure#getBody()
-     */
+    @Override
     public Structure getBody() {
         return embeddedMessageStructure;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Structure#getDispositionParams()
-     */
+    @Override
     public Map<String, String> getDispositionParams() {
         return dispositionParams;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.Structure#getEnvelope()
-     */
+    @Override
     public Envelope getEnvelope() {
         return envelope;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java
index 538c104..b7204a3 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java
@@ -34,9 +34,7 @@ final class MimePathImpl implements MessageResult.MimePath {
         this.positions = positions;
     }
 
-    /**
-     * @see org.apache.james.mailbox.MessageResult.MimePath#getPositions()
-     */
+    @Override
     public int[] getPositions() {
         return positions;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java
index 3ae50fc..e8ff860 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java
@@ -46,16 +46,12 @@ final class PartialFetchBodyElement implements BodyElement {
         name = delegate.getName() + "<" + firstOctet + ">";
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.FetchResponse.BodyElement#getName()
-     */
+    @Override
     public String getName() {
         return name;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.Literal#size()
-     */
+    @Override
     public long size() throws IOException {
         final long size = delegate.size();
         final long lastOctet = this.numberOfOctets + firstOctet;
@@ -70,9 +66,7 @@ final class PartialFetchBodyElement implements BodyElement {
         return result;
     }
 
-    /**
-     * @see org.apache.james.imap.message.response.Literal#getInputStream()
-     */
+    @Override
     public InputStream getInputStream() throws IOException {
         return new LimitingInputStream(delegate.getInputStream(), firstOctet, size());
     }
@@ -115,6 +109,7 @@ final class PartialFetchBodyElement implements BodyElement {
         /**
          * @see java.io.FilterInputStream#read()
          */
+        @Override
         public int read() throws IOException {
             checkOffset();
             if (pos >= length) {
@@ -127,6 +122,7 @@ final class PartialFetchBodyElement implements BodyElement {
         /**
          * @see java.io.FilterInputStream#read(byte[])
          */
+        @Override
         public int read(byte[] b) throws IOException {
             return read(b, 0, b.length);
         }
@@ -134,6 +130,7 @@ final class PartialFetchBodyElement implements BodyElement {
         /**
          * @see java.io.FilterInputStream#read(byte[], int, int)
          */
+        @Override
         public int read(byte[] b, int off, int len) throws IOException {
             checkOffset();
 
@@ -156,6 +153,7 @@ final class PartialFetchBodyElement implements BodyElement {
         /**
          * Throws {@link IOException}
          */
+        @Override
         public long skip(long n) throws IOException {
             throw new IOException("Not implemented");
         }
@@ -163,6 +161,7 @@ final class PartialFetchBodyElement implements BodyElement {
         /**
          * @see java.io.FilterInputStream#available()
          */
+        @Override
         public int available() throws IOException {
             // Correctly calculate in available bytes.
             // See IMAP-295
@@ -179,10 +178,12 @@ final class PartialFetchBodyElement implements BodyElement {
             }
         }
 
+        @Override
         public void mark(int readlimit) {
             // Don't do anything.
         }
 
+        @Override
         public void reset() throws IOException {
             throw new IOException("mark not supported");
         }
@@ -190,6 +191,7 @@ final class PartialFetchBodyElement implements BodyElement {
         /**
          * Return false as mark is not supported
          */
+        @Override
         public boolean markSupported() {
             return false;
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/protocols/imap/DecodingException.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/DecodingException.java b/protocols/imap/src/main/java/org/apache/james/protocols/imap/DecodingException.java
index 9766785..7abd964 100644
--- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/DecodingException.java
+++ b/protocols/imap/src/main/java/org/apache/james/protocols/imap/DecodingException.java
@@ -95,6 +95,7 @@ public class DecodingException extends IOException {
         return key;
     }
 
+    @Override
     public Throwable getCause() {
         return t;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequest.java b/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequest.java
index b8892ac..85025a2 100644
--- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequest.java
@@ -71,10 +71,7 @@ public class IMAPRequest implements Request {
         return tag;
     }
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.Request#getArgument()
-     */
+    @Override
     public String getArgument() {
         int tagOffeset = tag.length() + command.length() + 2;
         StringBuilder sb = new StringBuilder();
@@ -103,10 +100,7 @@ public class IMAPRequest implements Request {
         return sb.toString();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.Request#getCommand()
-     */
+    @Override
     public String getCommand() {
         return command;
     }
@@ -122,10 +116,12 @@ public class IMAPRequest implements Request {
             boolean first = true;
             Iterator<ByteBuffer> buffIt = lines.iterator();
 
+            @Override
             public boolean hasNext() {
                 return buffIt.hasNext();
             }
 
+            @Override
             public ByteBuffer next() {
                 ByteBuffer buf = buffIt.next();
                 buf.rewind();
@@ -138,6 +134,7 @@ public class IMAPRequest implements Request {
                 return buf;
             }
 
+            @Override
             public void remove() {
                 throw new UnsupportedOperationException();
             }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPSession.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPSession.java b/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPSession.java
index 6b0439e..2e01134 100644
--- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPSession.java
+++ b/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPSession.java
@@ -28,12 +28,14 @@ public interface IMAPSession extends ProtocolSession {
     /**
      * Pop the last command handler 
      */
+    @Override
     void popLineHandler();
     
     /**
      * Return the size of the pushed {@link LineHandler}
      * @return size of the pushed line handler
      */
+    @Override
     int getPushedLineHandlerCount();
 
     /**

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java b/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java
index 2bedae6..8093f78 100644
--- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java
+++ b/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java
@@ -61,6 +61,7 @@ public class IMAPCommandDispatcher extends CommandDispatcher<IMAPSession> {
                  * (non-Javadoc)
                  * @see org.apache.james.protocols.api.handler.MultiLineHandler#isReady(org.apache.james.protocols.api.ProtocolSession, java.nio.ByteBuffer)
                  */
+                @Override
                 protected boolean isReady(IMAPSession session, ByteBuffer line) {
                     long bytesRead = (Long) session.setAttachment(BYTES_READ, null, State.Transaction);
                     bytesRead += line.remaining();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java b/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java
index df36784..8950823 100644
--- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java
+++ b/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java
@@ -40,6 +40,7 @@ public class FixedLengthInputStream extends FilterInputStream {
         this.length = length;
     }
 
+    @Override
     public int read() throws IOException {
         if (pos >= length) {
             return -1;
@@ -48,11 +49,13 @@ public class FixedLengthInputStream extends FilterInputStream {
         return super.read();
     }
 
+    @Override
     public int read(byte[] b) throws IOException {
 
         return read(b, 0, b.length);
     }
 
+    @Override
     public int read(byte[] b, int off, int len) throws IOException {
 
         if (pos >= length) {
@@ -72,27 +75,33 @@ public class FixedLengthInputStream extends FilterInputStream {
 
     }
 
+    @Override
     public long skip(long n) throws IOException {
         throw new IOException("Not implemented");
         // return super.skip( n );
     }
 
+    @Override
     public int available() throws IOException {
         return (int) (length - pos);
     }
 
+    @Override
     public void close() throws IOException {
         // Don't do anything to the underlying stream.
     }
 
+    @Override
     public void mark(int readlimit) {
         // Don't do anything.
     }
 
+    @Override
     public synchronized void reset() throws IOException {
         throw new IOException("mark not supported");
     }
 
+    @Override
     public boolean markSupported() {
         return false;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/test/java/org/apache/james/imap/decode/ImapRequestStreamLineReader.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/ImapRequestStreamLineReader.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/ImapRequestStreamLineReader.java
index f7fe593..4fedc02 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/ImapRequestStreamLineReader.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/ImapRequestStreamLineReader.java
@@ -52,6 +52,7 @@ public class ImapRequestStreamLineReader extends ImapRequestLineReader {
      * @throws DecodingException
      *             If the end-of-stream is reached.
      */
+    @Override
     public char nextChar() throws DecodingException {
         if (!nextSeen) {
             int next = -1;
@@ -71,9 +72,7 @@ public class ImapRequestStreamLineReader extends ImapRequestLineReader {
         return nextChar;
     }
 
-    /**
-     * @see ImapRequestLineReader#read(int, boolean)
-     */
+    @Override
     public InputStream read(int size, boolean extraCRLF) throws DecodingException {
 
         // Unset the next char.
@@ -91,6 +90,7 @@ public class ImapRequestStreamLineReader extends ImapRequestLineReader {
      * Sends a server command continuation request '+' back to the client,
      * requesting more data to be sent.
      */
+    @Override
     protected void commandContinuationRequest() throws DecodingException {
         try {
             output.write('+');

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/test/java/org/apache/james/imap/decode/main/OutputStreamImapResponseWriter.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/OutputStreamImapResponseWriter.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/main/OutputStreamImapResponseWriter.java
index 9b6d708..4ceaad6 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/OutputStreamImapResponseWriter.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/main/OutputStreamImapResponseWriter.java
@@ -44,10 +44,7 @@ public class OutputStreamImapResponseWriter implements ImapResponseWriter {
 
 
 
-    /**
-     * @see
-     * org.apache.james.imap.encode.ImapResponseWriter#write(org.apache.james.imap.message.response.Literal)
-     */
+    @Override
     public void write(Literal literal) throws IOException {
         InputStream in = null;
         try {
@@ -65,9 +62,7 @@ public class OutputStreamImapResponseWriter implements ImapResponseWriter {
 
     }
 
-    /**
-     * @see org.apache.james.imap.encode.ImapResponseWriter#write(byte[])
-     */
+    @Override
     public void write(byte[] buffer) throws IOException {
         output.write(buffer);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/test/java/org/apache/james/imap/encode/FakeImapSession.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/FakeImapSession.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/FakeImapSession.java
index cbccd1b..bd7d053 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/encode/FakeImapSession.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/FakeImapSession.java
@@ -38,30 +38,36 @@ public class FakeImapSession implements ImapSession {
         this.attributesByKey = new ConcurrentHashMap<>();
     }
 
+    @Override
     public void logout() {
         closeMailbox();
         state = ImapSessionState.LOGOUT;
     }
 
+    @Override
     public void authenticated() {
         this.state = ImapSessionState.AUTHENTICATED;
     }
 
+    @Override
     public void deselect() {
         this.state = ImapSessionState.AUTHENTICATED;
         closeMailbox();
     }
 
+    @Override
     public void selected(SelectedMailbox mailbox) {
         this.state = ImapSessionState.SELECTED;
         closeMailbox();
         this.selectedMailbox = mailbox;
     }
 
+    @Override
     public SelectedMailbox getSelected() {
         return this.selectedMailbox;
     }
 
+    @Override
     public ImapSessionState getState() {
         return this.state;
     }
@@ -73,10 +79,12 @@ public class FakeImapSession implements ImapSession {
         }
     }
 
+    @Override
     public Object getAttribute(String key) {
         return attributesByKey.get(key);
     }
 
+    @Override
     public void setAttribute(String key, Object value) {
         if (value == null) {
             attributesByKey.remove(key);
@@ -85,41 +93,51 @@ public class FakeImapSession implements ImapSession {
         }
     }
     
+    @Override
     public boolean startTLS() {
         return false;
     }
 
+    @Override
     public boolean supportStartTLS() {
         return false;
     }
 
+    @Override
     public boolean isCompressionSupported() {
         return false;
     }
 
+    @Override
     public boolean startCompression() {
         return false;
     }
 
-    public void pushLineHandler(ImapLineHandler lineHandler) {        
+    @Override
+    public void pushLineHandler(ImapLineHandler lineHandler) {
     }
 
+    @Override
     public void popLineHandler() {
         
     }
 
+    @Override
     public boolean isPlainAuthDisallowed() {
         return false;
     }
 
+    @Override
     public boolean isTLSActive() {
         return false;
     }
 
+    @Override
     public boolean supportMultipleNamespaces() {
         return false;
     }
 
+    @Override
     public boolean isCompressionActive() {
         return false;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java
index e6ddb97..3d28708 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java
@@ -54,6 +54,7 @@ public class ByteImapResponseWriter implements ImapConstants, ImapResponseWriter
         this.out = new ByteArrayOutputStream();
     }
 
+    @Override
     public void write(Literal literal) throws IOException {
         InputStream in = null;
         try {
@@ -70,9 +71,7 @@ public class ByteImapResponseWriter implements ImapConstants, ImapResponseWriter
         }
     }
 
-    /**
-     * @see org.apache.james.imap.encode.ImapResponseWriter#write(byte[])
-     */
+    @Override
     public void write(byte[] buffer) throws IOException {
         out.write(buffer);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/test/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactoryTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactoryTest.java b/protocols/imap/src/test/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactoryTest.java
index 0625443..0efc955 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactoryTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactoryTest.java
@@ -26,6 +26,7 @@ import org.apache.james.imap.message.response.UnpooledStatusResponseFactory;
 public class UnpooledStatusResponseFactoryTest extends
         AbstractTestForStatusResponseFactory {
 
+    @Override
     protected StatusResponseFactory createInstance() {
         return new UnpooledStatusResponseFactory();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
index 76595a2..7a377a3 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
@@ -71,6 +71,7 @@ public class LSubProcessorTest {
         /**
          * @see MailboxSession.User#getLocalePreferences()
          */
+        @Override
         public List<Locale> getLocalePreferences() {
             return new ArrayList<>();
         }
@@ -78,6 +79,7 @@ public class LSubProcessorTest {
         /**
          * @see MailboxSession.User#getPassword()
          */
+        @Override
         public String getPassword() {
             return "test";
         }
@@ -85,6 +87,7 @@ public class LSubProcessorTest {
         /**
          * @see MailboxSession.User#getUserName()
          */
+        @Override
         public String getUserName() {
             return "test";
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/test/java/org/apache/james/imap/processor/StatusResponseTypeMatcher.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/StatusResponseTypeMatcher.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/StatusResponseTypeMatcher.java
index 0cdc650..d1557e4 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/StatusResponseTypeMatcher.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/StatusResponseTypeMatcher.java
@@ -43,9 +43,7 @@ public class StatusResponseTypeMatcher extends BaseMatcher<StatusResponse> {
         this.serverResponseType = responseCode;
     }
 
-    /**
-     * @see org.hamcrest.Matcher#matches(java.lang.Object)
-     */
+    @Override
     public boolean matches(Object o) {
         if (o instanceof StatusResponse) {
             StatusResponse sr = (StatusResponse) o;
@@ -54,9 +52,7 @@ public class StatusResponseTypeMatcher extends BaseMatcher<StatusResponse> {
         return false;
     }
 
-    /**
-     * @see org.hamcrest.SelfDescribing#describeTo(org.hamcrest.Description)
-     */
+    @Override
     public void describeTo(Description d) {
         d.appendText(StatusResponse.class.getName());
         d.appendText(" with serverResponseType.equals(" + serverResponseType.name() + ")");

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java
index 38e5588..eb794bd 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java
@@ -39,9 +39,7 @@ public class FakeMailboxListenerFlagsUpdate extends FlagsUpdated {
         this.flags = flags;
     }
 
-    /**
-     * @see org.apache.james.mailbox.MailboxListener.FlagsUpdated#getUpdatedFlags()
-     */
+    @Override
     public List<UpdatedFlags> getUpdatedFlags() {
         return flags;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
index 5040ed2..183d816 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
@@ -58,19 +58,23 @@ public class MailboxEventAnalyserTest {
             done = false;
         }
 
+        @Override
         public void remove() {
             throw new NotImplementedException("Not implemented");
         }
 
+        @Override
         public MessageResult next() {
             done = true;
             return messageResult;
         }
 
+        @Override
         public boolean hasNext() {
             return !done;
         }
 
+        @Override
         public MailboxException getException() {
             throw new NotImplementedException("Not implemented");
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/MailboxMessageResultUtilsTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/MailboxMessageResultUtilsTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/MailboxMessageResultUtilsTest.java
index 8959869..182cd7e 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/MailboxMessageResultUtilsTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/MailboxMessageResultUtilsTest.java
@@ -54,19 +54,23 @@ public class MailboxMessageResultUtilsTest {
             value = "Value";
         }
 
+        @Override
         public long size() {
             return 0;
         }
 
+        @Override
         public String getName() {
             return name;
         }
 
+        @Override
         public String getValue() {
             return value;
         }
 
         
+        @Override
         public InputStream getInputStream() throws IOException {
             return null;
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java
----------------------------------------------------------------------
diff --git a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java b/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java
index 2645aaf..d397699 100644
--- a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java
+++ b/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java
@@ -30,30 +30,22 @@ public abstract class LMTPConfiguration extends ProtocolConfigurationImpl implem
 
 
     
-    /**
-     * Return <code>false</code>
-     */
+    @Override
     public boolean isRelayingAllowed(String remoteIP) {
         return false;
     }
 
-    /**
-     * Return <code>false</code>
-     */
+    @Override
     public boolean isAuthRequired(String remoteIP) {
         return false;
     }
 
-    /**
-     * Return <code>false</code>
-     */
+    @Override
     public boolean useHeloEhloEnforcement() {
         return false;
     }
 
-    /**
-     * Return <code>false</code>
-     */
+    @Override
     public boolean useAddressBracketsEnforcement() {
         return false;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java b/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java
index 8bcd064..3bc5d2d 100644
--- a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java
+++ b/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java
@@ -26,10 +26,7 @@ public class LMTPConfigurationImpl extends LMTPConfiguration {
         setSoftwareName("JAMES Protocols LMTP Server");
     }
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.smtp.SMTPConfiguration#getMaxMessageSize()
-     */
+    @Override
     public long getMaxMessageSize() {
         return maxMessageSize;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPMultiResponse.java
----------------------------------------------------------------------
diff --git a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPMultiResponse.java b/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPMultiResponse.java
index f6efd59..6c3f0c0 100644
--- a/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPMultiResponse.java
+++ b/protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPMultiResponse.java
@@ -42,18 +42,12 @@ public class LMTPMultiResponse implements Response {
         
     }
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.Response#getRetCode()
-     */
+    @Override
     public String getRetCode() {
         return responses.get(0).getRetCode();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.Response#getLines()
-     */
+    @Override
     public List<CharSequence> getLines() {
         List<CharSequence> lines = new ArrayList<>();
         for (Response response: responses) {
@@ -63,10 +57,7 @@ public class LMTPMultiResponse implements Response {
     }
 
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.Response#isEndSession()
-     */
+    @Override
     public boolean isEndSession() {
         for (Response response: responses) {
             if (response.isEndSession()) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPSServerTest.java
----------------------------------------------------------------------
diff --git a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPSServerTest.java b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPSServerTest.java
index a0192dd..87e04a2 100644
--- a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPSServerTest.java
+++ b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPSServerTest.java
@@ -78,6 +78,7 @@ public abstract class AbstractLMTPSServerTest extends AbstractLMTPServerTest {
             return sendCommand("LHLO", hostname);
         }
 
+        @Override
         public int[] getReplies() throws IOException {
             int[] codes = new int[replies.size()];
             for (int i = 0; i < codes.length; i++) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java
----------------------------------------------------------------------
diff --git a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java
index 19a82b2..ee05ced 100644
--- a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java
+++ b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java
@@ -249,6 +249,7 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest {
         
     }
     
+    @Override
     protected SMTPClient createClient() {
         return new LMTPClientImpl();
     }
@@ -285,6 +286,7 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest {
             return sendCommand("LHLO", hostname);
         }
 
+        @Override
         public int[] getReplies() throws IOException {
             int[] codes = new int[replies.size()];
             for (int i = 0; i < codes.length; i++) {
@@ -320,6 +322,7 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest {
          * (non-Javadoc)
          * @see org.apache.james.protocols.lmtp.hook.DeliverToRecipientHook#deliver(org.apache.james.protocols.smtp.SMTPSession, org.apache.james.protocols.smtp.MailAddress, org.apache.james.protocols.smtp.MailEnvelope)
          */
+        @Override
         public HookResult deliver(SMTPSession session, MailAddress recipient, MailEnvelope envelope) {
             if (result == null) {
                 result = hook.onMessage(session, envelope);
@@ -346,6 +349,7 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest {
          * (non-Javadoc)
          * @see org.apache.james.protocols.lmtp.hook.DeliverToRecipientHook#deliver(org.apache.james.protocols.smtp.SMTPSession, org.apache.james.protocols.smtp.MailAddress, org.apache.james.protocols.smtp.MailEnvelope)
          */
+        @Override
         public HookResult deliver(SMTPSession session, MailAddress recipient, MailEnvelope envelope) {
             if (RCPT1.equals(recipient.toString())) {
                 return new HookResult(HookReturnCode.DENY);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/managesieve/src/main/java/org/apache/james/managesieve/jsieve/Parser.java
----------------------------------------------------------------------
diff --git a/protocols/managesieve/src/main/java/org/apache/james/managesieve/jsieve/Parser.java b/protocols/managesieve/src/main/java/org/apache/james/managesieve/jsieve/Parser.java
index c83846c..f6972d1 100644
--- a/protocols/managesieve/src/main/java/org/apache/james/managesieve/jsieve/Parser.java
+++ b/protocols/managesieve/src/main/java/org/apache/james/managesieve/jsieve/Parser.java
@@ -56,10 +56,12 @@ public class Parser implements SieveParser {
         sieveFactory = manager.build();
     }
 
+    @Override
     public List<String> getExtensions() {
         return sieveFactory.getExtensions();
     }
 
+    @Override
     public List<String> parse(String content) throws SyntaxException {
         try {
             sieveFactory.parse(new ByteArrayInputStream(content.getBytes()));

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/managesieve/src/main/java/org/apache/james/managesieve/util/SettableSession.java
----------------------------------------------------------------------
diff --git a/protocols/managesieve/src/main/java/org/apache/james/managesieve/util/SettableSession.java b/protocols/managesieve/src/main/java/org/apache/james/managesieve/util/SettableSession.java
index b6d679c..5955b35 100644
--- a/protocols/managesieve/src/main/java/org/apache/james/managesieve/util/SettableSession.java
+++ b/protocols/managesieve/src/main/java/org/apache/james/managesieve/util/SettableSession.java
@@ -35,38 +35,47 @@ public class SettableSession implements Session {
         this.sslEnabled = false;
     }
 
+    @Override
     public String getUser() {
         return user;
     }
 
+    @Override
     public boolean isAuthenticated() {
         return state == State.AUTHENTICATED;
     }
 
+    @Override
     public void setUser(String user) {
         this.user = user;
     }
 
+    @Override
     public State getState() {
         return state;
     }
 
+    @Override
     public void setState(State state) {
         this.state = state;
     }
 
+    @Override
     public Authenticate.SupportedMechanism getChoosedAuthenticationMechanism() {
         return choosedAuthenticationMechanism;
     }
 
+    @Override
     public void setChoosedAuthenticationMechanism(Authenticate.SupportedMechanism choosedAuthenticationMechanism) {
         this.choosedAuthenticationMechanism = choosedAuthenticationMechanism;
     }
 
+    @Override
     public void setSslEnabled(boolean sslEnabled) {
         this.sslEnabled = sslEnabled;
     }
 
+    @Override
     public boolean isSslEnabled() {
         return sslEnabled;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java
----------------------------------------------------------------------
diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java
index f690abd..faddde6 100644
--- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java
+++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java
@@ -86,10 +86,7 @@ public abstract class AbstractAsyncServer implements ProtocolServer {
     }
     
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolServer#bind()
-     */
+    @Override
     public synchronized void bind() throws Exception {
         if (started) {
             throw new IllegalStateException("Server running already");
@@ -130,10 +127,7 @@ public abstract class AbstractAsyncServer implements ProtocolServer {
     }
     
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolServer#unbind()
-     */
+    @Override
     public synchronized void unbind() {
         if (started == false) {
             return;
@@ -147,10 +141,7 @@ public abstract class AbstractAsyncServer implements ProtocolServer {
         started = false;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolServer#getListenAddresses()
-     */
+    @Override
     public synchronized List<InetSocketAddress> getListenAddresses() {
         ImmutableList.Builder<InetSocketAddress> builder = ImmutableList.builder();
         for (Channel channel : ImmutableList.copyOf(channels.iterator())) {
@@ -194,19 +185,13 @@ public abstract class AbstractAsyncServer implements ProtocolServer {
     }
     
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolServer#getBacklog()
-     */
+    @Override
     public int getBacklog() {
         return backlog;
     }
     
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolServer#getTimeout()
-     */
+    @Override
     public int getTimeout() {
         return timeout;
     }
@@ -231,10 +216,7 @@ public abstract class AbstractAsyncServer implements ProtocolServer {
     }
     
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolServer#isBound()
-     */
+    @Override
     public boolean isBound() {
         return started;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java
----------------------------------------------------------------------
diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java
index 4de5f3e..67377d8 100644
--- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java
+++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java
@@ -63,9 +63,7 @@ public abstract class AbstractChannelPipelineFactory implements ChannelPipelineF
     }
     
     
-    /**
-     * @see org.jboss.netty.channel.ChannelPipelineFactory#getPipeline()
-     */
+    @Override
     public ChannelPipeline getPipeline() throws Exception {
         // Create a default pipeline implementation.
         ChannelPipeline pipeline = pipeline();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyProtocolTransport.java
----------------------------------------------------------------------
diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyProtocolTransport.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyProtocolTransport.java
index a05f3aa..f3752ac 100644
--- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyProtocolTransport.java
+++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyProtocolTransport.java
@@ -53,38 +53,28 @@ public class NettyProtocolTransport extends AbstractProtocolTransport {
         this.engine = engine;
     }
 
-    /**
-     * @see org.apache.james.protocols.api.ProtocolTransport#getRemoteAddress()
-     */
+    @Override
     public InetSocketAddress getRemoteAddress() {
         return (InetSocketAddress) channel.getRemoteAddress();
     }
 
-    /**
-     * @see org.apache.james.protocols.api.ProtocolTransport#getId()
-     */
+    @Override
     public String getId() {
         return Integer.toString(channel.getId());
     }
 
-    /**
-     * @see org.apache.james.protocols.api.ProtocolTransport#isTLSStarted()
-     */
+    @Override
     public boolean isTLSStarted() {
         return channel.getPipeline().get(SslHandler.class) != null;
     }
 
-    /**
-     * @see org.apache.james.protocols.api.ProtocolTransport#isStartTLSSupported()
-     */
+    @Override
     public boolean isStartTLSSupported() {
         return engine != null;
     }
 
 
-    /**
-     * @see org.apache.james.protocols.api.ProtocolTransport#popLineHandler()
-     */
+    @Override
     public void popLineHandler() {
         if (lineHandlerCount > 0) {
             channel.getPipeline().remove("lineHandler" + lineHandlerCount);
@@ -92,9 +82,7 @@ public class NettyProtocolTransport extends AbstractProtocolTransport {
         }
     }
 
-    /**
-     * @see org.apache.james.protocols.api.ProtocolTransport#getPushedLineHandlerCount()
-     */
+    @Override
     public int getPushedLineHandlerCount() {
         return lineHandlerCount;
     }
@@ -164,30 +152,22 @@ public class NettyProtocolTransport extends AbstractProtocolTransport {
         channel.write(new ChunkedStream(in));
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolTransport#setReadable(boolean)
-     */
+    @Override
     public void setReadable(boolean readable) {
         channel.setReadable(readable);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolTransport#isReadable()
-     */
+    @Override
     public boolean isReadable() {
         return channel.isReadable();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolTransport#getLocalAddress()
-     */
+    @Override
     public InetSocketAddress getLocalAddress() {
         return (InetSocketAddress) channel.getLocalAddress();
     }
 
+    @Override
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public void pushLineHandler(LineHandler<? extends ProtocolSession> overrideCommandHandler, ProtocolSession session) {
         lineHandlerCount++;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Response.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Response.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Response.java
index ef8923a..451161d 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Response.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Response.java
@@ -83,6 +83,7 @@ public class POP3Response extends AbstractResponse {
      * 
      * @return all responseLines
      */
+    @Override
     public List<CharSequence> getLines() {
         List<CharSequence> responseList = new ArrayList<>();
         if (lines.isEmpty()) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java
index 2ac4be1..81cc68a 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java
@@ -39,16 +39,12 @@ public class POP3SessionImpl extends ProtocolSessionImpl implements POP3Session
         super(transport, configData);
     }
 
-    /**
-     * @see org.apache.james.pop3server.POP3Session#getHandlerState()
-     */
+    @Override
     public int getHandlerState() {
         return handlerState;
     }
 
-    /**
-     * @see org.apache.james.pop3server.POP3Session#setHandlerState(int)
-     */
+    @Override
     public void setHandlerState(int handlerState) {
         this.handlerState = handlerState;
     }
@@ -60,17 +56,12 @@ public class POP3SessionImpl extends ProtocolSessionImpl implements POP3Session
         setHandlerState(AUTHENTICATION_READY);
     }
 
-    /**
-     * @see org.apache.james.pop3server.POP3Session#getUserMailbox()
-     */
+    @Override
     public Mailbox getUserMailbox() {
         return mailbox;
     }
 
-    /**
-     * @see
-     * org.apache.james.pop3server.POP3Session#setUserMailbox(Mailbox)
-     */
+    @Override
     public void setUserMailbox(Mailbox mailbox) {
         this.mailbox = mailbox;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StartTlsResponse.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StartTlsResponse.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StartTlsResponse.java
index 07e227d..1c98cd0 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StartTlsResponse.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StartTlsResponse.java
@@ -47,14 +47,17 @@ public class POP3StartTlsResponse extends POP3Response implements StartTlsRespon
         // We need to override this and return a StartTlsResponse. See ROTOCOLS-89
         return new StartTlsResponse() {
             
+            @Override
             public boolean isEndSession() {
                 return POP3StartTlsResponse.this.isEndSession();
             }
             
+            @Override
             public String getRetCode() {
                 return POP3StartTlsResponse.this.getRetCode();
             }
             
+            @Override
             public List<CharSequence> getLines() {
                 return POP3StartTlsResponse.this.getLines();
             }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StreamResponse.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StreamResponse.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StreamResponse.java
index b54f9a3..28745a2 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StreamResponse.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StreamResponse.java
@@ -39,17 +39,11 @@ public class POP3StreamResponse extends POP3Response implements StreamResponse {
         this.stream = stream;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.StreamResponse#getStream()
-     */
+    @Override
     public InputStream getStream() {
         return new SequenceInputStream(stream, new ByteArrayInputStream(".\r\n".getBytes()));
     }
 
-    /**
-     * Throws {@link UnsupportedOperationException}
-     */
     @Override
     public Response immutable() {
         throw new UnsupportedOperationException("POP3StreamResponse can only be used once, so its not supported to reuse it");

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java
index 11eea14..9aff450 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java
@@ -80,10 +80,7 @@ public abstract class AbstractApopCmdHandler extends AbstractPassCmdHandler {
     }
 
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.pop3.core.AbstractPassCmdHandler#auth(org.apache.james.protocols.pop3.POP3Session, java.lang.String, java.lang.String)
-     */
+    @Override
     protected final Mailbox auth(POP3Session session, String username, String password) throws Exception {
         return auth(session, (String)session.getAttachment(POP3Session.APOP_TIMESTAMP, State.Connection), username, password);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractPassCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractPassCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractPassCmdHandler.java
index d88a444..e099700 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractPassCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractPassCmdHandler.java
@@ -44,6 +44,7 @@ public abstract class AbstractPassCmdHandler extends RsetCmdHandler {
      * Handler method called upon receipt of a PASS command. Reads in and
      * validates the password.
      */
+    @Override
     public Response onCommand(POP3Session session, Request request) {
         String parameters = request.getArgument();
         if (session.getHandlerState() == POP3Session.AUTHENTICATION_USERSET && parameters != null) {
@@ -87,9 +88,7 @@ public abstract class AbstractPassCmdHandler extends RsetCmdHandler {
         }
     }
 
-    /**
-     * @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/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java
index bd3411d..90ca459 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java
@@ -54,11 +54,7 @@ public class CapaCmdHandler implements CommandHandler<POP3Session>, ExtensibleHa
 
     }
 
-    /**
-     * @see
-     * org.apache.james.protocols.api.handler.CommandHandler
-     * #onCommand(org.apache.james.protocols.api.ProtocolSession, org.apache.james.protocols.api.Request)
-     */
+    @Override
     public Response onCommand(POP3Session session, Request request) {
         POP3Response response = new POP3Response(POP3Response.OK_RESPONSE, "Capability list follows");
 
@@ -71,9 +67,7 @@ public class CapaCmdHandler implements CommandHandler<POP3Session>, ExtensibleHa
         return response;
     }
 
-    /**
-     * @see org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
-     */
+    @Override
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public List<Class<?>> getMarkerInterfaces() {
         List<Class<?>> mList = new ArrayList();
@@ -81,10 +75,7 @@ public class CapaCmdHandler implements CommandHandler<POP3Session>, ExtensibleHa
         return mList;
     }
 
-    /**
-     * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class,
-     *      java.util.List)
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException {
         if (interfaceName.equals(CapaCapability.class)) {
@@ -92,16 +83,12 @@ public class CapaCmdHandler implements CommandHandler<POP3Session>, ExtensibleHa
         }
     }
 
-    /**
-     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
-     */
+    @Override
     public Collection<String> getImplCommands() {
         return COMMANDS;
     }
 
-    /**
-     * @see org.apache.james.pop3server.core.CapaCapability#getImplementedCapabilities(org.apache.james.pop3server.POP3Session)
-     */
+    @Override
     public Set<String> getImplementedCapabilities(POP3Session session) {
         return CAPS;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java
index 76a706c..ceff5b0 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java
@@ -57,6 +57,7 @@ public class DeleCmdHandler implements CommandHandler<POP3Session> {
      * Handler method called upon receipt of a DELE command. This command
      * deletes a particular mail message from the mailbox.
      */
+    @Override
     @SuppressWarnings("unchecked")
     public Response onCommand(POP3Session session, Request request) {
         if (session.getHandlerState() == POP3Session.TRANSACTION) {
@@ -94,9 +95,7 @@ public class DeleCmdHandler implements CommandHandler<POP3Session> {
         }
     }
 
-    /**
-     * @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/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java
index ea5f3e3..58ab6ac 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java
@@ -63,6 +63,7 @@ public class ListCmdHandler implements CommandHandler<POP3Session> {
      *            the request to process
      */
 
+    @Override
     @SuppressWarnings("unchecked")
     public Response onCommand(POP3Session session, Request request) {
         String parameters = request.getArgument();
@@ -127,9 +128,7 @@ public class ListCmdHandler implements CommandHandler<POP3Session> {
         }
     }
 
-    /**
-     * @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/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java
index 2184732..7184502 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java
@@ -52,6 +52,7 @@ public class NoopCmdHandler implements CommandHandler<POP3Session> {
      * Handler method called upon receipt of a NOOP command. Like all good
      * NOOPs, does nothing much.
      */
+    @Override
     public Response onCommand(POP3Session session, Request request) {
         if (session.getHandlerState() == POP3Session.TRANSACTION) {
             return POP3Response.OK;
@@ -60,9 +61,7 @@ public class NoopCmdHandler implements CommandHandler<POP3Session> {
         }
     }
 
-    /**
-     * @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/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java
index 4c12f60..f068aa1 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java
@@ -70,6 +70,7 @@ public class QuitCmdHandler implements CommandHandler<POP3Session> {
      * Handler method called upon receipt of a QUIT command. This method handles
      * cleanup of the POP3Handler state.
      */
+    @Override
     @SuppressWarnings("unchecked")
     public Response onCommand(POP3Session session, Request request) {
         Response response = null;
@@ -94,9 +95,7 @@ public class QuitCmdHandler implements CommandHandler<POP3Session> {
         return response;
     }
 
-    /**
-     * @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/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java
index 15c1922..53b84d7 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java
@@ -60,6 +60,7 @@ public class RetrCmdHandler implements CommandHandler<POP3Session> {
      * Handler method called upon receipt of a RETR command. This command
      * retrieves a particular mail message from the mailbox.
      */
+    @Override
     @SuppressWarnings("unchecked")
     public Response onCommand(POP3Session session, Request request) {
         POP3Response response = null;
@@ -106,9 +107,7 @@ public class RetrCmdHandler implements CommandHandler<POP3Session> {
         return response;
     }
 
-    /**
-     * @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/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java
index f99385f..999fd3f 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java
@@ -59,6 +59,7 @@ public class RsetCmdHandler implements CommandHandler<POP3Session> {
      * Handler method called upon receipt of a RSET command. Calls stat() to
      * reset the mailbox.
      */
+    @Override
     public Response onCommand(POP3Session session, Request request) {
         if (session.getHandlerState() == POP3Session.TRANSACTION) {
             stat(session);
@@ -89,9 +90,7 @@ public class RsetCmdHandler implements CommandHandler<POP3Session> {
 
     }
 
-    /**
-     * @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/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java
index 2d9d2fb..95641a0 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java
@@ -55,6 +55,7 @@ public class StatCmdHandler implements CommandHandler<POP3Session> {
      * Handler method called upon receipt of a STAT command. Returns the number
      * of messages in the mailbox and its aggregate size.
      */
+    @Override
     @SuppressWarnings("unchecked")
     public Response onCommand(POP3Session session, Request request) {
         if (session.getHandlerState() == POP3Session.TRANSACTION) {
@@ -81,9 +82,7 @@ public class StatCmdHandler implements CommandHandler<POP3Session> {
         }
     }
 
-    /**
-     * @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/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java
index 8f5a5c2..77761fe 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java
@@ -55,9 +55,7 @@ public class StlsCmdHandler implements CommandHandler<POP3Session>, CapaCapabili
 
     }
 
-    /**
-     * @see CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, Request)
-     */
+    @Override
     public Response onCommand(POP3Session session, Request request) {
         // check if starttls is supported, the state is the right one and it was
         // not started before
@@ -68,9 +66,7 @@ public class StlsCmdHandler implements CommandHandler<POP3Session>, CapaCapabili
         }
     }
 
-    /**
-     * @see org.apache.james.pop3server.core.CapaCapability#getImplementedCapabilities(org.apache.james.pop3server.POP3Session)
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public Set<String> getImplementedCapabilities(POP3Session session) {
         if (session.isStartTLSSupported() && session.getHandlerState() == POP3Session.AUTHENTICATION_READY) {
@@ -80,9 +76,7 @@ public class StlsCmdHandler implements CommandHandler<POP3Session>, CapaCapabili
         }
     }
 
-    /**
-     * @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/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
index 4d9f4b4..976f859 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
@@ -112,9 +112,7 @@ public class TopCmdHandler extends RetrCmdHandler implements CapaCapability {
 
     }
 
-    /**
-     * @see org.apache.james.pop3server.core.CapaCapability#getImplementedCapabilities(org.apache.james.pop3server.POP3Session)
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public Set<String> getImplementedCapabilities(POP3Session session) {
         if (session.getHandlerState() == POP3Session.TRANSACTION) {
@@ -124,9 +122,6 @@ public class TopCmdHandler extends RetrCmdHandler implements CapaCapability {
         }
     }
 
-    /**
-     * @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/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java
index 1314399..9800af3 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java
@@ -58,6 +58,7 @@ public class UidlCmdHandler implements CommandHandler<POP3Session>, CapaCapabili
      * Handler method called upon receipt of a UIDL command. Returns a listing
      * of message ids to the client.
      */
+    @Override
     @SuppressWarnings("unchecked")
     public Response onCommand(POP3Session session, Request request) {
         POP3Response response = null;
@@ -116,9 +117,7 @@ public class UidlCmdHandler implements CommandHandler<POP3Session>, CapaCapabili
         return response;
     }
 
-    /**
-     * @see org.apache.james.pop3server.core.CapaCapability#getImplementedCapabilities(org.apache.james.pop3server.POP3Session)
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public Set<String> getImplementedCapabilities(POP3Session session) {
         if (session.getHandlerState() == POP3Session.TRANSACTION) {
@@ -128,9 +127,7 @@ public class UidlCmdHandler implements CommandHandler<POP3Session>, CapaCapabili
         }
     }
 
-    /**
-     * @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/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java
index 39576e9..b477cad 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java
@@ -35,6 +35,7 @@ public class UnknownCmdHandler extends UnknownCommandHandler<POP3Session> {
      * Handler method called upon receipt of an unrecognized command. Returns an
      * error response and logs the command.
      */
+    @Override
     public Response onCommand(POP3Session session, Request request) {
         return POP3Response.ERR;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java
index 17183ca..854e0bd 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java
@@ -54,6 +54,7 @@ public class UserCmdHandler implements CommandHandler<POP3Session>, CapaCapabili
      * Handler method called upon receipt of a USER command. Reads in the user
      * id.
      */
+    @Override
     public Response onCommand(POP3Session session, Request request) {
         String parameters = request.getArgument();
         if (session.getHandlerState() == POP3Session.AUTHENTICATION_READY && parameters != null) {
@@ -65,16 +66,12 @@ public class UserCmdHandler implements CommandHandler<POP3Session>, CapaCapabili
         }
     }
 
-    /**
-     * @see org.apache.james.pop3server.core.CapaCapability#getImplementedCapabilities(org.apache.james.pop3server.POP3Session)
-     */
+    @Override
     public Set<String> getImplementedCapabilities(POP3Session session) {
         return CAPS;
     }
 
-    /**
-     * @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/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java
index ac0d0c4..91eb396 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java
@@ -39,10 +39,7 @@ public class WelcomeMessageHandler implements ConnectHandler<POP3Session> {
 
     }
 
-    /**
-     * @see org.apache.james.protocols.api.handler.ConnectHandler
-     * #onConnect(org.apache.james.pop3server.POP3Session)
-     */
+    @Override
     public Response onConnect(POP3Session session) {
         StringBuilder responseBuffer = new StringBuilder();
         

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/AbstractMailbox.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/AbstractMailbox.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/AbstractMailbox.java
index f4d0f75..5e5b6ee 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/AbstractMailbox.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/AbstractMailbox.java
@@ -31,11 +31,7 @@ import org.apache.james.protocols.api.CombinedInputStream;
  */
 public abstract class AbstractMailbox implements Mailbox {
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.protocols.pop3.mailbox.Mailbox#getMessage(String)
-     */
+    @Override
     public InputStream getMessage(String uid) throws IOException {
         return new CombinedInputStream(getMessageHeaders(uid), getMessageBody(uid));
     }
@@ -43,6 +39,7 @@ public abstract class AbstractMailbox implements Mailbox {
     /**
      * Does nothing
      */
+    @Override
     public void close() throws IOException {
         // do nothing
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java
index ec41080..05af522 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java
@@ -40,6 +40,7 @@ public abstract class ImapMailbox implements Mailbox {
      */
     public abstract InputStream getMessageBody(long uid) throws IOException;
 
+    @Override
     public InputStream getMessageBody(String uid) throws NumberFormatException, IOException {
         return this.getMessageBody(Long.parseLong(uid));
     }
@@ -54,6 +55,7 @@ public abstract class ImapMailbox implements Mailbox {
      */
     public abstract InputStream getMessageHeaders(long uid) throws IOException;
 
+    @Override
     public InputStream getMessageHeaders(String uid) throws NumberFormatException, IOException {
         return this.getMessageHeaders(Long.parseLong(uid));
     }
@@ -69,6 +71,7 @@ public abstract class ImapMailbox implements Mailbox {
      */
     public abstract InputStream getMessage(long uid) throws IOException;
 
+    @Override
     public InputStream getMessage(String uid) throws NumberFormatException, IOException {
         return this.getMessage(Long.parseLong(uid));
     }
@@ -80,6 +83,7 @@ public abstract class ImapMailbox implements Mailbox {
      */
     public abstract void remove(long... uids) throws IOException;
 
+    @Override
     public void remove(String... uids) throws NumberFormatException, IOException {
         long[] imapUids = Arrays.stream(uids)
             .mapToLong(Long::parseLong)


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


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

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedState.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedState.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedState.java
index 43fc412..9069f92 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedState.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedState.java
@@ -31,6 +31,7 @@ public class HBaseSelectedState extends SelectedState {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearch.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearch.java
index b3e7df7..1ec9734 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearch.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearch.java
@@ -31,6 +31,7 @@ public class HBaseUidSearch extends UidSearch {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearchOnIndex.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearchOnIndex.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearchOnIndex.java
index 5316d7c..cbb2b8e 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearchOnIndex.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearchOnIndex.java
@@ -31,6 +31,7 @@ public class HBaseUidSearchOnIndex extends UidSearchOnIndex {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUserFlagsSupport.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUserFlagsSupport.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUserFlagsSupport.java
index 6dde034..bdd8e07 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUserFlagsSupport.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUserFlagsSupport.java
@@ -31,6 +31,7 @@ public class HBaseUserFlagsSupport extends UserFlagsSupport {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryAuthenticatePlain.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryAuthenticatePlain.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryAuthenticatePlain.java
index e05cbd5..9b57f1f 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryAuthenticatePlain.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryAuthenticatePlain.java
@@ -29,6 +29,7 @@ public class InMemoryAuthenticatePlain extends AuthenticatePlain {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryAuthenticatedState.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryAuthenticatedState.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryAuthenticatedState.java
index c25efd8..e2b2f56 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryAuthenticatedState.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryAuthenticatedState.java
@@ -29,6 +29,7 @@ public class InMemoryAuthenticatedState extends AuthenticatedState {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryConcurrentSessions.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryConcurrentSessions.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryConcurrentSessions.java
index 5d8ac0f..45b30d3 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryConcurrentSessions.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryConcurrentSessions.java
@@ -29,6 +29,7 @@ public class InMemoryConcurrentSessions extends ConcurrentSessions {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryCondstore.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryCondstore.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryCondstore.java
index f86e1d2..a352ea9 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryCondstore.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryCondstore.java
@@ -29,6 +29,7 @@ public class InMemoryCondstore extends Condstore {
 
     private JamesImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryCopy.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryCopy.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryCopy.java
index bd88aab..8152c7b 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryCopy.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryCopy.java
@@ -29,6 +29,7 @@ public class InMemoryCopy extends Copy {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryEvents.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryEvents.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryEvents.java
index ab9cfa6..ec4e597 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryEvents.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryEvents.java
@@ -29,6 +29,7 @@ public class InMemoryEvents extends Events {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryExpunge.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryExpunge.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryExpunge.java
index 7498a11..dadac81 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryExpunge.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryExpunge.java
@@ -29,6 +29,7 @@ public class InMemoryExpunge extends Expunge {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetch.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetch.java
index 6a01ca1..54c26be 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetch.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetch.java
@@ -29,6 +29,7 @@ public class InMemoryFetch extends Fetch {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchBodySection.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchBodySection.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchBodySection.java
index 293de39..13f0d1d 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchBodySection.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchBodySection.java
@@ -29,6 +29,7 @@ public class InMemoryFetchBodySection extends FetchBodySection {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchBodyStructure.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchBodyStructure.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchBodyStructure.java
index 11b89ab..150a73b 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchBodyStructure.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchBodyStructure.java
@@ -29,6 +29,7 @@ public class InMemoryFetchBodyStructure extends FetchBodyStructure {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchHeaders.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchHeaders.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchHeaders.java
index 4cd581a..4f7fb88 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchHeaders.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryFetchHeaders.java
@@ -29,6 +29,7 @@ public class InMemoryFetchHeaders extends FetchHeaders {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryListing.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryListing.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryListing.java
index 12b10c0..7b4994c 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryListing.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryListing.java
@@ -29,6 +29,7 @@ public class InMemoryListing extends Listing {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryListingWithSharingTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryListingWithSharingTest.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryListingWithSharingTest.java
index e816a45..f42f53c 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryListingWithSharingTest.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryListingWithSharingTest.java
@@ -29,6 +29,7 @@ public class InMemoryListingWithSharingTest extends ListingWithSharingTest {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxAnnotation.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxAnnotation.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxAnnotation.java
index e19cca1..e6ed7ac 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxAnnotation.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxAnnotation.java
@@ -29,6 +29,7 @@ public class InMemoryMailboxAnnotation extends MailboxAnnotation {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxWithLongNameSuccess.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxWithLongNameSuccess.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxWithLongNameSuccess.java
index 79b1e11..2efe46b 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxWithLongNameSuccess.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxWithLongNameSuccess.java
@@ -29,6 +29,7 @@ public class InMemoryMailboxWithLongNameSuccess extends MailboxWithLongNameSucce
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMove.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMove.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMove.java
index 369fc57..6c9e40f 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMove.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMove.java
@@ -29,6 +29,7 @@ public class InMemoryMove extends Move {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryNonAuthenticatedState.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryNonAuthenticatedState.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryNonAuthenticatedState.java
index c2dbf3f..5dd5913 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryNonAuthenticatedState.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryNonAuthenticatedState.java
@@ -29,6 +29,7 @@ public class InMemoryNonAuthenticatedState extends NonAuthenticatedState {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryPartialFetch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryPartialFetch.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryPartialFetch.java
index ab8fb46..15ffcaf 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryPartialFetch.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryPartialFetch.java
@@ -29,6 +29,7 @@ public class InMemoryPartialFetch extends PartialFetch {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryQuotaTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryQuotaTest.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryQuotaTest.java
index 9bcb076..f085ca7 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryQuotaTest.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryQuotaTest.java
@@ -29,6 +29,7 @@ public class InMemoryQuotaTest extends QuotaTest {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();
@@ -41,6 +42,7 @@ public class InMemoryQuotaTest extends QuotaTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryRename.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryRename.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryRename.java
index f11d84b..8801059 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryRename.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryRename.java
@@ -29,6 +29,7 @@ public class InMemoryRename extends Rename {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySearch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySearch.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySearch.java
index bb3bd73..1544f65 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySearch.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySearch.java
@@ -29,6 +29,7 @@ public class InMemorySearch extends Search {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySecurity.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySecurity.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySecurity.java
index aba915e..897f632 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySecurity.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySecurity.java
@@ -29,6 +29,7 @@ public class InMemorySecurity extends Security {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySelect.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySelect.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySelect.java
index c24d1b8..808c780 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySelect.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySelect.java
@@ -29,6 +29,7 @@ public class InMemorySelect extends Select {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySelectedInbox.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySelectedInbox.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySelectedInbox.java
index f010bee..c10eb97 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySelectedInbox.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySelectedInbox.java
@@ -29,6 +29,7 @@ public class InMemorySelectedInbox extends SelectedInbox {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySelectedState.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySelectedState.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySelectedState.java
index a4decb8..83d8387 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySelectedState.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemorySelectedState.java
@@ -29,6 +29,7 @@ public class InMemorySelectedState extends SelectedState {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryUidSearch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryUidSearch.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryUidSearch.java
index 4345668..7d2f92f 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryUidSearch.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryUidSearch.java
@@ -29,6 +29,7 @@ public class InMemoryUidSearch extends UidSearch {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryUidSearchOnIndex.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryUidSearchOnIndex.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryUidSearchOnIndex.java
index f8da995..00ce77a 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryUidSearchOnIndex.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryUidSearchOnIndex.java
@@ -29,6 +29,7 @@ public class InMemoryUidSearchOnIndex extends UidSearchOnIndex {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryUserFlagsSupport.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryUserFlagsSupport.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryUserFlagsSupport.java
index e0fdbaf..524fb01 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryUserFlagsSupport.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryUserFlagsSupport.java
@@ -29,6 +29,7 @@ public class InMemoryUserFlagsSupport extends UserFlagsSupport {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new InMemoryHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaAuthenticatePlain.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaAuthenticatePlain.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaAuthenticatePlain.java
index d6cd69b..87d5c4f 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaAuthenticatePlain.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaAuthenticatePlain.java
@@ -29,6 +29,7 @@ public class JpaAuthenticatePlain extends AuthenticatePlain {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaAuthenticatedState.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaAuthenticatedState.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaAuthenticatedState.java
index ce1ecf9..0e3198d 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaAuthenticatedState.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaAuthenticatedState.java
@@ -29,6 +29,7 @@ public class JpaAuthenticatedState extends AuthenticatedState {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaConcurrentSessions.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaConcurrentSessions.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaConcurrentSessions.java
index 85f502b..cbc4b29 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaConcurrentSessions.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaConcurrentSessions.java
@@ -29,6 +29,7 @@ public class JpaConcurrentSessions extends ConcurrentSessions {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaCondstore.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaCondstore.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaCondstore.java
index 594a801..863b608 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaCondstore.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaCondstore.java
@@ -29,6 +29,7 @@ public class JpaCondstore extends Condstore {
 
     private JamesImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaCopy.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaCopy.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaCopy.java
index eaac933..e4b0df5 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaCopy.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaCopy.java
@@ -29,6 +29,7 @@ public class JpaCopy extends Copy {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaEvents.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaEvents.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaEvents.java
index 1c1d92d..64d96cb 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaEvents.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaEvents.java
@@ -29,6 +29,7 @@ public class JpaEvents extends Events {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaExpunge.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaExpunge.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaExpunge.java
index d412103..e8fafda 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaExpunge.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaExpunge.java
@@ -29,6 +29,7 @@ public class JpaExpunge extends Expunge {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaFetch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaFetch.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaFetch.java
index 96d9235..c7a8ea6 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaFetch.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaFetch.java
@@ -29,6 +29,7 @@ public class JpaFetch extends Fetch {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaFetchBodySection.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaFetchBodySection.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaFetchBodySection.java
index 0573a74..2825129 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaFetchBodySection.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaFetchBodySection.java
@@ -29,6 +29,7 @@ public class JpaFetchBodySection extends FetchBodySection {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaFetchBodyStructure.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaFetchBodyStructure.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaFetchBodyStructure.java
index f1b0e30..2c99ed6 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaFetchBodyStructure.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaFetchBodyStructure.java
@@ -29,6 +29,7 @@ public class JpaFetchBodyStructure extends FetchBodyStructure {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaFetchHeaders.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaFetchHeaders.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaFetchHeaders.java
index 74e0673..ea34b1b 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaFetchHeaders.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaFetchHeaders.java
@@ -29,6 +29,7 @@ public class JpaFetchHeaders extends FetchHeaders {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaListing.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaListing.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaListing.java
index 2f3bf30..715be86 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaListing.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaListing.java
@@ -29,6 +29,7 @@ public class JpaListing extends Listing {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxAnnotation.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxAnnotation.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxAnnotation.java
index 14cea52..c843bc9 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxAnnotation.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxAnnotation.java
@@ -29,6 +29,7 @@ public class JpaMailboxAnnotation extends MailboxAnnotation {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxWithLongNameError.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxWithLongNameError.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxWithLongNameError.java
index b457193..eeab115 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxWithLongNameError.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxWithLongNameError.java
@@ -31,6 +31,7 @@ public class JpaMailboxWithLongNameError extends MailboxWithLongNameError {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMove.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMove.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMove.java
index fef6ad7..f5ba4ca 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMove.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMove.java
@@ -29,6 +29,7 @@ public class JpaMove extends Move {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaNonAuthenticatedState.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaNonAuthenticatedState.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaNonAuthenticatedState.java
index 49d613e..c6fb0d7 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaNonAuthenticatedState.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaNonAuthenticatedState.java
@@ -29,6 +29,7 @@ public class JpaNonAuthenticatedState extends NonAuthenticatedState {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaPartialFetch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaPartialFetch.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaPartialFetch.java
index 0166c04..50cb082 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaPartialFetch.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaPartialFetch.java
@@ -29,6 +29,7 @@ public class JpaPartialFetch extends PartialFetch {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaQuotaTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaQuotaTest.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaQuotaTest.java
index 217baa9..280a570 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaQuotaTest.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaQuotaTest.java
@@ -29,6 +29,7 @@ public class JpaQuotaTest extends QuotaTest {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();
@@ -41,6 +42,7 @@ public class JpaQuotaTest extends QuotaTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaRename.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaRename.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaRename.java
index bb39b3a..6d0014b 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaRename.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaRename.java
@@ -29,6 +29,7 @@ public class JpaRename extends Rename {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSearch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSearch.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSearch.java
index 7fa3fdc..b784b08 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSearch.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSearch.java
@@ -29,6 +29,7 @@ public class JpaSearch extends Search {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSecurity.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSecurity.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSecurity.java
index 0216bf8..4f7f653 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSecurity.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSecurity.java
@@ -29,6 +29,7 @@ public class JpaSecurity extends Security {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSelect.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSelect.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSelect.java
index 5cdb7a1..12af8b6 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSelect.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSelect.java
@@ -29,6 +29,7 @@ public class JpaSelect extends Select {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSelectedInbox.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSelectedInbox.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSelectedInbox.java
index 7cbc9c1..8f05134 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSelectedInbox.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSelectedInbox.java
@@ -29,6 +29,7 @@ public class JpaSelectedInbox extends SelectedInbox {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSelectedState.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSelectedState.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSelectedState.java
index 0875ba5..952221d 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSelectedState.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaSelectedState.java
@@ -29,6 +29,7 @@ public class JpaSelectedState extends SelectedState {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaUidSearch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaUidSearch.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaUidSearch.java
index 5625068..e9f4dc0 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaUidSearch.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaUidSearch.java
@@ -29,6 +29,7 @@ public class JpaUidSearch extends UidSearch {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaUidSearchOnIndex.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaUidSearchOnIndex.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaUidSearchOnIndex.java
index 7a8823d..bc48def 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaUidSearchOnIndex.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaUidSearchOnIndex.java
@@ -29,6 +29,7 @@ public class JpaUidSearchOnIndex extends UidSearchOnIndex {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaUserFlagsSupport.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaUserFlagsSupport.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaUserFlagsSupport.java
index 75ec5d4..98bcdb6 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaUserFlagsSupport.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaUserFlagsSupport.java
@@ -29,6 +29,7 @@ public class JpaUserFlagsSupport extends UserFlagsSupport {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = JPAHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneAuthenticatePlain.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneAuthenticatePlain.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneAuthenticatePlain.java
index 9140ec7..9bdbcc4 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneAuthenticatePlain.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneAuthenticatePlain.java
@@ -29,6 +29,7 @@ public class LuceneAuthenticatePlain extends AuthenticatePlain {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneAuthenticatedState.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneAuthenticatedState.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneAuthenticatedState.java
index 687d493..c87df60 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneAuthenticatedState.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneAuthenticatedState.java
@@ -29,6 +29,7 @@ public class LuceneAuthenticatedState extends AuthenticatedState {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneConcurrentSessions.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneConcurrentSessions.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneConcurrentSessions.java
index ef106d6..ad5aac9 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneConcurrentSessions.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneConcurrentSessions.java
@@ -29,6 +29,7 @@ public class LuceneConcurrentSessions extends ConcurrentSessions {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneCondstore.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneCondstore.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneCondstore.java
index 783a19d..347abde 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneCondstore.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneCondstore.java
@@ -29,6 +29,7 @@ public class LuceneCondstore extends Condstore {
 
     private JamesImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneCopy.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneCopy.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneCopy.java
index c1afef3..8d163dc 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneCopy.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneCopy.java
@@ -29,6 +29,7 @@ public class LuceneCopy extends Copy {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneEvents.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneEvents.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneEvents.java
index 9f33405..84a7824 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneEvents.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneEvents.java
@@ -29,6 +29,7 @@ public class LuceneEvents extends Events {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneExpunge.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneExpunge.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneExpunge.java
index 602e89a..237b1a1 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneExpunge.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneExpunge.java
@@ -29,6 +29,7 @@ public class LuceneExpunge extends Expunge {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneFetch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneFetch.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneFetch.java
index d59ca48..46e2db0 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneFetch.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneFetch.java
@@ -29,6 +29,7 @@ public class LuceneFetch extends Fetch {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneFetchBodySection.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneFetchBodySection.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneFetchBodySection.java
index 8ab91ab..0b76ae6 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneFetchBodySection.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneFetchBodySection.java
@@ -29,6 +29,7 @@ public class LuceneFetchBodySection extends FetchBodySection {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneFetchBodyStructure.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneFetchBodyStructure.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneFetchBodyStructure.java
index 3c4dea9..4539180 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneFetchBodyStructure.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneFetchBodyStructure.java
@@ -29,6 +29,7 @@ public class LuceneFetchBodyStructure extends FetchBodyStructure {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneFetchHeaders.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneFetchHeaders.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneFetchHeaders.java
index 73f647c..6b8bf14 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneFetchHeaders.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneFetchHeaders.java
@@ -29,6 +29,7 @@ public class LuceneFetchHeaders extends FetchHeaders {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneListing.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneListing.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneListing.java
index eaa265b..a1190df 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneListing.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneListing.java
@@ -29,6 +29,7 @@ public class LuceneListing extends Listing {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneMailboxAnnotation.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneMailboxAnnotation.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneMailboxAnnotation.java
index acf98ff..884ba1d 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneMailboxAnnotation.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneMailboxAnnotation.java
@@ -29,6 +29,7 @@ public class LuceneMailboxAnnotation extends MailboxAnnotation {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneMailboxWithLongNameError.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneMailboxWithLongNameError.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneMailboxWithLongNameError.java
index d4bab5d..6fbc116 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneMailboxWithLongNameError.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneMailboxWithLongNameError.java
@@ -31,6 +31,7 @@ public class LuceneMailboxWithLongNameError extends MailboxWithLongNameError {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneMove.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneMove.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneMove.java
index 0ee9ed6..04eb92f 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneMove.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneMove.java
@@ -29,6 +29,7 @@ public class LuceneMove extends Move {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneNonAuthenticatedState.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneNonAuthenticatedState.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneNonAuthenticatedState.java
index 8844b43..6a20a00 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneNonAuthenticatedState.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneNonAuthenticatedState.java
@@ -29,6 +29,7 @@ public class LuceneNonAuthenticatedState extends NonAuthenticatedState {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LucenePartialFetch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LucenePartialFetch.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LucenePartialFetch.java
index fc1fc52..703763e 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LucenePartialFetch.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LucenePartialFetch.java
@@ -29,6 +29,7 @@ public class LucenePartialFetch extends PartialFetch {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneQuotaTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneQuotaTest.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneQuotaTest.java
index 7539692..128c86d 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneQuotaTest.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneQuotaTest.java
@@ -29,6 +29,7 @@ public class LuceneQuotaTest extends QuotaTest {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();
@@ -41,6 +42,7 @@ public class LuceneQuotaTest extends QuotaTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneRename.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneRename.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneRename.java
index fd99bfb..c322d2d 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneRename.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneRename.java
@@ -29,6 +29,7 @@ public class LuceneRename extends Rename {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSearch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSearch.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSearch.java
index 5ba61db..ff9cbad 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSearch.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSearch.java
@@ -29,6 +29,7 @@ public class LuceneSearch extends Search {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSecurity.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSecurity.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSecurity.java
index a12c78d..c532376 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSecurity.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSecurity.java
@@ -29,6 +29,7 @@ public class LuceneSecurity extends Security {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSelect.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSelect.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSelect.java
index 695474c..b669931 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSelect.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSelect.java
@@ -29,6 +29,7 @@ public class LuceneSelect extends Select {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSelectedInbox.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSelectedInbox.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSelectedInbox.java
index 79d6746..81f0d4a 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSelectedInbox.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSelectedInbox.java
@@ -29,6 +29,7 @@ public class LuceneSelectedInbox extends SelectedInbox {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSelectedState.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSelectedState.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSelectedState.java
index 7e73c91..26cafd5 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSelectedState.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneSelectedState.java
@@ -29,6 +29,7 @@ public class LuceneSelectedState extends SelectedState {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneUidSearch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneUidSearch.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneUidSearch.java
index e18ab9c..8c6c53a 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneUidSearch.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneUidSearch.java
@@ -29,6 +29,7 @@ public class LuceneUidSearch extends UidSearch {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneUidSearchOnIndex.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneUidSearchOnIndex.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneUidSearchOnIndex.java
index d2d1d3c..40687a1 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneUidSearchOnIndex.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneUidSearchOnIndex.java
@@ -29,6 +29,7 @@ public class LuceneUidSearchOnIndex extends UidSearchOnIndex {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneUserFlagsSupport.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneUserFlagsSupport.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneUserFlagsSupport.java
index ad9470c..c42e1d6 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneUserFlagsSupport.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/LuceneUserFlagsSupport.java
@@ -29,6 +29,7 @@ public class LuceneUserFlagsSupport extends UserFlagsSupport {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new LuceneSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirAuthenticatePlain.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirAuthenticatePlain.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirAuthenticatePlain.java
index 836be6e..e708c14 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirAuthenticatePlain.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirAuthenticatePlain.java
@@ -29,6 +29,7 @@ public class MaildirAuthenticatePlain extends AuthenticatePlain {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirAuthenticatedState.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirAuthenticatedState.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirAuthenticatedState.java
index 8ddc18a..d76a8a0 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirAuthenticatedState.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirAuthenticatedState.java
@@ -29,6 +29,7 @@ public class MaildirAuthenticatedState extends AuthenticatedState {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirConcurrentSessions.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirConcurrentSessions.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirConcurrentSessions.java
index b4d7c16..84a1962 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirConcurrentSessions.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirConcurrentSessions.java
@@ -29,6 +29,7 @@ public class MaildirConcurrentSessions extends ConcurrentSessions {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirCondstore.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirCondstore.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirCondstore.java
index 46e06c9..26c8b2c 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirCondstore.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirCondstore.java
@@ -29,6 +29,7 @@ public class MaildirCondstore extends Condstore {
 
     private JamesImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirCopy.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirCopy.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirCopy.java
index f6e140c..26085b5 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirCopy.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirCopy.java
@@ -29,6 +29,7 @@ public class MaildirCopy extends Copy {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();


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


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

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/MockMailbox.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/MockMailbox.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/MockMailbox.java
index 2aa8add..bc6a846 100644
--- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/MockMailbox.java
+++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/MockMailbox.java
@@ -50,6 +50,7 @@ public class MockMailbox extends ImapMailbox {
         this(identifier, new Message[0]);
     }
 
+    @Override
     public InputStream getMessageBody(long uid) throws IOException {
         Message m = messages.get(uid);
         if (m == null) {
@@ -58,6 +59,7 @@ public class MockMailbox extends ImapMailbox {
         return new ByteArrayInputStream(m.body.getBytes("US-ASCII"));
     }
 
+    @Override
     public InputStream getMessageHeaders(long uid) throws IOException {
         Message m = messages.get(uid);
         if (m == null) {
@@ -66,6 +68,7 @@ public class MockMailbox extends ImapMailbox {
         return new ByteArrayInputStream((m.headers + "\r\n").getBytes("US-ASCII"));
     }
 
+    @Override
     public InputStream getMessage(long uid) throws IOException {
         InputStream body = getMessageBody(uid);
         InputStream headers = getMessageHeaders(uid);
@@ -75,6 +78,7 @@ public class MockMailbox extends ImapMailbox {
         return new SequenceInputStream(headers, body);
     }
 
+    @Override
     public List<MessageMetaData> getMessages() throws IOException {
         return messages.values()
             .stream()
@@ -82,16 +86,19 @@ public class MockMailbox extends ImapMailbox {
             .collect(Guavate.toImmutableList());
     }
 
+    @Override
     public void remove(long... uids) throws IOException {
         for (long uid: uids) {
             messages.remove(uid);
         }
     }
 
+    @Override
     public String getIdentifier() throws IOException {
         return identifier;
     }
 
+    @Override
     public void close() throws IOException {
         // nothing
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/TestPassCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/TestPassCmdHandler.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/TestPassCmdHandler.java
index f272aa6..b3cf2b7 100644
--- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/TestPassCmdHandler.java
+++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/TestPassCmdHandler.java
@@ -32,6 +32,7 @@ public class TestPassCmdHandler extends AbstractPassCmdHandler {
         mailboxes.put(username, mailbox);
     }
     
+    @Override
     protected Mailbox auth(POP3Session session, String username, String password) throws Exception {
         return mailboxes.get(username);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java
index 02e0cc6..59dbe97 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java
@@ -41,9 +41,7 @@ public class MailEnvelopeImpl implements MailEnvelope {
 
     private ByteArrayOutputStream outputStream;
 
-    /**
-     * @see org.apache.james.protocols.smtp.MailEnvelope#getSize()
-     */
+    @Override
     public long getSize() {
         if (outputStream == null) {
             return -1;
@@ -51,16 +49,12 @@ public class MailEnvelopeImpl implements MailEnvelope {
         return outputStream.size();
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.MailEnvelope#getRecipients()
-     */
+    @Override
     public List<MailAddress> getRecipients() {
         return recipients;
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.MailEnvelope#getSender()
-     */
+    @Override
     public MailAddress getSender() {
         return sender;
     }
@@ -83,9 +77,7 @@ public class MailEnvelopeImpl implements MailEnvelope {
         this.sender = sender;
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.MailEnvelope#getMessageOutputStream()
-     */
+    @Override
     public OutputStream getMessageOutputStream() {
         if (outputStream == null) {
             // use 100kb as default which should be enough for most emails
@@ -94,9 +86,7 @@ public class MailEnvelopeImpl implements MailEnvelope {
         return outputStream;
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.MailEnvelope#getMessageInputStream()
-     */
+    @Override
     public InputStream getMessageInputStream() {
         return new ByteArrayInputStream(outputStream.toByteArray());
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java
index 70a7656..1e278a6 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java
@@ -39,10 +39,7 @@ public class SMTPConfigurationImpl extends ProtocolConfigurationImpl implements
         setSoftwareName("JAMES SMTP Protocols Server");
     }
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.smtp.SMTPConfiguration#getMaxMessageSize()
-     */
+    @Override
     public long getMaxMessageSize() {
         return maxMessageSize;
     }
@@ -50,6 +47,7 @@ public class SMTPConfigurationImpl extends ProtocolConfigurationImpl implements
     /**
      * Return <code>false</code>
      */
+    @Override
     public boolean isRelayingAllowed(String remoteIP) {
         return false;
     }
@@ -57,6 +55,7 @@ public class SMTPConfigurationImpl extends ProtocolConfigurationImpl implements
     /**
      * Return <code>false</code>
      */
+    @Override
     public boolean isAuthRequired(String remoteIP) {
         return false;
     }
@@ -66,19 +65,13 @@ public class SMTPConfigurationImpl extends ProtocolConfigurationImpl implements
     }
     
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.smtp.SMTPConfiguration#useHeloEhloEnforcement()
-     */
+    @Override
     public boolean useHeloEhloEnforcement() {
         return enforceHeloEhlo;
     }
     
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.smtp.SMTPConfiguration#useAddressBracketsEnforcement()
-     */
+    @Override
     public boolean useAddressBracketsEnforcement() {
         return bracketsEnforcement;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java
index 2571665..6c869c2 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java
@@ -132,6 +132,7 @@ public class SMTPProtocolHandlerChain extends ProtocolHandlerChainImpl {
         return true;
     }
     
+    @Override
     public boolean add(ProtocolHandler handler) {
         checkForAuth(handler);
         return super.add(handler);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java
index 50928d5..a9b3f08 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java
@@ -81,9 +81,7 @@ public class SMTPResponse extends AbstractResponse {
         }
     }
 
-    /**
-     * @see org.apache.james.protocols.api.Response#getLines()
-     */
+    @Override
     public List<CharSequence> getLines() {
         List<CharSequence> responseList = new ArrayList<>();
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java
index 932acb2..21bda43 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java
@@ -42,6 +42,7 @@ public interface SMTPSession extends ProtocolSession {
      *
      * @return the configuration
      */
+    @Override
     SMTPConfiguration getConfiguration();
     
     

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
index 570075b..91cde64 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
@@ -57,9 +57,7 @@ public class SMTPSessionImpl extends ProtocolSessionImpl implements SMTPSession
         needsCommandInjectionDetection = false;
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.SMTPSession#isRelayingAllowed()
-     */
+    @Override
     public boolean isRelayingAllowed() {
         return relayingAllowed;
     }
@@ -77,10 +75,7 @@ public class SMTPSessionImpl extends ProtocolSessionImpl implements SMTPSession
         }
     }
 
-    /**
-    /**
-     * @see org.apache.james.protocols.smtp.SMTPSession#getRcptCount()
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public int getRcptCount() {
         int count = 0;
@@ -93,16 +88,12 @@ public class SMTPSessionImpl extends ProtocolSessionImpl implements SMTPSession
         return count;
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.SMTPSession#isAuthSupported()
-     */
+    @Override
     public boolean isAuthSupported() {
         return getConfiguration().isAuthRequired(getRemoteAddress().getAddress().getHostAddress());
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.SMTPSession#setRelayingAllowed(boolean)
-     */
+    @Override
     public void setRelayingAllowed(boolean relayingAllowed) {
         this.relayingAllowed = relayingAllowed;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPStartTlsResponse.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPStartTlsResponse.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPStartTlsResponse.java
index 922883d..5c0da2a 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPStartTlsResponse.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPStartTlsResponse.java
@@ -48,14 +48,17 @@ public class SMTPStartTlsResponse extends SMTPResponse implements StartTlsRespon
         // We need to override this and return a StartTlsResponse. See ROTOCOLS-89
         return new StartTlsResponse() {
             
+            @Override
             public boolean isEndSession() {
                 return SMTPStartTlsResponse.this.isEndSession();
             }
             
+            @Override
             public String getRetCode() {
                 return SMTPStartTlsResponse.this.getRetCode();
             }
             
+            @Override
             public List<CharSequence> getLines() {
                 return SMTPStartTlsResponse.this.getLines();
             }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAuthRequiredToRelayRcptHook.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAuthRequiredToRelayRcptHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAuthRequiredToRelayRcptHook.java
index 57dde32..b0e1165 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAuthRequiredToRelayRcptHook.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAuthRequiredToRelayRcptHook.java
@@ -45,12 +45,9 @@ public abstract class AbstractAuthRequiredToRelayRcptHook implements RcptHook {
                     DSNStatus.SECURITY_AUTH)
                     + " Requested action not taken: relaying denied");
     
-    /**
-     * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession,
-     *      org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
-     */
+    @Override
     public HookResult doRcpt(SMTPSession session, MailAddress sender,
-            MailAddress rcpt) {
+                             MailAddress rcpt) {
         if (!session.isRelayingAllowed()) {
             String toDomain = rcpt.getDomain();
             if (isLocalDomain(toDomain) == false) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
index 4a6cfc5..9e6d96c 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
@@ -61,12 +61,7 @@ public abstract class AbstractHookableCmdHandler<HookT extends org.apache.james.
         this.metricFactory = metricFactory;
     }
 
-    /**
-     * Handle command processing
-     * 
-     * @see org.apache.james.protocols.api.handler.CommandHandler
-     * #onCommand(org.apache.james.protocols.api.ProtocolSession, Request)
-     */
+    @Override
     public Response onCommand(SMTPSession session, Request request) {
         TimeMetric timeMetric = metricFactory.timer("SMTP-" + request.getCommand().toLowerCase(Locale.US));
         String command = request.getCommand();
@@ -138,6 +133,7 @@ public abstract class AbstractHookableCmdHandler<HookT extends org.apache.james.
                              * (non-Javadoc)
                              * @see org.apache.james.protocols.api.Response#isEndSession()
                              */
+                            @Override
                             public boolean isEndSession() {
                                 return true;
                             }
@@ -146,6 +142,7 @@ public abstract class AbstractHookableCmdHandler<HookT extends org.apache.james.
                              * (non-Javadoc)
                              * @see org.apache.james.protocols.api.Response#getRetCode()
                              */
+                            @Override
                             public String getRetCode() {
                                 return response.getRetCode();
                             }
@@ -154,6 +151,7 @@ public abstract class AbstractHookableCmdHandler<HookT extends org.apache.james.
                              * (non-Javadoc)
                              * @see org.apache.james.protocols.api.Response#getLines()
                              */
+                            @Override
                             public List<CharSequence> getLines() {
                                 return response.getLines();
                             }
@@ -277,9 +275,7 @@ public abstract class AbstractHookableCmdHandler<HookT extends org.apache.james.
             String command, String parameters);
     
 
-    /**
-     * @see org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
-     */
+    @Override
     public List<Class<?>> getMarkerInterfaces() {
         List<Class<?>> classes = new ArrayList<>(2);
         classes.add(getHookInterface());
@@ -294,10 +290,7 @@ public abstract class AbstractHookableCmdHandler<HookT extends org.apache.james.
      */
     protected abstract Class<HookT> getHookInterface();
 
-    /**
-     * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class,
-     *      java.util.List)
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public void wireExtensions(Class<?> interfaceName, List<?> extension) {
         if (getHookInterface().equals(interfaceName)) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java
index 6294a9a..579c2fe 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java
@@ -39,12 +39,9 @@ public abstract class AbstractSenderAuthIdentifyVerificationRcptHook implements
                     DSNStatus.SECURITY_AUTH)
                     + " Incorrect Authentication for Specified Email Address");
     
-    /**
-     * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession,
-     *      org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
-     */
+    @Override
     public HookResult doRcpt(SMTPSession session, MailAddress sender,
-            MailAddress rcpt) {
+                             MailAddress rcpt) {
         if (session.getUser() != null) {
             String authUser = (session.getUser()).toLowerCase(Locale.US);
             MailAddress senderAddress = (MailAddress) session.getAttachment(

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java
index 70289bf..a0ce730 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java
@@ -30,12 +30,9 @@ import org.apache.james.protocols.smtp.hook.RcptHook;
  */
 public class AcceptRecipientIfRelayingIsAllowed implements RcptHook {
 
-    /**
-     * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession,
-     *      org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
-     */
+    @Override
     public HookResult doRcpt(SMTPSession session, MailAddress sender,
-            MailAddress rcpt) {
+                             MailAddress rcpt) {
         if (session.isRelayingAllowed()) {
             return HookResult.ok();
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
index 9b83ac6..081acd2 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
@@ -65,6 +65,7 @@ public class DataCmdHandler implements CommandHandler<SMTPSession>, ExtensibleHa
 
     public static final class DataConsumerLineHandler implements LineHandler<SMTPSession> {
 
+        @Override
         public SMTPResponse onLine(SMTPSession session, ByteBuffer line) {
             // Discard everything until the end of DATA session
             if (line.remaining() == 3 && line.get() == 46) {
@@ -99,6 +100,7 @@ public class DataCmdHandler implements CommandHandler<SMTPSession>, ExtensibleHa
          * (non-Javadoc)
          * @see org.apache.james.protocols.api.handler.LineHandler#onLine(org.apache.james.protocols.api.ProtocolSession, java.nio.ByteBuffer)
          */
+        @Override
         public Response onLine(SMTPSession session, ByteBuffer line) {
             line.rewind();
             return filter.onLine(session, line, next);
@@ -140,6 +142,7 @@ public class DataCmdHandler implements CommandHandler<SMTPSession>, ExtensibleHa
      * process DATA command
      *
      */
+    @Override
     public Response onCommand(SMTPSession session, Request request) {
         TimeMetric timeMetric = metricFactory.timer("SMTP-" + request.getCommand());
         session.stopDetectingCommandInjection();
@@ -188,18 +191,12 @@ public class DataCmdHandler implements CommandHandler<SMTPSession>, ExtensibleHa
         return env;
     }
     
-    
-    /**
-     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
-     */
+    @Override
     public Collection<String> getImplCommands() {
         return COMMANDS;
     }
 
-
-    /**
-     * @see org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
-     */
+    @Override
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public List getMarkerInterfaces() {
         List classes = new LinkedList();
@@ -208,9 +205,7 @@ public class DataCmdHandler implements CommandHandler<SMTPSession>, ExtensibleHa
     }
 
 
-    /**
-     * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
-     */
+    @Override
     @SuppressWarnings("rawtypes")
     public void wireExtensions(Class interfaceName, List extension) throws WiringException {
         if (DataLineFilter.class.equals(interfaceName)) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
index a4712e4..a69c40a 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
@@ -71,10 +71,7 @@ public class DataLineMessageHookHandler implements DataLineFilter, ExtensibleHan
 
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.smtp.core.DataLineFilter#onLine(org.apache.james.protocols.smtp.SMTPSession, java.nio.ByteBuffer, org.apache.james.protocols.api.handler.LineHandler)
-     */
+    @Override
     public Response onLine(SMTPSession session, ByteBuffer line, LineHandler<SMTPSession> next) {
         MailEnvelopeImpl env = (MailEnvelopeImpl) session.getAttachment(DataCmdHandler.MAILENV, ProtocolSession.State.Transaction);
         OutputStream out = env.getMessageOutputStream();
@@ -162,9 +159,7 @@ public class DataLineMessageHookHandler implements DataLineFilter, ExtensibleHan
         return null;
     }
 
-    /**
-     * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
-     */
+    @Override
     @SuppressWarnings("rawtypes")
     public void wireExtensions(Class interfaceName, List extension) throws WiringException {
         if (MessageHook.class.equals(interfaceName)) {
@@ -181,6 +176,7 @@ public class DataLineMessageHookHandler implements DataLineFilter, ExtensibleHan
         }
     }
     
+    @Override
     public List<Class<?>> getMarkerInterfaces() {
         List<Class<?>> classes = new LinkedList<>();
         classes.add(MessageHook.class);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java
index 307ad2e..3a0cb57 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java
@@ -52,13 +52,12 @@ public class ExpnCmdHandler implements CommandHandler<SMTPSession> {
      * not implemented.
      *
      */
+    @Override
     public Response onCommand(SMTPSession session, Request request) {
         return NOT_SUPPORTED;
     }
     
-    /**
-     * @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/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java
index f314e6d..894fdc5 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java
@@ -69,19 +69,14 @@ public class HeloCmdHandler extends AbstractHookableCmdHandler<HeloHook> {
 
     }
 
-    /**
-     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
-     */
+    @Override
     public Collection<String> getImplCommands() {
         return COMMANDS;
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doCoreCmd(org.apache.james.protocols.smtp.SMTPSession,
-     *      java.lang.String, java.lang.String)
-     */
+    @Override
     protected Response doCoreCmd(SMTPSession session, String command,
-            String parameters) {
+                                 String parameters) {
         session.setAttachment(SMTPSession.CURRENT_HELO_MODE, COMMAND_NAME, ProtocolSession.State.Connection);
         StringBuilder response = new StringBuilder();
         response.append(session.getConfiguration().getHelloName()).append(
@@ -90,12 +85,9 @@ public class HeloCmdHandler extends AbstractHookableCmdHandler<HeloHook> {
         return new SMTPResponse(SMTPRetCode.MAIL_OK, response);
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doFilterChecks(org.apache.james.protocols.smtp.SMTPSession,
-     *      java.lang.String, java.lang.String)
-     */
+    @Override
     protected Response doFilterChecks(SMTPSession session, String command,
-            String parameters) {
+                                      String parameters) {
         session.resetState();
 
         if (parameters == null) {
@@ -107,17 +99,13 @@ public class HeloCmdHandler extends AbstractHookableCmdHandler<HeloHook> {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     protected Class<HeloHook> getHookInterface() {
         return HeloHook.class;
     }
 
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     protected HookResult callHook(HeloHook rawHook, SMTPSession session, String parameters) {
         return rawHook.doHelo(session, parameters);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java
index d299d2a..5a6351d 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java
@@ -50,13 +50,12 @@ public class HelpCmdHandler implements CommandHandler<SMTPSession> {
      * handles HELP command
      *
     **/
+    @Override
     public Response onCommand(SMTPSession session, Request request) {
         return NOT_SUPPORTED;
     }
 
-    /**
-     * @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/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
index f3d03de..3afe738 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
@@ -91,11 +91,7 @@ public class MailCmdHandler extends AbstractHookableCmdHandler<MailHook> {
 
     }
 
-    /**
-     * @see
-     * org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler
-     * #onCommand(SMTPSession, Request)
-     */
+    @Override
     public Response onCommand(SMTPSession session, Request request) {
         Response response = super.onCommand(session, request);
         // Check if the response was not ok
@@ -130,28 +126,20 @@ public class MailCmdHandler extends AbstractHookableCmdHandler<MailHook> {
         return new SMTPResponse(SMTPRetCode.MAIL_OK, responseBuffer);
     }
 
-    /**
-     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
-     */
+    @Override
     public Collection<String> getImplCommands() {
         return COMMANDS;
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doCoreCmd(org.apache.james.protocols.smtp.SMTPSession,
-     *      java.lang.String, java.lang.String)
-     */
+    @Override
     protected Response doCoreCmd(SMTPSession session, String command,
-            String parameters) {
+                                 String parameters) {
         return doMAIL(session, parameters);
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doFilterChecks(org.apache.james.protocols.smtp.SMTPSession,
-     *      java.lang.String, java.lang.String)
-     */
+    @Override
     protected Response doFilterChecks(SMTPSession session, String command,
-            String parameters) {
+                                      String parameters) {
         return doMAILFilter(session, parameters);
     }
 
@@ -260,14 +248,13 @@ public class MailCmdHandler extends AbstractHookableCmdHandler<MailHook> {
         return null;
     }
     
+    @Override
     protected Class<MailHook> getHookInterface() {
         return MailHook.class;
     }
 
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     protected HookResult callHook(MailHook rawHook, SMTPSession session, String parameters) {
         MailAddress sender = (MailAddress) session.getAttachment(SMTPSession.SENDER, State.Transaction);
         if (sender.isNullSender()) {
@@ -277,18 +264,14 @@ public class MailCmdHandler extends AbstractHookableCmdHandler<MailHook> {
     }
 
     
-    /**
-     * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#getMarkerInterfaces()
-     */
+    @Override
     public List<Class<?>> getMarkerInterfaces() {
         List<Class<?>> l = super.getMarkerInterfaces();
         l.add(MailParametersHook.class);
         return l;
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#wireExtensions(java.lang.Class, java.util.List)
-     */
+    @Override
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public void wireExtensions(Class interfaceName, List extension) {
         if (MailParametersHook.class.equals(interfaceName)) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java
index 141a6ee..306d62d 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java
@@ -52,13 +52,12 @@ public class NoopCmdHandler implements CommandHandler<SMTPSession> {
      * Just sends back an OK and logs the command.
      *
      */
+    @Override
     public Response onCommand(SMTPSession session, Request request) {
         return NOOP;
     }
     
-    /**
-     * @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/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java
index dcc9151..0b14614 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java
@@ -33,9 +33,7 @@ import org.slf4j.LoggerFactory;
 public class PostmasterAbuseRcptHook implements RcptHook {
     private static final Logger LOGGER = LoggerFactory.getLogger(PostmasterAbuseRcptHook.class);
     
-    /**
-     * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
-     */
+    @Override
     public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
         if (rcpt.getLocalPart().equalsIgnoreCase("postmaster") || rcpt.getLocalPart().equalsIgnoreCase("abuse")) {
             LOGGER.debug("Sender allowed");

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java
index d2248cd..35d3b35 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java
@@ -99,41 +99,29 @@ public class QuitCmdHandler extends AbstractHookableCmdHandler<QuitHook> {
         }
     }
 
-    /**
-     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
-     */
+    @Override
     public Collection<String> getImplCommands() {
         return COMMANDS;
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doCoreCmd(org.apache.james.protocols.smtp.SMTPSession,
-     *      java.lang.String, java.lang.String)
-     */
+    @Override
     protected Response doCoreCmd(SMTPSession session, String command,
-            String parameters) {
+                                 String parameters) {
         return doQUIT(session, parameters);
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doFilterChecks(org.apache.james.protocols.smtp.SMTPSession,
-     *      java.lang.String, java.lang.String)
-     */
+    @Override
     protected Response doFilterChecks(SMTPSession session, String command,
-            String parameters) {
+                                      String parameters) {
         return null;
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#getHookInterface()
-     */
+    @Override
     protected Class<QuitHook> getHookInterface() {
         return QuitHook.class;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     protected HookResult callHook(QuitHook rawHook, SMTPSession session, String parameters) {
         return rawHook.doQuit(session);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
index 5544d77..c7b17ca 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
@@ -84,6 +84,7 @@ public class RcptCmdHandler extends AbstractHookableCmdHandler<RcptHook> impleme
      * @param parameters
      *            parameters passed in with the command by the SMTP client
      */
+    @Override
     @SuppressWarnings("unchecked")
     protected Response doCoreCmd(SMTPSession session, String command,
             String parameters) {
@@ -112,8 +113,9 @@ public class RcptCmdHandler extends AbstractHookableCmdHandler<RcptHook> impleme
      * @param argument
      *            the argument passed in with the command by the SMTP client
      */
+    @Override
     protected Response doFilterChecks(SMTPSession session, String command,
-            String argument) {
+                                      String argument) {
         String recipient = null;
         if ((argument != null) && (argument.indexOf(":") > 0)) {
             int colonIndex = argument.indexOf(":");
@@ -215,25 +217,19 @@ public class RcptCmdHandler extends AbstractHookableCmdHandler<RcptHook> impleme
         return sb.toString();
     }
 
-    /**
-     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
-     */
+    @Override
     public Collection<String> getImplCommands() {
         return COMMANDS;
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#getHookInterface()
-     */
+    @Override
     protected Class<RcptHook> getHookInterface() {
         return RcptHook.class;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     protected HookResult callHook(RcptHook rawHook, SMTPSession session,
-            String parameters) {
+                                  String parameters) {
         return rawHook.doRcpt(session,
                 (MailAddress) session.getAttachment(SMTPSession.SENDER, State.Transaction),
                 (MailAddress) session.getAttachment(CURRENT_RECIPIENT, State.Transaction));

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
index 9932524..7fe5a3a 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
@@ -46,6 +46,7 @@ public class RsetCmdHandler implements CommandHandler<SMTPSession> {
     private static final Response OK = new SMTPResponse(SMTPRetCode.MAIL_OK, DSNStatus.getStatus(DSNStatus.SUCCESS,DSNStatus.UNDEFINED_STATUS) + " OK").immutable();
     private static final Response SYNTAX_ERROR = new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_COMMAND_UNRECOGNIZED, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.DELIVERY_INVALID_ARG) + " Unexpected argument provided with RSET command").immutable();
     
+    @Override
     public Response onCommand(SMTPSession session, Request request) {
         return doRSET(session, request.getArgument());
     }
@@ -68,9 +69,7 @@ public class RsetCmdHandler implements CommandHandler<SMTPSession> {
         }
     }
 
-    /**
-     * @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/smtp/src/main/java/org/apache/james/protocols/smtp/core/SeparatingDataLineFilter.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SeparatingDataLineFilter.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SeparatingDataLineFilter.java
index c6131e2..4e03460 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SeparatingDataLineFilter.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SeparatingDataLineFilter.java
@@ -48,10 +48,7 @@ public abstract class SeparatingDataLineFilter implements DataLineFilter {
 
     private static final String HEADERS_COMPLETE = "HEADERS_COMPLETE";
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.smtp.core.DataLineFilter#onLine(org.apache.james.protocols.smtp.SMTPSession, java.nio.ByteBuffer, org.apache.james.protocols.api.handler.LineHandler)
-     */
+    @Override
     public final Response onLine(SMTPSession session, ByteBuffer line, LineHandler<SMTPSession> next) {
         if (session.getAttachment(HEADERS_COMPLETE, State.Transaction) == null) {
             if (line.remaining() == 2) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java
index 84ae076..56bcd10 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java
@@ -65,9 +65,7 @@ public class UnknownCmdHandler extends AbstractHookableCmdHandler<UnknownHook> {
 
     }
 
-    /**
-     * @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/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java
index d189c9f..41bc72e 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java
@@ -50,13 +50,12 @@ public class VrfyCmdHandler implements CommandHandler<SMTPSession> {
      * not implemented.
      *
      */
+    @Override
     public Response onCommand(SMTPSession session, Request request) {
         return NOT_SUPPORTED;
     }
     
-    /**
-     * @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/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java
index 52966c2..df6f3be 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java
@@ -35,9 +35,7 @@ public class WelcomeMessageHandler implements ConnectHandler<SMTPSession> {
 
     private static final String SERVICE_TYPE = "SMTP";
     
-    /**
-     * @see org.apache.james.protocols.api.handler.ConnectHandler#onConnect(org.apache.james.protocols.api.ProtocolSession)
-     */
+    @Override
     public Response onConnect(SMTPSession session) {
         String smtpGreeting = session.getConfiguration().getGreeting();
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
index a9d75f8..450020c 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
@@ -82,6 +82,7 @@ public class AuthCmdHandler
     
     private abstract class AbstractSMTPLineHandler implements LineHandler<SMTPSession> {
 
+        @Override
         public Response onLine(SMTPSession session, ByteBuffer line) {
             String charset = session.getCharset().name();
             try {
@@ -149,6 +150,7 @@ public class AuthCmdHandler
      * handles AUTH command
      *
      */
+    @Override
     public Response onCommand(SMTPSession session, Request request) {
         return doAUTH(session, request.getArgument());
     }
@@ -178,6 +180,7 @@ public class AuthCmdHandler
                 String userpass;
                 if (initialResponse == null) {
                     session.pushLineHandler(new AbstractSMTPLineHandler() {
+                        @Override
                         protected Response onCommand(SMTPSession session, String l) {
                             return doPlainAuthPass(session, l);
                         }
@@ -201,6 +204,7 @@ public class AuthCmdHandler
                 
                 if (initialResponse == null) {
                     session.pushLineHandler(new AbstractSMTPLineHandler() {
+                        @Override
                         protected Response onCommand(SMTPSession session, String l) {
                             return doLoginAuthPass(session, l);
                         }
@@ -329,6 +333,7 @@ public class AuthCmdHandler
                 return this;
             }
 
+            @Override
             protected Response onCommand(SMTPSession session, String l) {
                 return doLoginAuthPassCheck(session, user, l);
             }
@@ -498,16 +503,12 @@ public class AuthCmdHandler
 
 
 
-    /**
-     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
-     */
+    @Override
     public Collection<String> getImplCommands() {
         return COMMANDS;
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.esmtp.EhloExtension#getImplementedEsmtpFeatures(org.apache.james.protocols.smtp.SMTPSession)
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public List<String> getImplementedEsmtpFeatures(SMTPSession session) {
         if (session.isAuthSupported()) {
@@ -517,9 +518,7 @@ public class AuthCmdHandler
         }
     }
 
-    /**
-     * @see org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
-     */
+    @Override
     public List<Class<?>> getMarkerInterfaces() {
         List<Class<?>> classes = new ArrayList<>(1);
         classes.add(AuthHook.class);
@@ -527,9 +526,7 @@ public class AuthCmdHandler
     }
 
 
-    /**
-     * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException {
         if (AuthHook.class.equals(interfaceName)) {
@@ -553,18 +550,14 @@ public class AuthCmdHandler
         return hooks;
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.hook.MailParametersHook#doMailParameter(org.apache.james.protocols.smtp.SMTPSession, java.lang.String, java.lang.String)
-     */
+    @Override
     public HookResult doMailParameter(SMTPSession session, String paramName, String paramValue) {
         // Ignore the AUTH command.
         // TODO we should at least check for correct syntax and put the result in session
         return HookResult.declined();
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.hook.MailParametersHook#getMailParamNames()
-     */
+    @Override
     public String[] getMailParamNames() {
         return MAIL_PARAMS;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
index 9737d83..7a8ed7e 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
@@ -97,26 +97,19 @@ public class EhloCmdHandler extends AbstractHookableCmdHandler<HeloHook> impleme
 
     }
 
-    /**
-     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
-     */
+    @Override
     public Collection<String> getImplCommands() {
         return COMMANDS;
     }
 
-    /**
-     * @see org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
-     */
+    @Override
     public List<Class<?>> getMarkerInterfaces() {
         List<Class<?>> classes = super.getMarkerInterfaces();
         classes.add(EhloExtension.class);
         return classes;
     }
 
-    /**
-     * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class,
-     *      java.util.List)
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public void wireExtensions(Class<?> interfaceName, List<?> extension) {
         super.wireExtensions(interfaceName, extension);
@@ -144,21 +137,15 @@ public class EhloCmdHandler extends AbstractHookableCmdHandler<HeloHook> impleme
         }
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doCoreCmd(org.apache.james.protocols.smtp.SMTPSession,
-     *      java.lang.String, java.lang.String)
-     */
+    @Override
     protected Response doCoreCmd(SMTPSession session, String command,
-            String parameters) {
+                                 String parameters) {
         return doEHLO(session, parameters);
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#doFilterChecks(org.apache.james.protocols.smtp.SMTPSession,
-     *      java.lang.String, java.lang.String)
-     */
+    @Override
     protected Response doFilterChecks(SMTPSession session, String command,
-            String parameters) {
+                                      String parameters) {
         session.resetState();
 
         if (parameters == null) {
@@ -170,25 +157,19 @@ public class EhloCmdHandler extends AbstractHookableCmdHandler<HeloHook> impleme
         }
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#getHookInterface()
-     */
+    @Override
     protected Class<HeloHook> getHookInterface() {
         return HeloHook.class;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     protected HookResult callHook(HeloHook rawHook, SMTPSession session, String parameters) {
         return rawHook.doHelo(session, parameters);
     }
 
 
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.esmtp.EhloExtension#getImplementedEsmtpFeatures(org.apache.james.protocols.smtp.SMTPSession)
-     */
+    @Override
     public List<String> getImplementedEsmtpFeatures(SMTPSession session) {
         return ESMTP_FEATURES;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
index 1b8423d..b150bb8 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
@@ -68,25 +68,19 @@ public class MailSizeEsmtpExtension implements MailParametersHook, EhloExtension
 
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.hook.MailParametersHook#doMailParameter(org.apache.james.protocols.smtp.SMTPSession, java.lang.String, java.lang.String)
-     */
+    @Override
     public HookResult doMailParameter(SMTPSession session, String paramName,
-            String paramValue) {
+                                      String paramValue) {
         return doMailSize(session, paramValue,
                 (String) session.getAttachment(SMTPSession.SENDER, State.Transaction));
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.hook.MailParametersHook#getMailParamNames()
-     */
+    @Override
     public String[] getMailParamNames() {
         return MAIL_PARAMS;
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.esmtp.EhloExtension#getImplementedEsmtpFeatures(org.apache.james.protocols.smtp.SMTPSession)
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public List<String> getImplementedEsmtpFeatures(SMTPSession session) {
         // Extension defined in RFC 1870
@@ -138,9 +132,7 @@ public class MailSizeEsmtpExtension implements MailParametersHook, EhloExtension
     }
 
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.DataLineFilter#onLine(SMTPSession, byte[], LineHandler)
-     */
+    @Override
     public Response onLine(SMTPSession session, ByteBuffer line, LineHandler<SMTPSession> next) {
         Boolean failed = (Boolean) session.getAttachment(MESG_FAILED, State.Transaction);
         // If we already defined we failed and sent a reply we should simply
@@ -189,9 +181,7 @@ public class MailSizeEsmtpExtension implements MailParametersHook, EhloExtension
         return line.remaining() == SINGLE_CHARACTER_LINE && line.get() == DOT_BYTE;
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.hook.MessageHook#onMessage(SMTPSession, MailEnvelope)
-     */
+    @Override
     public HookResult onMessage(SMTPSession session, MailEnvelope mail) {
         Boolean failed = (Boolean) session.getAttachment(MESG_FAILED, State.Transaction);
         if (failed != null && failed.booleanValue()) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java
index 11ebcfd..3de08b3 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java
@@ -53,6 +53,7 @@ public class StartTlsCmdHandler implements CommandHandler<SMTPSession>, EhloExte
     private static final Response SYNTAX_ERROR = new SMTPResponse("501 " + DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_ARG) + " Syntax error (no parameters allowed) with STARTTLS command").immutable();
     private static final Response NOT_SUPPORTED = new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_COMMAND_UNRECOGNIZED, DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_CMD) + " Command " + COMMAND_NAME + " unrecognized.").immutable();
 
+    @Override
     public Collection<String> getImplCommands() {
         return COMMANDS;
     }
@@ -72,6 +73,7 @@ public class StartTlsCmdHandler implements CommandHandler<SMTPSession>, EhloExte
      * message-specific, but not authenticated user, state.
      * 
      */
+    @Override
     public Response onCommand(SMTPSession session, Request request) {
         if (session.isStartTLSSupported()) {
             if (session.isTLSStarted()) {
@@ -90,9 +92,7 @@ public class StartTlsCmdHandler implements CommandHandler<SMTPSession>, EhloExte
         }
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.esmtp.EhloExtension#getImplementedEsmtpFeatures(org.apache.james.protocols.smtp.SMTPSession)
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public List<String> getImplementedEsmtpFeatures(SMTPSession session) {
         // SMTP STARTTLS

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java
index cce3891..8df48c8 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java
@@ -210,9 +210,7 @@ public abstract class AbstractGreylistHandler implements RcptHook {
 
   
 
-    /**
-     * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
-     */
+    @Override
     public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
         if (!session.isRelayingAllowed()) {
             return doGreyListCheck(session, sender,rcpt);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java
index 4200220..79246e0 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java
@@ -36,9 +36,7 @@ import org.slf4j.LoggerFactory;
 public abstract class AbstractValidRcptHandler implements RcptHook {
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractValidRcptHandler.class);
 
-    /**
-     * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
-     */
+    @Override
     public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
         boolean reject = false;
         

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
index 5b6ef06..55a811c 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
@@ -177,9 +177,7 @@ public class DNSRBLHandler implements RcptHook {
         }
     }
     
-    /**
-     * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
-     */
+    @Override
     public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
         checkDNSRBL(session, session.getRemoteAddress().getAddress().getHostAddress());
     

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java
index 0390761..3b084b8 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java
@@ -51,9 +51,7 @@ public class MaxRcptHandler implements RcptHook {
         this.maxRcpt = maxRcpt;
     }
    
-    /**
-     * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
-     */
+    @Override
     public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
         if ((session.getRcptCount() + 1) > maxRcpt) {
             LOGGER.info("Maximum recipients of {} reached", maxRcpt);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java
index 5e27ded..efd063b 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java
@@ -54,10 +54,7 @@ public class MaxUnknownCmdHandler implements UnknownHook {
         this.maxUnknown = maxUnknown;
     }
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.smtp.hook.UnknownHook#doUnknown(org.apache.james.protocols.smtp.SMTPSession, java.lang.String)
-     */
+    @Override
     public HookResult doUnknown(SMTPSession session, String command) {
         Integer count = (Integer) session.getAttachment(UNKOWN_COMMAND_COUNT, State.Transaction);
         if (count == null) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java
index cda61f8..c31ab73 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java
@@ -92,9 +92,7 @@ public class ResolvableEhloHeloHandler implements RcptHook, HeloHook {
         return true;
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
-     */
+    @Override
     public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
         if (check(session,rcpt)) {
             return new HookResult(HookReturnCode.DENY,SMTPRetCode.SYNTAX_ERROR_ARGUMENTS,DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_ARG)
@@ -104,9 +102,7 @@ public class ResolvableEhloHeloHandler implements RcptHook, HeloHook {
         }
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.hook.HeloHook#doHelo(org.apache.james.protocols.smtp.SMTPSession, java.lang.String)
-     */
+    @Override
     public HookResult doHelo(SMTPSession session, String helo) {
         checkEhloHelo(session, helo);
         return HookResult.declined();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ReverseEqualsEhloHeloHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ReverseEqualsEhloHeloHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ReverseEqualsEhloHeloHandler.java
index bf22da5..b43bc44 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ReverseEqualsEhloHeloHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ReverseEqualsEhloHeloHandler.java
@@ -25,9 +25,6 @@ import org.apache.james.protocols.smtp.SMTPSession;
 
 public class ReverseEqualsEhloHeloHandler extends ResolvableEhloHeloHandler {
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.fastfail.ResolvableEhloHeloHandler#isBadHelo(org.apache.james.protocols.smtp.SMTPSession, java.lang.String)
-     */
     @Override
     protected boolean isBadHelo(SMTPSession session, String argument) {
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java
index 45bfcb6..1b93046 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java
@@ -68,9 +68,7 @@ public class SpamTrapHandler implements RcptHook {
         this.blockTime = blockTime;
     }
     
-    /**
-     * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
-     */
+    @Override
     public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
         String address = session.getRemoteAddress().getAddress().getHostAddress();
         if (isBlocked(address, session)) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java
index 531ff6e..305aefd 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java
@@ -50,9 +50,7 @@ public class SupressDuplicateRcptHandler implements RcptHook {
 
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
         Collection<MailAddress> rcptList = (Collection<MailAddress>) session.getAttachment(SMTPSession.RCPT_LIST, State.Transaction);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java
index 94d5aba..58d1042 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java
@@ -33,9 +33,7 @@ import org.apache.james.protocols.smtp.hook.MailHook;
 public abstract class ValidSenderDomainHandler implements MailHook { 
 
 
-    /**
-     * @see org.apache.james.protocols.smtp.hook.MailHook#doMail(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress)
-     */
+    @Override
     public HookResult doMail(SMTPSession session, MailAddress sender) {
         if (sender != null  && !hasMXRecord(session,sender.getDomain())) {
             return new HookResult(HookReturnCode.DENY,SMTPRetCode.SYNTAX_ERROR_ARGUMENTS,DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.ADDRESS_SYNTAX_SENDER) + " sender " + sender + " contains a domain with no valid MX records");

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java
index 1c96646..88d274d 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java
@@ -47,6 +47,7 @@ public class HookResultLogger implements HookResultHook {
 
     }
 
+    @Override
     public HookResult onHookResult(SMTPSession session, HookResult hResult, long executionTime, Hook hook) {
         boolean match = false;
         boolean info = false;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java
index fd43d40..6962209 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java
@@ -47,6 +47,7 @@ public class SimpleHook implements HeloHook, MailHook, RcptHook, MessageHook {
     /**
      * Return {@link HookResult} with {@link HookReturnCode#OK}
      */
+    @Override
     public HookResult onMessage(SMTPSession session, MailEnvelope mail) {
         return new HookResult(HookReturnCode.OK);
     }
@@ -54,6 +55,7 @@ public class SimpleHook implements HeloHook, MailHook, RcptHook, MessageHook {
     /**
      * Return {@link HookResult} with {@link HookReturnCode#DECLINED}
      */
+    @Override
     public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
         return new HookResult(HookReturnCode.DECLINED);
 
@@ -62,6 +64,7 @@ public class SimpleHook implements HeloHook, MailHook, RcptHook, MessageHook {
     /**
      * Return {@link HookResult} with {@link HookReturnCode#DECLINED}
      */
+    @Override
     public HookResult doMail(SMTPSession session, MailAddress sender) {
         return new HookResult(HookReturnCode.DECLINED);
 
@@ -70,6 +73,7 @@ public class SimpleHook implements HeloHook, MailHook, RcptHook, MessageHook {
     /**
      * Return {@link HookResult} with {@link HookReturnCode#DECLINED}
      */
+    @Override
     public HookResult doHelo(SMTPSession session, String helo) {
         return new HookResult(HookReturnCode.DECLINED);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java
index b98efab..ce1f25e 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java
@@ -499,6 +499,7 @@ public abstract class AbstractSMTPServerTest {
 
             }
 
+            @Override
             public HookResult doHelo(SMTPSession session, String helo) {
                 return new HookResult(HookReturnCode.DENY);
             }
@@ -546,6 +547,7 @@ public abstract class AbstractSMTPServerTest {
 
             }
 
+            @Override
             public HookResult doHelo(SMTPSession session, String helo) {
                 return new HookResult(HookReturnCode.DENYSOFT);
             }
@@ -592,6 +594,7 @@ public abstract class AbstractSMTPServerTest {
 
             }
 
+            @Override
             public HookResult doMail(SMTPSession session, MailAddress sender) {
                 return new HookResult(HookReturnCode.DENY);
             }
@@ -641,6 +644,7 @@ public abstract class AbstractSMTPServerTest {
 
             }
 
+            @Override
             public HookResult doMail(SMTPSession session, MailAddress sender) {
                 return new HookResult(HookReturnCode.DENYSOFT);
             }
@@ -691,6 +695,7 @@ public abstract class AbstractSMTPServerTest {
 
             }
 
+            @Override
             public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
                 if (RCPT1.equals(rcpt.toString())) {
                     return new HookResult(HookReturnCode.DENY);
@@ -754,6 +759,7 @@ public abstract class AbstractSMTPServerTest {
 
             }
 
+            @Override
             public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
                 if (RCPT1.equals(rcpt.toString())) {
                     return new HookResult(HookReturnCode.DENYSOFT);
@@ -852,6 +858,7 @@ public abstract class AbstractSMTPServerTest {
 
             }
 
+            @Override
             public HookResult onMessage(SMTPSession session, MailEnvelope mail) {
                 return new HookResult(HookReturnCode.DENY);
             }
@@ -915,6 +922,7 @@ public abstract class AbstractSMTPServerTest {
 
             }
 
+            @Override
             public HookResult onMessage(SMTPSession session, MailEnvelope mail) {
                 return new HookResult(HookReturnCode.DENYSOFT);
             }
@@ -977,6 +985,7 @@ public abstract class AbstractSMTPServerTest {
 
             }
 
+            @Override
             public Response onConnect(SMTPSession session) {
                 return new SMTPResponse("554", "Bye Bye");
             }
@@ -1019,6 +1028,7 @@ public abstract class AbstractSMTPServerTest {
 
             }
 
+            @Override
             public Response onConnect(SMTPSession session) {
                 return new SMTPResponse("451", "Bye Bye");
             }
@@ -1061,6 +1071,7 @@ public abstract class AbstractSMTPServerTest {
 
             }
 
+            @Override
             public void onDisconnect(SMTPSession session) {
                 called.set(true);
             }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
index 16529aa..f0322ac 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
@@ -126,22 +126,27 @@ public class DNSRBLHandlerTest {
                 return remoteIp;
             }
 
+            @Override
             public Map<String,Object> getState() {
                 return sessionState;
             }
 
+            @Override
             public boolean isRelayingAllowed() {
                 return relaying;
             }
 
+            @Override
             public boolean isAuthSupported() {
                 return false;
             }
 
+            @Override
             public int getRcptCount() {
                 return 0;
             }
             
+            @Override
             public Object setAttachment(String key, Object value, State state) {
                 if (state == State.Connection) {
                     if (value == null) {
@@ -158,6 +163,7 @@ public class DNSRBLHandlerTest {
                 }
             }
 
+            @Override
             public Object getAttachment(String key, State state) {
                 if (state == State.Connection) {
                     return connectionState.get(key);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java
index b715049..6c28e54 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java
@@ -36,14 +36,17 @@ public class MaxRcptHandlerTest {
         return new BaseFakeSMTPSession() {
             HashMap<String,Object> state = new HashMap<>();
 
+            @Override
             public Map<String,Object> getState() {
                 return state;
             }
 
+            @Override
             public boolean isRelayingAllowed() {
                 return false;
             }
 
+            @Override
             public int getRcptCount() {
                 return rcptCount;
             }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java
index b436b58..321d65c 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java
@@ -38,10 +38,12 @@ public class MaxUnknownCmdHandlerTest {
         SMTPSession session = new BaseFakeSMTPSession() {
             private final HashMap<String,Object> map = new HashMap<>();
 
+            @Override
             public Map<String,Object> getState() {
                 return map;
             }
 
+            @Override
             public Object setAttachment(String key, Object value, State state) {
                 if (state == State.Connection) {
                     throw new UnsupportedOperationException();
@@ -59,6 +61,7 @@ public class MaxUnknownCmdHandlerTest {
              * (non-Javadoc)
              * @see org.apache.james.protocols.api.ProtocolSession#getAttachment(java.lang.String, org.apache.james.protocols.api.ProtocolSession.State)
              */
+            @Override
             public Object getAttachment(String key, State state) {
                 if (state == State.Connection) {
                     throw new UnsupportedOperationException();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
index 5d77318..d633bf8 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
@@ -50,22 +50,27 @@ public class ResolvableEhloHeloHandlerTest {
             HashMap<String,Object> connectionMap = new HashMap<>();
             HashMap<String,Object> map = new HashMap<>();
 
+            @Override
             public boolean isAuthSupported() {
                 return authRequired;
             }
 
+            @Override
             public String getUser() {
                 return user;
             }
 
+            @Override
             public Map<String,Object> getConnectionState() {
                 return connectionMap;
             }
 
+            @Override
             public boolean isRelayingAllowed() {
                 return relaying;
             }
 
+            @Override
             public Map<String,Object> getState() {
                 return map;
             }
@@ -74,6 +79,7 @@ public class ResolvableEhloHeloHandlerTest {
              * (non-Javadoc)
              * @see org.apache.james.protocols.api.ProtocolSession#setAttachment(java.lang.String, java.lang.Object, org.apache.james.protocols.api.ProtocolSession.State)
              */
+            @Override
             public Object setAttachment(String key, Object value, State state) {
                 if (state == State.Connection) {
                     if (value == null) {
@@ -94,6 +100,7 @@ public class ResolvableEhloHeloHandlerTest {
              * (non-Javadoc)
              * @see org.apache.james.protocols.api.ProtocolSession#getAttachment(java.lang.String, org.apache.james.protocols.api.ProtocolSession.State)
              */
+            @Override
             public Object getAttachment(String key, State state) {
                 if (state == State.Connection) {
                     return connectionMap.get(key);


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


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

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryTest.java b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryTest.java
index 1ef9edf..aada43c 100644
--- a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryTest.java
+++ b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryTest.java
@@ -34,6 +34,7 @@ public class CassandraNotificationRegistryTest extends AbstractNotificationRegis
     
     private CassandraCluster cassandra;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         cassandra = CassandraCluster.create(new CassandraNotificationRegistryModule(), cassandraServer.getIp(), cassandraServer.getBindingPort());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationRepositoryTest.java b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationRepositoryTest.java
index 788790b..0fbe8b8 100644
--- a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationRepositoryTest.java
+++ b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationRepositoryTest.java
@@ -35,6 +35,7 @@ public class CassandraVacationRepositoryTest extends AbstractVacationRepositoryT
     
     private CassandraCluster cassandra;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         CassandraModuleComposite module = new CassandraModuleComposite(new CassandraVacationModule(), new CassandraZonedDateTimeModule());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/access/MemoryAccessTokenRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/access/MemoryAccessTokenRepositoryTest.java b/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/access/MemoryAccessTokenRepositoryTest.java
index 9c32627..c63b460 100644
--- a/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/access/MemoryAccessTokenRepositoryTest.java
+++ b/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/access/MemoryAccessTokenRepositoryTest.java
@@ -25,6 +25,7 @@ import org.junit.Before;
 
 public class MemoryAccessTokenRepositoryTest extends AccessTokenRepositoryTest {
     
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java b/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
index c7c3550..0f7a339 100644
--- a/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
+++ b/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
@@ -74,11 +74,7 @@ public class JPARecipientRewriteTable extends AbstractRecipientRewriteTable {
         }
     }
 
-    /**
-     * @throws RecipientRewriteTableException
-     * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#mapAddressInternal(java.lang.String,
-     *      java.lang.String)
-     */
+    @Override
     protected String mapAddressInternal(String user, String domain) throws RecipientRewriteTableException {
         String mapping = getMapping(user, domain, "selectExactMappings");
         if (mapping != null) {
@@ -110,10 +106,7 @@ public class JPARecipientRewriteTable extends AbstractRecipientRewriteTable {
         return null;
     }
 
-    /**
-     * @throws RecipientRewriteTableException
-     * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#mapAddress(java.lang.String, java.lang.String)
-     */
+    @Override
     protected Mappings getUserDomainMappingsInternal(String user, String domain) throws RecipientRewriteTableException {
         EntityManager entityManager = entityManagerFactory.createEntityManager();
         final EntityTransaction transaction = entityManager.getTransaction();
@@ -138,10 +131,7 @@ public class JPARecipientRewriteTable extends AbstractRecipientRewriteTable {
         return null;
     }
 
-    /**
-     * @throws RecipientRewriteTableException
-     * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#getAllMappingsInternal()
-     */
+    @Override
     protected Map<String, Mappings> getAllMappingsInternal() throws RecipientRewriteTableException {
         EntityManager entityManager = entityManagerFactory.createEntityManager();
         final EntityTransaction transaction = entityManager.getTransaction();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
index e623ddf..cfe981c 100644
--- a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
+++ b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
@@ -79,6 +79,7 @@ public class JPAUsersRepository extends AbstractUsersRepository {
      * 
      * @since James 1.2.2
      */
+    @Override
     public User getUserByName(String name) throws UsersRepositoryException {
         EntityManager entityManager = entityManagerFactory.createEntityManager();
 
@@ -117,6 +118,7 @@ public class JPAUsersRepository extends AbstractUsersRepository {
      * 
      * @throws UsersRepositoryException
      */
+    @Override
     public void updateUser(User user) throws UsersRepositoryException {
         EntityManager entityManager = entityManagerFactory.createEntityManager();
 
@@ -148,6 +150,7 @@ public class JPAUsersRepository extends AbstractUsersRepository {
      *            the user to remove from the repository
      * @throws UsersRepositoryException
      */
+    @Override
     public void removeUser(String name) throws UsersRepositoryException {
         EntityManager entityManager = entityManagerFactory.createEntityManager();
 
@@ -179,6 +182,7 @@ public class JPAUsersRepository extends AbstractUsersRepository {
      * @return whether the user is in the repository
      * @throws UsersRepositoryException
      */
+    @Override
     public boolean contains(String name) throws UsersRepositoryException {
         EntityManager entityManager = entityManagerFactory.createEntityManager();
 
@@ -207,6 +211,7 @@ public class JPAUsersRepository extends AbstractUsersRepository {
      * 
      * @since James 1.2.2
      */
+    @Override
     public boolean test(String name, String password) throws UsersRepositoryException {
         final User user = getUserByName(name);
         final boolean result;
@@ -220,6 +225,7 @@ public class JPAUsersRepository extends AbstractUsersRepository {
      * @return the number of users in the repository
      * @throws UsersRepositoryException
      */
+    @Override
     public int countUsers() throws UsersRepositoryException {
         EntityManager entityManager = entityManagerFactory.createEntityManager();
 
@@ -240,6 +246,7 @@ public class JPAUsersRepository extends AbstractUsersRepository {
      *         repository.
      * @throws UsersRepositoryException
      */
+    @Override
     @SuppressWarnings("unchecked")
     public Iterator<String> list() throws UsersRepositoryException {
         EntityManager entityManager = entityManagerFactory.createEntityManager();
@@ -255,10 +262,7 @@ public class JPAUsersRepository extends AbstractUsersRepository {
         }
     }
 
-    /**
-     * @see
-     * org.apache.james.user.lib.AbstractUsersRepository#doConfigure(org.apache.commons.configuration.HierarchicalConfiguration)
-     */
+    @Override
     public void doConfigure(HierarchicalConfiguration config) throws ConfigurationException {
         algo = config.getString("algorithm", "MD5");
         super.doConfigure(config);
@@ -273,10 +277,7 @@ public class JPAUsersRepository extends AbstractUsersRepository {
         return entityManagerFactory.createEntityManager();
     }
 
-    /**
-     * @see
-     * org.apache.james.user.lib.AbstractUsersRepository#doAddUser(java.lang.String, java.lang.String)
-     */
+    @Override
     protected void doAddUser(String username, String password) throws UsersRepositoryException {
         String lowerCasedUsername = username.toLowerCase(Locale.US);
         if (contains(lowerCasedUsername)) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
index 2634bc3..c7bca5d 100644
--- a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
+++ b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
@@ -94,16 +94,12 @@ public class JPAUser implements User {
         this.password = hashPassword(userName, password, alg);
     }
 
-    /**
-     * @see org.apache.james.user.api.model.User#getUserName()
-     */
+    @Override
     public String getUserName() {
         return name;
     }
 
-    /**
-     * @see org.apache.james.user.api.model.User#setPassword(java.lang.String)
-     */
+    @Override
     public boolean setPassword(String newPass) {
         final boolean result;
         if (newPass == null) {
@@ -115,9 +111,7 @@ public class JPAUser implements User {
         return result;
     }
 
-    /**
-     * @see org.apache.james.user.api.model.User#verifyPassword(java.lang.String)
-     */
+    @Override
     public boolean verifyPassword(String pass) {
         final boolean result;
         if (pass == null) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java b/server/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java
index 4a79542..1527e65 100644
--- a/server/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java
+++ b/server/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java
@@ -32,6 +32,7 @@ public class JPADomainListTest extends AbstractDomainListTest {
 
     private static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPADomain.class);
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jpa/src/test/java/org/apache/james/rrt/jpa/JPARecipientRewriteTableTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/test/java/org/apache/james/rrt/jpa/JPARecipientRewriteTableTest.java b/server/data/data-jpa/src/test/java/org/apache/james/rrt/jpa/JPARecipientRewriteTableTest.java
index 523356a..85ad4f3 100644
--- a/server/data/data-jpa/src/test/java/org/apache/james/rrt/jpa/JPARecipientRewriteTableTest.java
+++ b/server/data/data-jpa/src/test/java/org/apache/james/rrt/jpa/JPARecipientRewriteTableTest.java
@@ -34,11 +34,13 @@ public class JPARecipientRewriteTableTest extends AbstractRecipientRewriteTableT
 
     private static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPARecipientRewrite.class);
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         super.tearDown();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java b/server/data/data-jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java
index ac298f3..6a0d1d6 100644
--- a/server/data/data-jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java
+++ b/server/data/data-jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java
@@ -36,6 +36,7 @@ public class JpaUsersRepositoryTest extends AbstractUsersRepositoryTest {
         super.setUp();
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         super.tearDown();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPUser.java
----------------------------------------------------------------------
diff --git a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPUser.java b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPUser.java
index 9156016..8cf8c03 100644
--- a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPUser.java
+++ b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPUser.java
@@ -107,6 +107,7 @@ public class ReadOnlyLDAPUser implements User, Serializable {
      * 
      * @return The user's identifier or name.
      */
+    @Override
     public String getUserName() {
         return userName;
     }
@@ -119,6 +120,7 @@ public class ReadOnlyLDAPUser implements User, Serializable {
      * 
      * @return <code>False</code>
      */
+    @Override
     public boolean setPassword(String newPass) {
         return false;
     }
@@ -134,6 +136,7 @@ public class ReadOnlyLDAPUser implements User, Serializable {
      *         to the LDAP host using the user's id and the supplied password,
      *         and <code>False</code> otherwise.
      */
+    @Override
     public boolean verifyPassword(String password) {
         boolean result = false;
         LdapContext ldapContext = null;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
index 5548ec6..8190c5b 100644
--- a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
+++ b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
@@ -355,6 +355,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
      * @param configuration
      *            An encapsulation of the James server configuration data.
      */
+    @Override
     public void configure(HierarchicalConfiguration configuration) throws ConfigurationException {
         ldapHost = configuration.getString("[@ldapHost]", "");
         principal = configuration.getString("[@principal]", "");
@@ -628,9 +629,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
       return new ReadOnlyLDAPUser(userName.get().toString(), userDN, ldapContext);
     }
 
-    /**
-     * @see UsersRepository#contains(java.lang.String)
-     */
+    @Override
     public boolean contains(String name) throws UsersRepositoryException {
         return getUserByName(name) != null;
     }
@@ -645,9 +644,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
         return getUserByNameCaseInsensitive(name) != null;
     }
 
-    /**
-     * @see UsersRepository#countUsers()
-     */
+    @Override
     public int countUsers() throws UsersRepositoryException {
         try {
             return getValidUsers().size();
@@ -673,9 +670,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
         return null;
     }
 
-    /**
-     * @see UsersRepository#getUserByName(java.lang.String)
-     */
+    @Override
     public User getUserByName(String name) throws UsersRepositoryException {
         try {
           return searchAndBuildUser(name);
@@ -708,9 +703,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
         return null;
     }
 
-    /**
-     * @see UsersRepository#list()
-     */
+    @Override
     public Iterator<String> list() throws UsersRepositoryException {
         try {
             return buildUserCollection(getValidUsers())
@@ -748,9 +741,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
         return validUserDNs;
     }
 
-    /**
-     * @see UsersRepository#removeUser(java.lang.String)
-     */
+    @Override
     public void removeUser(String name) throws UsersRepositoryException {
         LOGGER.warn("This user-repository is read-only. Modifications are not permitted.");
         throw new UsersRepositoryException(
@@ -758,25 +749,20 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
 
     }
 
-    /**
-     * @see UsersRepository#test(java.lang.String, java.lang.String)
-     */
+    @Override
     public boolean test(String name, String password) throws UsersRepositoryException {
         User u = getUserByName(name);
         return u != null && u.verifyPassword(password);
     }
 
-    /**
-     * @see UsersRepository#addUser(java.lang.String, java.lang.String)
-     */
+    @Override
     public void addUser(String username, String password) throws UsersRepositoryException {
         LOGGER.error("This user-repository is read-only. Modifications are not permitted.");
         throw new UsersRepositoryException(
                 "This user-repository is read-only. Modifications are not permitted.");
     }
 
-    /**
-     */
+    @Override
     public void updateUser(User user) throws UsersRepositoryException {
         LOGGER.error("This user-repository is read-only. Modifications are not permitted.");
         throw new UsersRepositoryException(
@@ -786,6 +772,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
     /**
      * VirtualHosting not supported
      */
+    @Override
     public boolean supportVirtualHosting() {
         return supportsVirtualHosting;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java b/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java
index 8f82041..b00bcac 100644
--- a/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java
@@ -55,6 +55,7 @@ public abstract class AbstractMailRepository implements MailRepository, Configur
      */
     private final Lock lock = new Lock();
 
+    @Override
     public void configure(HierarchicalConfiguration configuration) throws ConfigurationException {
         doConfigure(configuration);
     }
@@ -71,6 +72,7 @@ public abstract class AbstractMailRepository implements MailRepository, Configur
      * 
      * @return true if successfully released the lock, false otherwise
      */
+    @Override
     public boolean unlock(String key) {
         return lock.unlock(key);
     }
@@ -83,13 +85,12 @@ public abstract class AbstractMailRepository implements MailRepository, Configur
      * 
      * @return true if successfully obtained the lock, false otherwise
      */
+    @Override
     public boolean lock(String key) {
         return lock.lock(key);
     }
 
-    /**
-     * @see org.apache.james.mailrepository.api.MailRepository#store(Mail)
-     */
+    @Override
     public void store(Mail mc) throws MessagingException {
         boolean wasLocked = true;
         String key = mc.getName();
@@ -124,25 +125,19 @@ public abstract class AbstractMailRepository implements MailRepository, Configur
      */
     protected abstract void internalStore(Mail mc) throws MessagingException, IOException;
 
-    /**
-     * @see org.apache.james.mailrepository.api.MailRepository#remove(Mail)
-     */
+    @Override
     public void remove(Mail mail) throws MessagingException {
         remove(mail.getName());
     }
 
-    /**
-     * @see org.apache.james.mailrepository.api.MailRepository#remove(Collection)
-     */
+    @Override
     public void remove(Collection<Mail> mails) throws MessagingException {
         for (Mail mail : mails) {
             remove(mail);
         }
     }
 
-    /**
-     * @see org.apache.james.mailrepository.api.MailRepository#remove(String)
-     */
+    @Override
     public void remove(String key) throws MessagingException {
         if (lock(key)) {
             try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java b/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
index 8dab01f..fcdb5d5 100644
--- a/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
@@ -66,6 +66,7 @@ public abstract class AbstractFileRepository implements Repository, Configurable
 
     private String destination;
 
+    @Override
     public void configure(HierarchicalConfiguration configuration) throws ConfigurationException {
         destination = configuration.getString("[@destinationURL]");
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-library/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java b/server/data/data-library/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java
index 4bda697..a46c676 100644
--- a/server/data/data-library/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java
+++ b/server/data/data-library/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java
@@ -36,6 +36,7 @@ public class ClassLoaderObjectInputStream extends ObjectInputStream {
         this.classLoader = classLoader;
     }
 
+    @Override
     protected Class<?> resolveClass(ObjectStreamClass objectStreamClass) throws IOException, ClassNotFoundException {
         final Class<?> clazz = Class.forName(objectStreamClass.getName(), false, classLoader);
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-library/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java b/server/data/data-library/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java
index c052c19..5aa025a 100644
--- a/server/data/data-library/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java
+++ b/server/data/data-library/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java
@@ -51,6 +51,7 @@ public class ExtensionFileFilter implements FilenameFilter {
         extensions = new String[] { extension };
     }
 
+    @Override
     public boolean accept(File file, String name) {
         return Arrays.stream(extensions).anyMatch(name::endsWith);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java b/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java
index 5af987c..6e44113 100644
--- a/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java
@@ -35,18 +35,12 @@ import org.slf4j.LoggerFactory;
 public class FilePersistentObjectRepository extends AbstractFileRepository implements ObjectRepository {
     private static final Logger LOGGER = LoggerFactory.getLogger(FilePersistentObjectRepository.class);
 
-    /**
-     * @see
-     * org.apache.james.repository.file.AbstractFileRepository#getExtensionDecorator()
-     */
+    @Override
     protected String getExtensionDecorator() {
         return ".FileObjectStore";
     }
 
-    /**
-     * @see
-     * org.apache.james.repository.api.ObjectRepository#get(java.lang.String)
-     */
+    @Override
     public synchronized Object get(String key) {
         try {
             final InputStream inputStream = getInputStream(key);
@@ -70,11 +64,7 @@ public class FilePersistentObjectRepository extends AbstractFileRepository imple
         }
     }
 
-    /**
-     * @see
-     * org.apache.james.repository.api.ObjectRepository#get(java.lang.String,
-     * java.lang.ClassLoader)
-     */
+    @Override
     public synchronized Object get(String key, ClassLoader classLoader) {
         try {
             final InputStream inputStream = getInputStream(key);
@@ -101,11 +91,7 @@ public class FilePersistentObjectRepository extends AbstractFileRepository imple
 
     }
 
-    /**
-     * @see
-     * org.apache.james.repository.api.ObjectRepository#put(java.lang.String,
-     * java.lang.Object)
-     */
+    @Override
     public synchronized void put(String key, Object value) {
         try (OutputStream outputStream = getOutputStream(key)) {
             final ObjectOutputStream stream = new ObjectOutputStream(outputStream);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-library/src/main/java/org/apache/james/repository/file/NumberedRepositoryFileFilter.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/repository/file/NumberedRepositoryFileFilter.java b/server/data/data-library/src/main/java/org/apache/james/repository/file/NumberedRepositoryFileFilter.java
index 0f40f00..cbcf292 100644
--- a/server/data/data-library/src/main/java/org/apache/james/repository/file/NumberedRepositoryFileFilter.java
+++ b/server/data/data-library/src/main/java/org/apache/james/repository/file/NumberedRepositoryFileFilter.java
@@ -41,9 +41,7 @@ public class NumberedRepositoryFileFilter implements FilenameFilter {
         prefix = ".Repository";
     }
 
-    /**
-     * @see java.io.FilenameFilter#accept(File, String)
-     */
+    @Override
     public boolean accept(File file, String name) {
         // System.out.println("check: " + name);
         // System.out.println("post: " + postfix);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
index 730f9d4..ff8af77 100644
--- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
+++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
@@ -58,9 +58,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
         this.domainList = domainList;
     }
 
-    /**
-     * @see org.apache.james.lifecycle.api.Configurable#configure(HierarchicalConfiguration)
-     */
+    @Override
     public void configure(HierarchicalConfiguration config) throws ConfigurationException {
         setRecursiveMapping(config.getBoolean("recursiveMapping", true));
         try {
@@ -100,10 +98,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
         this.mappingLimit = mappingLimit;
     }
 
-    /**
-     * @see org.apache.james.rrt.api.RecipientRewriteTable#getMappings(String,
-     *      String)
-     */
+    @Override
     public Mappings getMappings(String user, String domain) throws ErrorMappingException, RecipientRewriteTableException {
         return getMappings(user, domain, mappingLimit);
     }
@@ -185,10 +180,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
         return null;
     }
 
-    /**
-     * @see org.apache.james.rrt.api.RecipientRewriteTable#addRegexMapping(java.lang.String,
-     *      java.lang.String, java.lang.String)
-     */
+    @Override
     public void addRegexMapping(String user, String domain, String regex) throws RecipientRewriteTableException {
         try {
             Pattern.compile(regex);
@@ -202,19 +194,13 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
 
     }
 
-    /**
-     * @see org.apache.james.rrt.api.RecipientRewriteTable#removeRegexMapping(java.lang.String,
-     *      java.lang.String, java.lang.String)
-     */
+    @Override
     public void removeRegexMapping(String user, String domain, String regex) throws RecipientRewriteTableException {
         LOGGER.info("Remove regex mapping => {} for user: {} domain: {}", regex, user, domain);
         removeMappingInternal(user, domain, MappingImpl.regex(regex));
     }
 
-    /**
-     * @see org.apache.james.rrt.api.RecipientRewriteTable#addAddressMapping(java.lang.String,
-     *      java.lang.String, java.lang.String)
-     */
+    @Override
     public void addAddressMapping(String user, String domain, String address) throws RecipientRewriteTableException {
         if (address.indexOf('@') < 0) {
             try {
@@ -234,10 +220,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
 
     }
 
-    /**
-     * @see org.apache.james.rrt.api.RecipientRewriteTable#removeAddressMapping(java.lang.String,
-     *      java.lang.String, java.lang.String)
-     */
+    @Override
     public void removeAddressMapping(String user, String domain, String address) throws RecipientRewriteTableException {
         if (address.indexOf('@') < 0) {
             try {
@@ -250,10 +233,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
         removeMappingInternal(user, domain, MappingImpl.address(address));
     }
 
-    /**
-     * @see org.apache.james.rrt.api.RecipientRewriteTable#addErrorMapping(java.lang.String,
-     *      java.lang.String, java.lang.String)
-     */
+    @Override
     public void addErrorMapping(String user, String domain, String error) throws RecipientRewriteTableException {
         checkMapping(user, domain, MappingImpl.error(error));
         LOGGER.info("Add error mapping => {} for user: {} domain: {}", error, user, domain);
@@ -261,19 +241,13 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
 
     }
 
-    /**
-     * @see org.apache.james.rrt.api.RecipientRewriteTable#removeErrorMapping(java.lang.String,
-     *      java.lang.String, java.lang.String)
-     */
+    @Override
     public void removeErrorMapping(String user, String domain, String error) throws RecipientRewriteTableException {
         LOGGER.info("Remove error mapping => {} for user: {} domain: {}", error, user, domain);
         removeMappingInternal(user, domain, MappingImpl.error(error));
     }
 
-    /**
-     * @see org.apache.james.rrt.api.RecipientRewriteTable#addMapping(java.lang.String,
-     *      java.lang.String, java.lang.String)
-     */
+    @Override
     public void addMapping(String user, String domain, String mapping) throws RecipientRewriteTableException {
 
         String map = mapping.toLowerCase(Locale.US);
@@ -293,10 +267,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
 
     }
 
-    /**
-     * @see org.apache.james.rrt.api.RecipientRewriteTable#removeMapping(java.lang.String,
-     *      java.lang.String, java.lang.String)
-     */
+    @Override
     public void removeMapping(String user, String domain, String mapping) throws RecipientRewriteTableException {
 
         String map = mapping.toLowerCase(Locale.US);
@@ -316,9 +287,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
 
     }
 
-    /**
-     * @see org.apache.james.rrt.api.RecipientRewriteTable#getAllMappings()
-     */
+    @Override
     public Map<String, Mappings> getAllMappings() throws RecipientRewriteTableException {
         int count = 0;
         Map<String, Mappings> mappings = getAllMappingsInternal();
@@ -330,27 +299,18 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
         return mappings;
     }
 
-    /**
-     * @see org.apache.james.rrt.api.RecipientRewriteTable#getUserDomainMappings(java.lang.String,
-     *      java.lang.String)
-     */
+    @Override
     public Mappings getUserDomainMappings(String user, String domain) throws RecipientRewriteTableException {
         return getUserDomainMappingsInternal(user, domain);
     }
 
-    /**
-     * @see org.apache.james.rrt.api.RecipientRewriteTable#addAliasDomainMapping(java.lang.String,
-     *      java.lang.String)
-     */
+    @Override
     public void addAliasDomainMapping(String aliasDomain, String realDomain) throws RecipientRewriteTableException {
         LOGGER.info("Add domain mapping: {} => {}", aliasDomain, realDomain);
         addMappingInternal(null, aliasDomain, MappingImpl.domain(realDomain));
     }
 
-    /**
-     * @see org.apache.james.rrt.api.RecipientRewriteTable#removeAliasDomainMapping(java.lang.String,
-     *      java.lang.String)
-     */
+    @Override
     public void removeAliasDomainMapping(String aliasDomain, String realDomain) throws RecipientRewriteTableException {
         LOGGER.info("Remove domain mapping: {} => {}", aliasDomain, realDomain);
         removeMappingInternal(null, aliasDomain, MappingImpl.domain(realDomain));

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
index 879ccfb..109f2a3 100644
--- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
+++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
@@ -46,11 +46,7 @@ public class RecipientRewriteTableManagement extends StandardMBean implements Re
         this.rrt = rrt;
     }
 
-    /**
-     * @see
-     * org.apache.james.rrt.api.RecipientRewriteTableManagementMBean#addRegexMapping
-     * (java.lang.String, java.lang.String, java.lang.String)
-     */
+    @Override
     public void addRegexMapping(String user, String domain, String regex) throws Exception {
         try {
             rrt.addRegexMapping(user, domain, regex);
@@ -59,11 +55,7 @@ public class RecipientRewriteTableManagement extends StandardMBean implements Re
         }
     }
 
-    /**
-     * @see
-     * org.apache.james.rrt.api.RecipientRewriteTableManagementMBean#removeRegexMapping
-     * (java.lang.String, java.lang.String, java.lang.String)
-     */
+    @Override
     public void removeRegexMapping(String user, String domain, String regex) throws Exception {
         try {
             rrt.removeRegexMapping(user, domain, regex);
@@ -72,11 +64,7 @@ public class RecipientRewriteTableManagement extends StandardMBean implements Re
         }
     }
 
-    /**
-     * @see
-     * org.apache.james.rrt.api.RecipientRewriteTableManagementMBean#addAddressMapping
-     * (java.lang.String, java.lang.String, java.lang.String)
-     */
+    @Override
     public void addAddressMapping(String user, String domain, String address) throws Exception {
         try {
             rrt.addAddressMapping(user, domain, address);
@@ -85,11 +73,7 @@ public class RecipientRewriteTableManagement extends StandardMBean implements Re
         }
     }
 
-    /**
-     * @see
-     * org.apache.james.rrt.api.RecipientRewriteTableManagementMBean#removeAddressMapping
-     * (java.lang.String, java.lang.String, java.lang.String)
-     */
+    @Override
     public void removeAddressMapping(String user, String domain, String address) throws Exception {
         try {
             rrt.removeAddressMapping(user, domain, address);
@@ -98,11 +82,7 @@ public class RecipientRewriteTableManagement extends StandardMBean implements Re
         }
     }
 
-    /**
-     * @see
-     * org.apache.james.rrt.api.RecipientRewriteTableManagementMBean#addErrorMapping
-     * (java.lang.String, java.lang.String, java.lang.String)
-     */
+    @Override
     public void addErrorMapping(String user, String domain, String error) throws Exception {
         try {
             rrt.addErrorMapping(user, domain, error);
@@ -111,11 +91,7 @@ public class RecipientRewriteTableManagement extends StandardMBean implements Re
         }
     }
 
-    /**
-     * @see
-     * org.apache.james.rrt.api.RecipientRewriteTableManagementMBean#removeErrorMapping
-     * (java.lang.String, java.lang.String, java.lang.String)
-     */
+    @Override
     public void removeErrorMapping(String user, String domain, String error) throws Exception {
         try {
             rrt.removeErrorMapping(user, domain, error);
@@ -124,6 +100,7 @@ public class RecipientRewriteTableManagement extends StandardMBean implements Re
         }
     }
 
+    @Override
     public void addDomainMapping(String domain, String targetDomain) throws Exception {
         try {
             rrt.addAliasDomainMapping(domain, targetDomain);
@@ -132,6 +109,7 @@ public class RecipientRewriteTableManagement extends StandardMBean implements Re
         }
     }
 
+    @Override
     public void removeDomainMapping(String domain, String targetDomain) throws Exception {
         try {
             rrt.removeAliasDomainMapping(domain, targetDomain);
@@ -140,10 +118,7 @@ public class RecipientRewriteTableManagement extends StandardMBean implements Re
         }
     }
 
-    /**
-     * @see org.apache.james.rrt.api.RecipientRewriteTableManagementMBean
-     * #getUserDomainMappings(java.lang.String, java.lang.String)
-     */
+    @Override
     public Mappings getUserDomainMappings(String user, String domain) throws Exception {
         try {
             return rrt.getUserDomainMappings(user, domain);
@@ -152,11 +127,7 @@ public class RecipientRewriteTableManagement extends StandardMBean implements Re
         }
     }
 
-    /**
-     * @see
-     * org.apache.james.rrt.api.RecipientRewriteTableManagementMBean
-     * #addMapping(java.lang.String, java.lang.String, java.lang.String)
-     */
+    @Override
     public void addMapping(String user, String domain, String mapping) throws Exception {
         try {
             rrt.addMapping(user, domain, mapping);
@@ -165,11 +136,7 @@ public class RecipientRewriteTableManagement extends StandardMBean implements Re
         }
     }
 
-    /**
-     * @see
-     * org.apache.james.rrt.api.RecipientRewriteTableManagementMBean#removeMapping
-     * (java.lang.String, java.lang.String, java.lang.String)
-     */
+    @Override
     public void removeMapping(String user, String domain, String mapping) throws Exception {
         try {
             rrt.removeMapping(user, domain, mapping);
@@ -178,10 +145,7 @@ public class RecipientRewriteTableManagement extends StandardMBean implements Re
         }
     }
 
-    /**
-     * @see
-     * org.apache.james.rrt.api.RecipientRewriteTableManagementMBean#getAllMappings()
-     */
+    @Override
     public Map<String, Mappings> getAllMappings() throws Exception {
         try {
             return ImmutableMap.copyOf(rrt.getAllMappings());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java b/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
index 89ca24c..45f57b3 100644
--- a/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
@@ -92,10 +92,7 @@ public abstract class AbstractJamesUsersRepository extends AbstractUsersReposito
      */
     protected abstract void doUpdateUser(User user) throws UsersRepositoryException;
 
-    /**
-     * @see
-     * org.apache.james.user.lib.AbstractUsersRepository#doAddUser(java.lang.String, java.lang.String)
-     */
+    @Override
     protected void doAddUser(String username, String password) throws UsersRepositoryException {
         User newbie = new DefaultJamesUser(username, "SHA");
         newbie.setPassword(password);
@@ -110,6 +107,7 @@ public abstract class AbstractJamesUsersRepository extends AbstractUsersReposito
      *            the user to be updated
      * @throws UsersRepositoryException
      */
+    @Override
     public void updateUser(User user) throws UsersRepositoryException {
         // Return false if it's not found.
         if (!contains(user.getUserName())) {
@@ -119,11 +117,7 @@ public abstract class AbstractJamesUsersRepository extends AbstractUsersReposito
         }
     }
 
-    /**
-     * @throws RecipientRewriteTableException
-     * @see org.apache.james.rrt.api.RecipientRewriteTable#getMappings(java.lang.String,
-     *      java.lang.String)
-     */
+    @Override
     public Mappings getMappings(String username, String domain) throws ErrorMappingException, RecipientRewriteTableException {
         Builder mappingsBuilder = MappingsImpl.builder();
         try {
@@ -160,30 +154,22 @@ public abstract class AbstractJamesUsersRepository extends AbstractUsersReposito
         }
     }
 
-    /**
-     * @see org.apache.james.user.api.JamesUsersRepository#setEnableAliases(boolean)
-     */
+    @Override
     public void setEnableAliases(boolean enableAliases) {
         this.enableAliases = enableAliases;
     }
 
-    /**
-     * @see org.apache.james.user.api.JamesUsersRepository#setEnableForwarding(boolean)
-     */
+    @Override
     public void setEnableForwarding(boolean enableForwarding) {
         this.enableForwarding = enableForwarding;
     }
 
-    /**
-     * @see org.apache.james.user.api.JamesUsersRepository#setIgnoreCase(boolean)
-     */
+    @Override
     public void setIgnoreCase(boolean ignoreCase) {
         this.ignoreCase = ignoreCase;
     }
 
-    /**
-     * @see org.apache.james.rrt.api.RecipientRewriteTable#getAllMappings()
-     */
+    @Override
     public Map<String, Mappings> getAllMappings() throws RecipientRewriteTableException {
         Map<String, Mappings> mappings = new HashMap<>();
         if (enableAliases || enableForwarding) {
@@ -215,58 +201,65 @@ public abstract class AbstractJamesUsersRepository extends AbstractUsersReposito
         return mappings;
     }
 
-    /**
-     * @see
-     * org.apache.james.rrt.api.RecipientRewriteTable#getUserDomainMappings(java.lang.String, java.lang.String)
-     */
+    @Override
     public Mappings getUserDomainMappings(String user, String domain) throws RecipientRewriteTableException {
         return MappingsImpl.empty();
     }
 
+    @Override
     public void addRegexMapping(String user, String domain, String regex) throws RecipientRewriteTableException {
         throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
     }
 
+    @Override
     public void removeRegexMapping(String user, String domain, String regex) throws RecipientRewriteTableException {
         throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
 
     }
 
+    @Override
     public void addAddressMapping(String user, String domain, String address) throws RecipientRewriteTableException {
         throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
 
     }
 
+    @Override
     public void removeAddressMapping(String user, String domain, String address) throws RecipientRewriteTableException {
         throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
 
     }
 
+    @Override
     public void addErrorMapping(String user, String domain, String error) throws RecipientRewriteTableException {
         throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
 
     }
 
+    @Override
     public void removeErrorMapping(String user, String domain, String error) throws RecipientRewriteTableException {
         throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
 
     }
 
+    @Override
     public void addMapping(String user, String domain, String mapping) throws RecipientRewriteTableException {
         throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
 
     }
 
+    @Override
     public void removeMapping(String user, String domain, String mapping) throws RecipientRewriteTableException {
         throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
 
     }
 
+    @Override
     public void addAliasDomainMapping(String aliasDomain, String realDomain) throws RecipientRewriteTableException {
         throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
 
     }
 
+    @Override
     public void removeAliasDomainMapping(String aliasDomain, String realDomain) throws RecipientRewriteTableException {
         throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java b/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java
index 2ea075f..9ec041c 100644
--- a/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java
@@ -41,10 +41,7 @@ public abstract class AbstractUsersRepository implements UsersRepository, Config
     private boolean virtualHosting;
     private Optional<String> administratorId;
 
-    /**
-     * @see
-     * org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
-     */
+    @Override
     public void configure(HierarchicalConfiguration configuration) throws ConfigurationException {
 
         virtualHosting = configuration.getBoolean("enableVirtualHosting", getDefaultVirtualHostingValue());
@@ -93,10 +90,7 @@ public abstract class AbstractUsersRepository implements UsersRepository, Config
         }
     }
 
-    /**
-     * @see org.apache.james.user.api.UsersRepository#addUser(java.lang.String,
-     * java.lang.String)
-     */
+    @Override
     public void addUser(String username, String password) throws UsersRepositoryException {
 
         if (!contains(username)) {
@@ -108,9 +102,7 @@ public abstract class AbstractUsersRepository implements UsersRepository, Config
 
     }
 
-    /**
-     * @see org.apache.james.user.api.UsersRepository#supportVirtualHosting()
-     */
+    @Override
     public boolean supportVirtualHosting() {
         return virtualHosting;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultJamesUser.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultJamesUser.java b/server/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultJamesUser.java
index a635e18..6ed3f1f 100644
--- a/server/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultJamesUser.java
+++ b/server/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultJamesUser.java
@@ -72,62 +72,46 @@ public class DefaultJamesUser extends DefaultUser implements JamesUser {
         alias = "";
     }
 
-    /**
-     * @see org.apache.james.user.api.model.JamesUser#setForwarding(boolean)
-     */
+    @Override
     public void setForwarding(boolean forward) {
         forwarding = forward;
     }
 
-    /**
-     * @see org.apache.james.user.api.model.JamesUser#getForwarding()
-     */
+    @Override
     public boolean getForwarding() {
         return forwarding;
     }
 
-    /**
-     * @see org.apache.james.user.api.model.JamesUser#setForwardingDestination(MailAddress)
-     */
+    @Override
     public boolean setForwardingDestination(MailAddress address) {
         /* TODO: Some verification would be good */
         forwardingDestination = address;
         return true;
     }
 
-    /**
-     * @see org.apache.james.user.api.model.JamesUser#getForwardingDestination()
-     */
+    @Override
     public MailAddress getForwardingDestination() {
         return forwardingDestination;
     }
 
-    /**
-     * @see org.apache.james.user.api.model.JamesUser#setAliasing(boolean)
-     */
+    @Override
     public void setAliasing(boolean alias) {
         aliasing = alias;
     }
 
-    /**
-     * @see org.apache.james.user.api.model.JamesUser#getAliasing()
-     */
+    @Override
     public boolean getAliasing() {
         return aliasing;
     }
 
-    /**
-     * @see org.apache.james.user.api.model.JamesUser#setAlias(java.lang.String)
-     */
+    @Override
     public boolean setAlias(String address) {
         /* TODO: Some verification would be good */
         alias = address;
         return true;
     }
 
-    /**
-     * @see org.apache.james.user.api.model.JamesUser#getAlias()
-     */
+    @Override
     public String getAlias() {
         return alias;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java b/server/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java
index 891c076..9a565b5 100644
--- a/server/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java
+++ b/server/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java
@@ -67,16 +67,12 @@ public class DefaultUser implements User, Serializable {
         algorithm = hashAlg;
     }
 
-    /**
-     * @see org.apache.james.user.api.model.User#getUserName()
-     */
+    @Override
     public String getUserName() {
         return userName;
     }
 
-    /**
-     * @see org.apache.james.user.api.model.User#verifyPassword(java.lang.String)
-     */
+    @Override
     public boolean verifyPassword(String pass) {
         try {
             String hashGuess = DigestUtil.digestString(pass, algorithm);
@@ -86,9 +82,7 @@ public class DefaultUser implements User, Serializable {
         }
     }
 
-    /**
-     * @see org.apache.james.user.api.model.User#setPassword(java.lang.String)
-     */
+    @Override
     public boolean setPassword(String newPass) {
         try {
             hashedPassword = DigestUtil.digestString(newPass, algorithm);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-memory/src/test/java/org/apache/james/domainlist/memory/MemoryDomainListTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-memory/src/test/java/org/apache/james/domainlist/memory/MemoryDomainListTest.java b/server/data/data-memory/src/test/java/org/apache/james/domainlist/memory/MemoryDomainListTest.java
index 3cde69f..2095aa5 100644
--- a/server/data/data-memory/src/test/java/org/apache/james/domainlist/memory/MemoryDomainListTest.java
+++ b/server/data/data-memory/src/test/java/org/apache/james/domainlist/memory/MemoryDomainListTest.java
@@ -25,6 +25,7 @@ import org.junit.Before;
 
 public class MemoryDomainListTest extends AbstractDomainListTest {
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/MemoryRecipientRewriteTableTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/MemoryRecipientRewriteTableTest.java b/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/MemoryRecipientRewriteTableTest.java
index 999cbef..509b76f 100644
--- a/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/MemoryRecipientRewriteTableTest.java
+++ b/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/MemoryRecipientRewriteTableTest.java
@@ -28,11 +28,13 @@ import org.junit.Before;
 
 public class MemoryRecipientRewriteTableTest extends AbstractRecipientRewriteTableTest {
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         super.tearDown();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-memory/src/test/java/org/apache/james/user/memory/MemoryUsersRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-memory/src/test/java/org/apache/james/user/memory/MemoryUsersRepositoryTest.java b/server/data/data-memory/src/test/java/org/apache/james/user/memory/MemoryUsersRepositoryTest.java
index 05e096c..7aa49cb 100644
--- a/server/data/data-memory/src/test/java/org/apache/james/user/memory/MemoryUsersRepositoryTest.java
+++ b/server/data/data-memory/src/test/java/org/apache/james/user/memory/MemoryUsersRepositoryTest.java
@@ -25,6 +25,7 @@ import org.junit.Before;
 
 public class MemoryUsersRepositoryTest extends AbstractUsersRepositoryTest {
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/MockDNSService.java
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/MockDNSService.java b/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/MockDNSService.java
index 5f30924..b7c238c 100644
--- a/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/MockDNSService.java
+++ b/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/MockDNSService.java
@@ -29,49 +29,31 @@ import org.apache.james.dnsservice.api.DNSService;
  */
 public class MockDNSService implements DNSService {
 
-    /**
-     * @see org.apache.james.dnsservice.api.DNSService#findMXRecords(String)
-     */
     @Override
     public Collection<String> findMXRecords(String hostname) {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
-    /**
-     * @see org.apache.james.dnsservice.api.DNSService#findTXTRecords(String)
-     */
     @Override
     public Collection<String> findTXTRecords(String hostname) {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
-    /**
-     * @see org.apache.james.dnsservice.api.DNSService#getAllByName(String)
-     */
     @Override
     public Collection<InetAddress> getAllByName(String host) throws UnknownHostException {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
-    /**
-     * @see org.apache.james.dnsservice.api.DNSService#getByName(String)
-     */
     @Override
     public InetAddress getByName(String host) throws UnknownHostException {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
-    /**
-     * @see org.apache.james.dnsservice.api.DNSService#getHostName(java.net.InetAddress)
-     */
     @Override
     public String getHostName(InetAddress addr) {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
-    /**
-     * @see org.apache.james.dnsservice.api.DNSService#getLocalHost()
-     */
     @Override
     public InetAddress getLocalHost() throws UnknownHostException {
         throw new UnsupportedOperationException("Unimplemented Stub Method");

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java b/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
index 0230768..fe8e6d7 100644
--- a/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
+++ b/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
@@ -397,6 +397,7 @@ public class DNSJavaService implements DNSService, DNSServiceMBean, Configurable
      * < 0 ==> a < b = 0 ==> a = b > 0 ==> a > b
      */
     private static class MXRecordComparator implements Comparator<MXRecord> {
+        @Override
         public int compare(MXRecord a, MXRecord b) {
             int pa = a.getPriority();
             int pb = b.getPriority();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/MXHostAddressIterator.java
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/MXHostAddressIterator.java b/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/MXHostAddressIterator.java
index 8e4d1fa..9684e90 100644
--- a/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/MXHostAddressIterator.java
+++ b/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/MXHostAddressIterator.java
@@ -107,9 +107,6 @@ public class MXHostAddressIterator implements Iterator<HostAddress> {
         return addresses.next();
     }
 
-    /**
-     * Not supported.
-     */
     @Override
     public void remove() {
         throw new UnsupportedOperationException("remove not supported by this iterator");

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/SmtpConfiguration.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/SmtpConfiguration.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/SmtpConfiguration.java
index de9a23b..fc4fac5 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/SmtpConfiguration.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/SmtpConfiguration.java
@@ -121,6 +121,7 @@ public class SmtpConfiguration implements SerializableAsXml {
         this.maxMessageSizeInKb = maxMessageSizeInKb;
     }
 
+    @Override
     public String serializeAsXml() throws IOException {
         HashMap<String, Object> scopes = new HashMap<>();
         scopes.put("hasAuthorizedAddresses", authorizedAddresses.isPresent());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
index b077060..f9b6a0b 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
@@ -106,9 +106,7 @@ public class JamesMailSpooler implements Runnable, Disposable, Configurable, Mai
         this.mailProcessor = mailProcessor;
     }
 
-    /**
-     * @see org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
-     */
+    @Override
     public void configure(HierarchicalConfiguration config) throws ConfigurationException {
         numDequeueThreads = config.getInt("dequeueThreads", 2);
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
index 209faa8..7579d39 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
@@ -136,8 +136,6 @@ public class JamesMailetContext implements MailetContext, Configurable {
      * is different than a mail-client's reply, which would use the Reply-To or
      * From header. This will send the bounce with the server's postmaster as
      * the sender.
-     *
-     * @see org.apache.mailet.MailetContext#bounce(Mail, String)
      */
     @Override
     public void bounce(Mail mail, String message) throws MessagingException {
@@ -170,8 +168,6 @@ public class JamesMailetContext implements MailetContext, Configurable {
      * multipart (mixed)/ contentPartRoot (body) = mpContent (alternative)/ part
      * (body) = message part (body) = original
      * </p>
-     *
-     * @see org.apache.mailet.MailetContext#bounce(Mail, String, MailAddress)
      */
     @Override
     public void bounce(Mail mail, String message, MailAddress bouncer) throws MessagingException {
@@ -392,6 +388,7 @@ public class JamesMailetContext implements MailetContext, Configurable {
         sendMail(sender, recipients, message);
     }
 
+    @Override
     public void sendMail(MailAddress sender, Collection<MailAddress> recipients, MimeMessage message) throws MessagingException {
         sendMail(sender, recipients, message, Mail.DEFAULT);
     }
@@ -420,6 +417,7 @@ public class JamesMailetContext implements MailetContext, Configurable {
         rootMailQueue.enQueue(mail, delay, unit);
     }
 
+    @Override
     public void sendMail(MailAddress sender, Collection<MailAddress> recipients, MimeMessage message, String state) throws MessagingException {
         MailImpl mail = new MailImpl(MailImpl.getId(), sender, recipients, message);
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java
index b41bb53..ed40f79 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java
@@ -64,6 +64,7 @@ public class MailetConfigImpl implements MailetConfig {
      * 
      * @return the parameter value
      */
+    @Override
     public String getInitParameter(String name) {
         return configuration.getString(name);
     }
@@ -71,6 +72,7 @@ public class MailetConfigImpl implements MailetConfig {
     /**
      * @return an iterator over the set of configuration parameter names.
      */
+    @Override
     public Iterator<String> getInitParameterNames() {
         Iterator<String> it = configuration.getKeys();
         List<String> params = new ArrayList<>();
@@ -98,11 +100,7 @@ public class MailetConfigImpl implements MailetConfig {
         return configuration.getString("[@" + name + "]", null);
     }
 
-    /**
-     * Get the mailet's MailetContext object.
-     * 
-     * @return the MailetContext for the mailet
-     */
+    @Override
     public MailetContext getMailetContext() {
         return mailetContext;
     }
@@ -153,11 +151,7 @@ public class MailetConfigImpl implements MailetConfig {
         configuration = builder;
     }
 
-    /**
-     * Get the name of the mailet.
-     * 
-     * @return the name of the mailet
-     */
+    @Override
     public String getMailetName() {
         return name;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherConfigImpl.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherConfigImpl.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherConfigImpl.java
index 2a4ed12..39cec65 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherConfigImpl.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherConfigImpl.java
@@ -42,6 +42,7 @@ public class MatcherConfigImpl implements MatcherConfig {
      * 
      * @return a String containing the value of the initialization parameter
      */
+    @Override
     public String getCondition() {
         return condition;
     }
@@ -61,6 +62,7 @@ public class MatcherConfigImpl implements MatcherConfig {
      * 
      * @return the name of the matcher instance
      */
+    @Override
     public String getMatcherName() {
         return name;
     }
@@ -82,6 +84,7 @@ public class MatcherConfigImpl implements MatcherConfig {
      * @return a MailetContext object, used by the matcher to interact with its
      *         mailet container
      */
+    @Override
     public MailetContext getMailetContext() {
         return context;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java
index c4e4b3d..14aeaeb 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java
@@ -69,6 +69,7 @@ public class CamelCompositeProcessor extends AbstractStateCompositeProcessor imp
         this.mailetContext = mailetContext;
     }
 
+    @Override
     @PostConstruct
     public void init() throws Exception {
         super.init();
@@ -88,24 +89,17 @@ public class CamelCompositeProcessor extends AbstractStateCompositeProcessor imp
         }
     }
 
-    /**
-     * @see org.apache.camel.CamelContextAware#getCamelContext()
-     */
+    @Override
     public CamelContext getCamelContext() {
         return camelContext;
     }
 
-    /**
-     * @see org.apache.camel.CamelContextAware#setCamelContext(org.apache.camel.CamelContext)
-     */
+    @Override
     public void setCamelContext(CamelContext camelContext) {
         this.camelContext = camelContext;
     }
 
-    /**
-     * @see org.apache.james.mailetcontainer.lib.AbstractStateCompositeProcessor
-     * #createMailProcessor(java.lang.String, org.apache.commons.configuration.HierarchicalConfiguration)
-     */
+    @Override
     protected MailProcessor createMailProcessor(String name, HierarchicalConfiguration config) throws Exception {
         CamelMailetProcessor processor = new CamelMailetProcessor(metricFactory);
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java
index 4f10b80..b4808c8 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java
@@ -64,10 +64,7 @@ public class CamelMailetProcessor extends AbstractStateMailetProcessor implement
         this.metricFactory = metricFactory;
     }
 
-    /**
-     * @see
-     * org.apache.james.mailetcontainer.api.MailProcessor#service(org.apache.mailet.Mail)
-     */
+    @Override
     public void service(Mail mail) throws MessagingException {
         try {
             producerTemplate.sendBody(getEndpoint(), mail);
@@ -77,16 +74,12 @@ public class CamelMailetProcessor extends AbstractStateMailetProcessor implement
         }
     }
 
-    /**
-     * @see org.apache.camel.CamelContextAware#getCamelContext()
-     */
+    @Override
     public CamelContext getCamelContext() {
         return context;
     }
 
-    /**
-     * @see org.apache.camel.CamelContextAware#setCamelContext(org.apache.camel.CamelContext)
-     */
+    @Override
     public void setCamelContext(CamelContext context) {
         this.context = context;
     }
@@ -106,6 +99,7 @@ public class CamelMailetProcessor extends AbstractStateMailetProcessor implement
         return "direct:processor." + getState();
     }
 
+    @Override
     @PostConstruct
     public void init() throws Exception {
         producerTemplate = context.createProducerTemplate();
@@ -116,11 +110,7 @@ public class CamelMailetProcessor extends AbstractStateMailetProcessor implement
         super.init();
     }
 
-    /**
-     * @see
-     * org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor#setupRouting
-     * (java.util.List)
-     */
+    @Override
     protected void setupRouting(List<MatcherMailetPair> pairs) throws MessagingException {
         try {
             this.pairs = pairs;
@@ -198,6 +188,7 @@ public class CamelMailetProcessor extends AbstractStateMailetProcessor implement
 
         private final class RemovePropertiesProcessor implements Processor {
 
+            @Override
             public void process(Exchange exchange) throws Exception {
                 exchange.removeProperty(MatcherSplitter.ON_MATCH_EXCEPTION_PROPERTY);
                 exchange.removeProperty(MatcherSplitter.MATCHER_PROPERTY);
@@ -206,6 +197,7 @@ public class CamelMailetProcessor extends AbstractStateMailetProcessor implement
 
         private final class CompleteProcessor implements Processor {
 
+            @Override
             public void process(Exchange ex) throws Exception {
                 LOGGER.debug("End of mailetprocessor for state {} reached", getState());
                 ex.setProperty(Exchange.ROUTE_STOP, true);
@@ -214,6 +206,7 @@ public class CamelMailetProcessor extends AbstractStateMailetProcessor implement
 
         private final class StateChangedProcessor implements Processor {
 
+            @Override
             public void process(Exchange arg0) throws Exception {
                 Mail mail = arg0.getIn().getBody(Mail.class);
                 toProcessor(mail);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java
index e5da468..3b3eba8 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java
@@ -64,6 +64,7 @@ public class CamelProcessor implements Processor {
     /**
      * Call the wrapped mailet for the exchange
      */
+    @Override
     public void process(Exchange exchange) throws Exception {
         Mail mail = exchange.getIn().getBody(Mail.class);
         long start = System.currentTimeMillis();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/DisposeProcessor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/DisposeProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/DisposeProcessor.java
index 0160596..84cf661 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/DisposeProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/DisposeProcessor.java
@@ -29,9 +29,7 @@ import org.apache.mailet.Mail;
  */
 public class DisposeProcessor implements Processor {
 
-    /**
-     * @see org.apache.camel.Processor#process(org.apache.camel.Exchange)
-     */
+    @Override
     public void process(Exchange arg0) throws Exception {
         Mail mail = arg0.getIn().getBody(Mail.class);
         LifecycleUtil.dispose(mail.getMessage());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateEquals.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateEquals.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateEquals.java
index 486d773..6f2b00d 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateEquals.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateEquals.java
@@ -33,9 +33,7 @@ public class MailStateEquals implements Predicate {
         this.state = state;
     }
 
-    /**
-     * @see org.apache.camel.Predicate#matches(org.apache.camel.Exchange)
-     */
+    @Override
     public boolean matches(Exchange ex) {
         Mail m = ex.getIn().getBody(Mail.class);
         return state.equals(m.getState());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateNotEquals.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateNotEquals.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateNotEquals.java
index 88f1b1a..11b124e 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateNotEquals.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateNotEquals.java
@@ -33,9 +33,7 @@ public class MailStateNotEquals implements Predicate {
         this.state = state;
     }
 
-    /**
-     * @see org.apache.camel.Predicate#matches(org.apache.camel.Exchange)
-     */
+    @Override
     public boolean matches(Exchange ex) {
         Mail m = ex.getIn().getBody(Mail.class);
         return !state.equals(m.getState());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherMatch.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherMatch.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherMatch.java
index 172a0ae..038f05d 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherMatch.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherMatch.java
@@ -30,9 +30,7 @@ import org.apache.mailet.Mail;
  */
 public class MatcherMatch implements Predicate {
 
-    /**
-     * @see org.apache.camel.Predicate#matches(org.apache.camel.Exchange)
-     */
+    @Override
     public boolean matches(Exchange arg0) {
         Mail m = arg0.getIn().getBody(Mail.class);
         return m.removeAttribute(MatcherSplitter.MATCHER_MATCHED_ATTRIBUTE) != null;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java
index f4839d1..098cbe3 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java
@@ -110,12 +110,7 @@ public class JMXStateCompositeProcessorListener implements CompositeProcessorLis
 
     }
 
-    /**
-     * @see
-     * org.apache.james.mailetcontainer.lib.AbstractStateCompositeProcessor.CompositeProcessorListener
-     * #afterProcessor(org.apache.james.mailetcontainer.api.MailProcessor, java.lang.String,
-     * long, javax.mail.MessagingException)
-     */
+    @Override
     public void afterProcessor(MailProcessor processor, String mailName, long processTime, MessagingException e) {
         MailProcessorManagement m = mMap.get(processor);
         if (m != null) {
@@ -123,9 +118,7 @@ public class JMXStateCompositeProcessorListener implements CompositeProcessorLis
         }
     }
 
-    /**
-     * @see org.apache.james.lifecycle.api.Disposable#dispose()
-     */
+    @Override
     public void dispose() {
         unregisterMBeans();
         mMap.clear();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
index 496b109..4a07dba 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
@@ -61,11 +61,7 @@ public class JMXStateMailetProcessorListener implements MailetProcessorListener,
         registerMBeans();
     }
 
-    /**
-     * @see
-     * org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor.MailetProcessorListener
-     * #afterMailet(org.apache.mailet.Mailet, java.lang.String, java.lang.String, long, java.lang.Exception)
-     */
+    @Override
     public void afterMailet(Mailet m, String mailName, String state, long processTime, Exception e) {
         MailetManagement mgmt = mailetMap.get(m);
         if (mgmt != null) {
@@ -73,12 +69,7 @@ public class JMXStateMailetProcessorListener implements MailetProcessorListener,
         }
     }
 
-    /**
-     * @see
-     * org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor.MailetProcessorListener
-     * #afterMatcher(org.apache.mailet.Matcher, java.lang.String, java.util.Collection,
-     * java.util.Collection, long, java.lang.Exception)
-     */
+    @Override
     public void afterMatcher(Matcher m, String mailName, Collection<MailAddress> rcpts, Collection<MailAddress> matches, long processTime, Exception e) {
         MatcherManagement mgmt = matcherMap.get(m);
 
@@ -162,9 +153,7 @@ public class JMXStateMailetProcessorListener implements MailetProcessorListener,
 
     }
 
-    /**
-     * @see org.apache.james.lifecycle.api.Disposable#dispose()
-     */
+    @Override
     public void dispose() {
         unregisterMBeans();
         mailetMap.clear();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java
index 9022021..4e3f567 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java
@@ -70,9 +70,7 @@ public class MailProcessorManagement extends StandardMBean implements MailProces
 
     }
 
-    /**
-     * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getHandledMailCount()
-     */
+    @Override
     public long getHandledMailCount() {
         return getSuccessCount() + getErrorCount();
     }
@@ -80,7 +78,7 @@ public class MailProcessorManagement extends StandardMBean implements MailProces
     /*
      * TODO
      * Is deprecated or dead code? Can't find an interface defining this method
-     * 
+     *
      * @see
      * org.apache.james.mailetcontainer.api.jmx.MailProcessorDetailMBean#getName()
      */
@@ -88,39 +86,27 @@ public class MailProcessorManagement extends StandardMBean implements MailProces
         return processorName;
     }
 
-    /**
-     * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getFastestProcessing()
-     */
+    @Override
     public long getFastestProcessing() {
         return fastestProcessing.get();
     }
 
-    /**
-     * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getSlowestProcessing()
-     */
+    @Override
     public long getSlowestProcessing() {
         return slowestProcessing.get();
     }
 
-    /**
-     * @see
-     * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getErrorCount()
-     */
+    @Override
     public long getErrorCount() {
         return errorCount.get();
     }
 
-    /**
-     * @see
-     * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getSuccessCount()
-     */
+    @Override
     public long getSuccessCount() {
         return successCount.get();
     }
 
-    /**
-     * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getLastProcessing()
-     */
+    @Override
     public long getLastProcessing() {
         return lastProcessing.get();
     }


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


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

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java
index 3c7e0d7..bda86b0 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java
@@ -47,6 +47,7 @@ public class NettyStreamImapRequestLineReader extends AbstractNettyImapRequestLi
      * @throws DecodingException
      *             If the end-of-stream is reached.
      */
+    @Override
     public char nextChar() throws DecodingException {
         
         if (!nextSeen) {
@@ -79,6 +80,7 @@ public class NettyStreamImapRequestLineReader extends AbstractNettyImapRequestLi
      * @throws DecodingException
      *             If a char can't be read into each array element.
      */
+    @Override
     public InputStream read(int size, boolean extraCRLF) throws DecodingException {
 
         // Unset the next char.

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
index 8d4492f..a6e7b54 100644
--- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
+++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
@@ -41,13 +41,7 @@ public abstract class AbstractCommandHandlerResultJMXMonitor<S extends ProtocolS
     private final Map<String, AbstractCommandHandlerStats> cStats = new HashMap<>();
     private String jmxName;
 
-    /**
-     * @see
-     * org.apache.james.protocols.api.handler.ProtocolHandlerResultHandler#onResponse(
-     * org.apache.james.protocols.api.ProtocolSession,
-     * org.apache.james.protocols.api.Response, long,
-     * org.apache.james.protocols.api.handler.ProtocolHandler)
-     */
+    @Override
     public Response onResponse(ProtocolSession session, Response response, long executionTime, ProtocolHandler handler) {
         if (handler instanceof CommandHandler) {
             String name = handler.getClass().getName();
@@ -59,20 +53,14 @@ public abstract class AbstractCommandHandlerResultJMXMonitor<S extends ProtocolS
         return response;
     }
 
-    /**
-     * @see
-     * org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
-     */
+    @Override
     public List<Class<?>> getMarkerInterfaces() {
         List<Class<?>> marker = new ArrayList<>();
         marker.add(CommandHandler.class);
         return marker;
     }
 
-    /**
-     * @see
-     * org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
-     */
+    @Override
     @SuppressWarnings({ "unchecked", "rawtypes", "unlikely-arg-type" })
     public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException {
         if (interfaceName.equals(CommandHandler.class)) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java
index 477525b..1ae62d8 100644
--- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java
+++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java
@@ -78,23 +78,17 @@ public abstract class AbstractCommandHandlerStats extends StandardMBean implemen
      */
     protected abstract void incrementStats(Response response);
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.CommandHandlerStatsMBean#getAll()
-     */
+    @Override
     public long getAll() {
         return all.get();
     }
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.CommandHandlerStatsMBean#getName()
-     */
+    @Override
     public String getName() {
         return handlerName;
     }
 
-    /**
-     * @see org.apache.james.lifecycle.api.Disposable#dispose()
-     */
+    @Override
     public void dispose() {
         try {
             mbeanserver.unregisterMBean(new ObjectName(name));
@@ -103,16 +97,12 @@ public abstract class AbstractCommandHandlerStats extends StandardMBean implemen
         }
     }
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.CommandHandlerStatsMBean#getCommands()
-     */
+    @Override
     public String[] getCommands() {
         return commands;
     }
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.CommandHandlerStatsMBean#getDisconnect()
-     */
+    @Override
     public long getDisconnect() {
         return disconnect.get();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java
index 4021606..e989df6 100644
--- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java
+++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java
@@ -57,12 +57,7 @@ public abstract class AbstractConnectHandlerResultJMXMonitor<R extends Response,
 
 
 
-    /**
-     * @see
-     * org.apache.james.protocols.api.handler.ProtocolHandlerResultHandler
-     * #onResponse(org.apache.james.protocols.api.ProtocolSession, long,
-     * org.apache.james.protocols.api.handler.ProtocolHandler)
-     */
+    @Override
     public Response onResponse(ProtocolSession session, Response response, long executionTime, ProtocolHandler handler) {
         if (handler instanceof ConnectHandler) {
             cStats.get(handler.getClass().getName()).increment(response);
@@ -70,10 +65,7 @@ public abstract class AbstractConnectHandlerResultJMXMonitor<R extends Response,
         return response;
     }
 
-    /**
-     * @see
-     * org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
-     */
+    @Override
     public List<Class<?>> getMarkerInterfaces() {
         List<Class<?>> marker = new ArrayList<>();
         marker.add(ConnectHandler.class);
@@ -81,10 +73,7 @@ public abstract class AbstractConnectHandlerResultJMXMonitor<R extends Response,
         return marker;
     }
 
-    /**
-     * @see
-     * org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
-     */
+    @Override
     @SuppressWarnings("unlikely-arg-type")
     public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException {
         if (interfaceName.equals(ConnectHandler.class)) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java
index 9d93d16..62c84e9 100644
--- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java
+++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java
@@ -43,12 +43,7 @@ public abstract class AbstractLineHandlerResultJMXMonitor<R extends Response, S
     private final Map<String, LineHandlerStats> lStats = new HashMap<>();
     private String jmxName;
 
-    /**
-     * @see
-     * org.apache.james.protocols.api.handler.ProtocolHandlerResultHandler
-     * #onResponse(org.apache.james.protocols.api.ProtocolSession, longlong,
-     * org.apache.james.protocols.api.handler.ProtocolHandler)
-     */
+    @Override
     public Response onResponse(ProtocolSession session, Response response, long executionTime, ProtocolHandler handler) {
         if (handler instanceof LineHandler) {
             lStats.get(handler.getClass().getName()).increment(response);
@@ -56,20 +51,14 @@ public abstract class AbstractLineHandlerResultJMXMonitor<R extends Response, S
         return response;
     }
 
-    /**
-     * @see
-     * org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
-     */
+    @Override
     public List<Class<?>> getMarkerInterfaces() {
         List<Class<?>> marker = new ArrayList<>();
         marker.add(LineHandler.class);
         return marker;
     }
 
-    /**
-     * @see
-     * org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
-     */
+    @Override
     @SuppressWarnings("unlikely-arg-type")
     public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException {
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java
index 81321fd..7fe8f0f 100644
--- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java
+++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java
@@ -63,30 +63,22 @@ public class ConnectHandlerStats extends StandardMBean implements HandlerStatsMB
         }
     }
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.HandlerStatsMBean#getAll()
-     */
+    @Override
     public long getAll() {
         return all.get();
     }
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.HandlerStatsMBean#getName()
-     */
+    @Override
     public String getName() {
         return handlerName;
     }
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.HandlerStatsMBean#getDisconnect()
-     */
+    @Override
     public long getDisconnect() {
         return disconnect.get();
     }
 
-    /**
-     * @see org.apache.james.lifecycle.api.Disposable#dispose()
-     */
+    @Override
     public void dispose() {
         try {
             mbeanserver.unregisterMBean(new ObjectName(name));

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java
index 5e8b652..aca25ec 100644
--- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java
+++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java
@@ -65,30 +65,22 @@ public class LineHandlerStats extends StandardMBean implements HandlerStatsMBean
         }
     }
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.HandlerStatsMBean#getAll()
-     */
+    @Override
     public long getAll() {
         return all.get();
     }
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.HandlerStatsMBean#getName()
-     */
+    @Override
     public String getName() {
         return handlerName;
     }
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.HandlerStatsMBean#getDisconnect()
-     */
+    @Override
     public long getDisconnect() {
         return disconnect.get();
     }
 
-    /**
-     * @see org.apache.james.lifecycle.api.Disposable#dispose()
-     */
+    @Override
     public void dispose() {
         try {
             mbeanserver.unregisterMBean(new ObjectName(name));

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
index 5eed459..a6fe7a2 100644
--- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
+++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
@@ -153,11 +153,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe
         return  "org.apache.james:type=server,name=" + jmxName;
     }
     
-    /**
-     * @see
-     * org.apache.james.lifecycle.api.Configurable
-     * #configure(org.apache.commons.configuration.HierarchicalConfiguration)
-     */
+    @Override
     public final void configure(HierarchicalConfiguration config) throws ConfigurationException {
 
         enabled = config.getBoolean("[@enabled]", true);
@@ -360,6 +356,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe
      * 
      * @return enabled
      */
+    @Override
     public boolean isEnabled() {
         return enabled;
     }
@@ -425,6 +422,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe
      * 
      * @return the socket type ('plain' or 'secure')
      */
+    @Override
     public String getSocketType() {
         if (encryption != null && !encryption.isStartTLS()) {
             return "secure";
@@ -432,17 +430,12 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe
         return "plain";
     }
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.ServerMBean#getStartTLSSupported()
-     */
+    @Override
     public boolean getStartTLSSupported() {
         return encryption != null && encryption.isStartTLS();
     }
 
-    /**
-     * @see
-     * org.apache.james.protocols.lib.jmx.ServerMBean#getMaximumConcurrentConnections()
-     */
+    @Override
     public int getMaximumConcurrentConnections() {
         return connectionLimit;
     }
@@ -473,16 +466,12 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe
         return enabledCipherSuites;
     }
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.ServerMBean#isStarted()
-     */
+    @Override
     public boolean isStarted() {
         return isBound();
     }
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.ServerMBean#start()
-     */
+    @Override
     public boolean start() {
         try {
             bind();
@@ -493,24 +482,18 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe
         return true;
     }
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.ServerMBean#stop()
-     */
+    @Override
     public boolean stop() {
         unbind();
         return true;
     }
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.ServerMBean#getHandledConnections()
-     */
+    @Override
     public long getHandledConnections() {
         return countHandler.getConnectionsTillStartup();
     }
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.ServerMBean#getCurrentConnections()
-     */
+    @Override
     public int getCurrentConnections() {
         return countHandler.getCurrentConnectionCount();
     }
@@ -519,9 +502,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe
         return countHandler;
     }
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.ServerMBean#getBoundAddresses()
-     */
+    @Override
     public String[] getBoundAddresses() {
 
         List<InetSocketAddress> addresses = getListenAddresses();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java
index 594aa71..e59a8fb 100644
--- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java
+++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java
@@ -118,44 +118,32 @@ public class JMXEnabledOrderedMemoryAwareThreadPoolExecutor extends OrderedMemor
         return super.shutdownNow();
     }
 
-    /**
-     * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getTotalTasks()
-     */
+    @Override
     public synchronized int getTotalTasks() {
         return totalTasks;
     }
 
-    /**
-     * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getAverageTaskTime()
-     */
+    @Override
     public synchronized double getAverageTaskTime() {
         return (totalTasks == 0) ? 0 : totalTime / totalTasks;
     }
 
-    /**
-     * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getActiveThreads()
-     */
+    @Override
     public int getActiveThreads() {
         return getPoolSize();
     }
 
-    /**
-     * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getActiveTasks()
-     */
+    @Override
     public int getActiveTasks() {
         return getActiveCount();
     }
 
-    /**
-     * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getQueuedTasks()
-     */
+    @Override
     public int getQueuedTasks() {
         return getQueue().size();
     }
 
-    /**
-     * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getMaximalThreads()
-     */
+    @Override
     public int getMaximalThreads() {
         return getMaximumPoolSize();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java
index 962d114..cea3dfe 100644
--- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java
+++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java
@@ -79,9 +79,7 @@ public class CoreCmdHandlerLoader implements HandlersPackage {
         .forEachOrdered(commands::add);
     }
 
-    /**
-     * @see HandlersPackage#getHandlers()
-     */
+    @Override
     public List<String> getHandlers() {
         return commands;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java
index 5001404..66512bd 100644
--- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java
+++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java
@@ -35,9 +35,7 @@ public class JMXHandlersLoader implements HandlersPackage {
         handlers.add(LineHandlerResultJMXMonitor.class.getName());
     }
 
-    /**
-     * @see HandlersPackage#getHandlers()
-     */
+    @Override
     public List<String> getHandlers() {
         return handlers;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
index 178e80d..89f3f1a 100644
--- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
+++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
@@ -50,21 +50,17 @@ public class LMTPServer extends AbstractProtocolAsyncServer implements LMTPServe
         this.lmtpMetrics = lmtpMetrics;
     }
 
-    /**
-     * @see
-     * org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer#getDefaultPort()
-     */
+    @Override
     public int getDefaultPort() {
         return 24;
     }
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.ServerMBean#getServiceType()
-     */
+    @Override
     public String getServiceType() {
         return "LMTP Service";
     }
 
+    @Override
     public void doConfigure(HierarchicalConfiguration configuration) throws ConfigurationException {
         super.doConfigure(configuration);
         if (isEnabled()) {
@@ -92,6 +88,7 @@ public class LMTPServer extends AbstractProtocolAsyncServer implements LMTPServe
         /**
          * @see org.apache.james.protocols.smtp.SMTPConfiguration#getHelloName()
          */
+        @Override
         public String getHelloName() {
             return LMTPServer.this.getHelloName();
         }
@@ -101,6 +98,7 @@ public class LMTPServer extends AbstractProtocolAsyncServer implements LMTPServe
         /**
          * @see org.apache.james.protocols.smtp.SMTPConfiguration#getMaxMessageSize()
          */
+        @Override
         public long getMaxMessageSize() {
             return LMTPServer.this.maxMessageSize;
         }
@@ -113,32 +111,22 @@ public class LMTPServer extends AbstractProtocolAsyncServer implements LMTPServe
        
     }
 
-    /**
-     * @see LMTPServerMBean#getMaximalMessageSize()
-     */
+    @Override
     public long getMaximalMessageSize() {
         return lmtpConfig.getMaxMessageSize();
     }
 
-    /**
-     * @see
-     * org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer#getDefaultJMXName()
-     */
+    @Override
     protected String getDefaultJMXName() {
         return "lmtpserver";
     }
 
-    /**
-     * @see
-     * org.apache.james.smtpserver.netty.SMTPServerMBean#setMaximalMessageSize(long)
-     */
+    @Override
     public void setMaximalMessageSize(long maxSize) {
         maxMessageSize = maxSize;
     }
 
-    /**
-     * @see org.apache.james.lmtpserver.netty.LMTPServerMBean#getHeloName()
-     */
+    @Override
     public String getHeloName() {
         return lmtpConfig.getHelloName();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java
index 9f5f87c..8d89aa2 100644
--- a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java
+++ b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java
@@ -97,6 +97,7 @@ public class ManageSieveServer extends AbstractConfigurableAsyncServer implement
 
             private final ChannelGroupHandler groupHandler = new ChannelGroupHandler(group);
 
+            @Override
             public ChannelPipeline getPipeline() throws Exception {
                 ChannelPipeline pipeline = pipeline();
                 Encryption secure = getEncryption();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServerFactory.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServerFactory.java b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServerFactory.java
index f77934f..5b96f6f 100644
--- a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServerFactory.java
+++ b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServerFactory.java
@@ -72,6 +72,7 @@ public class ManageSieveServerFactory extends AbstractServerFactory {
     }
 
 
+    @Override
     @PostConstruct
     public void init() throws Exception {
         manageSieveProcessor = new ManageSieveProcessor(new ArgumentParser(new CoreProcessor(sieveRepository, usersRepository, sieveParser)));

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java
index 162153b..4abdf26 100644
--- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java
+++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java
@@ -92,8 +92,7 @@ public class CoreCmdHandlerLoader implements HandlersPackage {
         commands.add(COMMANDHANDLERRESULTLOGGER);
     }
 
-    /**
-     */
+    @Override
     public List<String> getHandlers() {
         return commands;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java
index e888af1..4358455 100644
--- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java
+++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java
@@ -31,10 +31,7 @@ import org.apache.james.protocols.pop3.POP3Session;
  */
 public class CommandHandlerResultJMXMonitor extends AbstractCommandHandlerResultJMXMonitor<POP3Session> implements ProtocolHandler {
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.AbstractCommandHandlerResultJMXMonitor
-     * #createCommandHandlerStats(org.apache.james.protocols.api.CommandHandler)
-     */
+    @Override
     protected AbstractCommandHandlerStats createCommandHandlerStats(CommandHandler<POP3Session> handler) throws Exception {
         Collection<String> col = handler.getImplCommands();
         String cName = handler.getClass().getName();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java
index f2cc333..92713ce 100644
--- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java
+++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java
@@ -24,10 +24,7 @@ import org.apache.james.protocols.pop3.POP3Session;
 
 public class ConnectHandlerResultJMXMonitor extends AbstractConnectHandlerResultJMXMonitor<POP3Response, POP3Session> {
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.AbstractConnectHandlerResultJMXMonitor
-     * #getDefaultJMXName()
-     */
+    @Override
     protected String getDefaultJMXName() {
         return "pop3server";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java
index f5182c1..90eb223 100644
--- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java
+++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java
@@ -35,8 +35,7 @@ public class JMXHandlersLoader implements HandlersPackage {
         handlers.add(LineHandlerResultJMXMonitor.class.getName());
     }
 
-    /**
-     */
+    @Override
     public List<String> getHandlers() {
         return handlers;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java
index b7d3205..d570e65 100644
--- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java
+++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java
@@ -24,10 +24,7 @@ import org.apache.james.protocols.pop3.POP3Session;
 
 public class LineHandlerResultJMXMonitor extends AbstractLineHandlerResultJMXMonitor<POP3Response, POP3Session> {
 
-    /**
-     * @see
-     *  org.apache.james.protocols.lib.jmx.AbstractLineHandlerResultJMXMonitor#getDefaultJMXName()
-     */
+    @Override
     protected String getDefaultJMXName() {
         return "pop3server";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java
index e94cd83..b1cd557 100644
--- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java
+++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java
@@ -38,11 +38,7 @@ public class POP3CommandHandlerStats extends AbstractCommandHandlerStats impleme
         super(POP3CommandHandlerStatsMBean.class, jmxPath, handlerName, commands);
     }
 
-    /**
-     * @see
-     * org.apache.james.protocols.lib.jmx.AbstractCommandHandlerStats
-     * #increment(org.apache.james.protocols.api.Response)
-     */
+    @Override
     protected void incrementStats(Response response) {
         String code = response.getRetCode();
         if (POP3Response.OK_RESPONSE.equals(code)) {
@@ -52,17 +48,12 @@ public class POP3CommandHandlerStats extends AbstractCommandHandlerStats impleme
         }
     }
 
-    /**
-     * @see
-     * org.apache.james.pop3server.jmx.POP3CommandHandlerStatsMBean#getError()
-     */
+    @Override
     public long getError() {
         return error.get();
     }
 
-    /**
-     * @see org.apache.james.pop3server.jmx.POP3CommandHandlerStatsMBean#getOk()
-     */
+    @Override
     public long getOk() {
         return ok.get();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3Server.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
index 6edf0a1..f00db57 100644
--- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
+++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
@@ -46,9 +46,7 @@ public class POP3Server extends AbstractProtocolAsyncServer implements POP3Serve
         return 110;
     }
 
-    /**
-     * @see POP3ServerMBean#getServiceType()
-     */
+    @Override
     public String getServiceType() {
         return "POP3 Service";
     }
@@ -60,6 +58,7 @@ public class POP3Server extends AbstractProtocolAsyncServer implements POP3Serve
 
         /**
          */
+        @Override
         public String getHelloName() {
             return POP3Server.this.getHelloName();
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java
index 04aa165..6044be0 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java
@@ -46,6 +46,7 @@ public class AddDefaultAttributesMessageHook implements JamesMessageHook {
 
     }
 
+    @Override
     public HookResult onMessage(SMTPSession session, Mail mail) {
         if (mail instanceof MailImpl) {
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java
index 7a9e661..4186e33 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java
@@ -31,7 +31,7 @@ public class AuthRequiredToRelayRcptHook extends AbstractAuthRequiredToRelayRcpt
     private DomainList domains;
 
     @Inject
-    public void setDomainList(DomainList domains) {
+    public void setDomainList(DomainList domains) {
         this.domains = domains;
     }
 
@@ -45,9 +45,7 @@ public class AuthRequiredToRelayRcptHook extends AbstractAuthRequiredToRelayRcpt
 
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.AbstractAuthRequiredToRelayRcptHook#isLocalDomain(java.lang.String)
-     */
+    @Override
     protected boolean isLocalDomain(String domain) {
         try {
             return domains.containsDomain(domain);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java
index 4d6376f..a2d8bf3 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java
@@ -86,8 +86,7 @@ public class CoreCmdHandlerLoader implements HandlersPackage {
         .forEachOrdered(commands::add);
     }
 
-    /**
-     */
+    @Override
     public List<String> getHandlers() {
         return commands;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
index ec32246..5fc9825 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
@@ -80,6 +80,7 @@ public class DataLineJamesMessageHookHandler implements DataLineFilter, Extensib
 
     }
 
+    @Override
     public Response onLine(SMTPSession session, ByteBuffer lineByteBuffer, LineHandler<SMTPSession> next) {
 
         byte[] line = new byte[lineByteBuffer.remaining()];

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java
index b9c0078..b7e538d 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java
@@ -49,6 +49,7 @@ public class JamesDataCmdHandler extends DataCmdHandler {
      * @param session  SMTP session object
      * @param argument the argument passed in with the command by the SMTP client
      */
+    @Override
     protected SMTPResponse doDATA(SMTPSession session, String argument) {
         try {
             MimeMessageInputStreamSource mmiss = new MimeMessageInputStreamSource(MailImpl.getId());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java
index 64f1b34..87ad536 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java
@@ -39,9 +39,7 @@ public class JamesMailCmdHandler extends MailCmdHandler {
         this.domainList = domainList;
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.MailCmdHandler#getDefaultDomain()
-     */
+    @Override
     public String getDefaultDomain() {
         try {
             return domainList.getDefaultDomain();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java
index 551f93c..70abba4 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java
@@ -40,9 +40,7 @@ public class JamesRcptCmdHandler extends RcptCmdHandler {
         this.domainList = domainList;
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.MailCmdHandler#getDefaultDomain()
-     */
+    @Override
     public String getDefaultDomain() {
         try {
             return domainList.getDefaultDomain();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java
index 8bd57bc..61b986b 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java
@@ -45,11 +45,7 @@ public class MailPriorityHandler implements JamesMessageHook, ProtocolHandler {
 
     private final Map<String, Integer> prioMap = new HashMap<>();
 
-    /**
-     * @see
-     * org.apache.james.smtpserver.JamesMessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession,
-     *  org.apache.mailet.Mail)
-     */
+    @Override
     public HookResult onMessage(SMTPSession session, Mail mail) {
         Iterator<MailAddress> rcpts = mail.getRecipients().iterator();
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java
index 7320419..89aea40 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java
@@ -37,9 +37,7 @@ public class POP3BeforeSMTPHandler implements ConnectHandler<SMTPSession>, Confi
     /** The time after which ipAddresses should be handled as expired */
     private long expireTime = POP3BeforeSMTPHelper.EXPIRE_TIME;
 
-    /*
-     * 
-     */
+    @Override
     public void configure(HierarchicalConfiguration config) throws ConfigurationException {
         try {
             setExpireTime(config.getString("expireTime", null));
@@ -60,9 +58,7 @@ public class POP3BeforeSMTPHandler implements ConnectHandler<SMTPSession>, Confi
         }
     }
 
-    /**
-     * @see org.apache.james.protocols.api.handler.ConnectHandler#onConnect(org.apache.james.protocols.api.ProtocolSession)
-     */
+    @Override
     public Response onConnect(SMTPSession session) {
 
         // some kind of random cleanup process

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
index 54e0a4d..3f01474 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
@@ -62,6 +62,7 @@ public class SendMailHandler implements JamesMessageHook {
      * Adds header to the message
      *
      */
+    @Override
     public HookResult onMessage(SMTPSession session, Mail mail) {
        
         LOGGER.debug("sending mail");

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
index 60173c0..d261810 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
@@ -72,9 +72,7 @@ public class SenderAuthIdentifyVerificationRcptHook extends AbstractSenderAuthId
         }
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.AbstractSenderAuthIdentifyVerificationRcptHook#isLocalDomain(java.lang.String)
-     */
+    @Override
     protected boolean isLocalDomain(String domain) {
         try {
             return domains.containsDomain(domain);
@@ -83,9 +81,7 @@ public class SenderAuthIdentifyVerificationRcptHook extends AbstractSenderAuthId
         }
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.AbstractSenderAuthIdentifyVerificationRcptHook#useVirtualHosting()
-     */
+    @Override
     protected boolean useVirtualHosting() {
         try {
             return users.supportVirtualHosting();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
index 9268568..1fd96a9 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
@@ -69,6 +69,7 @@ public class SetMimeHeaderHandler implements JamesMessageHook, ProtocolHandler {
      * @see org.apache.james.smtpserver.JamesMessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession,
      *      org.apache.mailet.Mail)
      */
+    @Override
     public HookResult onMessage(SMTPSession session, Mail mail) {
         try {
             MimeMessage message = mail.getMessage();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
index f96496a..9fbf77f 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
@@ -59,10 +59,7 @@ public class UsersRepositoryAuthHook implements AuthHook {
         this.users = users;
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.hook.AuthHook#doAuth(org.apache.james.protocols.smtp.SMTPSession,
-     *      java.lang.String, java.lang.String)
-     */
+    @Override
     public HookResult doAuth(SMTPSession session, String username, String password) {
         try {
             if (users.test(username, password)) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
index f1441c5..3b69a7e 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
@@ -169,10 +169,7 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot
         return wNetworks;
     }
     
-    /**
-     * @see org.apache.james.protocols.smtp.core.fastfail.AbstractGreylistHandler#getGreyListData(java.lang.String,
-     *      java.lang.String, java.lang.String)
-     */
+    @Override
     protected Iterator<String> getGreyListData(String ipAddress, String sender, String recip) throws SQLException {
         Collection<String> data = new ArrayList<>(2);
         PreparedStatement mappingStmt = null;
@@ -200,10 +197,7 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot
         return data.iterator();
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.fastfail.AbstractGreylistHandler#insertTriplet(java.lang.String,
-     *      java.lang.String, java.lang.String, int, long)
-     */
+    @Override
     protected void insertTriplet(String ipAddress, String sender, String recip, int count, long createTime) throws SQLException {
         Connection conn = datasource.getConnection();
 
@@ -224,10 +218,7 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot
         }
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.fastfail.AbstractGreylistHandler#updateTriplet(java.lang.String,
-     *      java.lang.String, java.lang.String, int, long)
-     */
+    @Override
     protected void updateTriplet(String ipAddress, String sender, String recip, int count, long time) throws SQLException {
         Connection conn = datasource.getConnection();
         PreparedStatement mappingStmt = null;
@@ -246,9 +237,7 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot
         }
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.fastfail.AbstractGreylistHandler#cleanupAutoWhiteListGreyList(long)
-     */
+    @Override
     protected void cleanupAutoWhiteListGreyList(long time) throws SQLException {
         PreparedStatement mappingStmt = null;
         Connection conn = datasource.getConnection();
@@ -265,9 +254,7 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot
         }
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.core.fastfail.AbstractGreylistHandler#cleanupGreyList(long)
-     */
+    @Override
     protected void cleanupGreyList(long time) throws SQLException {
         Connection conn = datasource.getConnection();
 
@@ -366,8 +353,7 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot
         }
     }
 
-    /**
-     */
+    @Override
     public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
         if ((wNetworks == null) || (!wNetworks.matchInetNetwork(session.getRemoteAddress().getAddress().getHostAddress()))) {
             return super.doRcpt(session, sender, rcpt);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
index dce1959..e36f562 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
@@ -147,8 +147,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
 
     }
 
-    /**
-     */
+    @Override
     public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
         if (!session.isRelayingAllowed()) {
             // Check if session is blocklisted
@@ -161,8 +160,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
         return new HookResult(HookReturnCode.DECLINED);
     }
 
-    /**
-     */
+    @Override
     public HookResult doMail(SMTPSession session, MailAddress sender) {
         doSPFCheck(session, sender);
         return new HookResult(HookReturnCode.DECLINED);
@@ -186,6 +184,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
         /**
          * @see org.apache.james.jspf.core.Logger#debug(String)
          */
+        @Override
         public void debug(String message) {
             serviceLog.debug(message);
         }
@@ -193,6 +192,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
         /**
          * @see org.apache.james.jspf.core.Logger#debug(String, Throwable)
          */
+        @Override
         public void debug(String message, Throwable t) {
             serviceLog.debug(message, t);
         }
@@ -200,6 +200,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
         /**
          * @see org.apache.james.jspf.core.Logger#error(String)
          */
+        @Override
         public void error(String message) {
             serviceLog.error(message);
         }
@@ -207,6 +208,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
         /**
          * @see org.apache.james.jspf.core.Logger#error(String, Throwable)
          */
+        @Override
         public void error(String message, Throwable t) {
             serviceLog.error(message, t);
         }
@@ -214,6 +216,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
         /**
          * @see org.apache.james.jspf.core.Logger#fatalError(String)
          */
+        @Override
         public void fatalError(String message) {
             serviceLog.error(message);
         }
@@ -221,6 +224,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
         /**
          * @see org.apache.james.jspf.core.Logger#fatalError(String, Throwable)
          */
+        @Override
         public void fatalError(String message, Throwable t) {
             serviceLog.error(message, t);
         }
@@ -228,6 +232,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
         /**
          * @see org.apache.james.jspf.core.Logger#info(String)
          */
+        @Override
         public void info(String message) {
             serviceLog.info(message);
         }
@@ -235,6 +240,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
         /**
          * @see org.apache.james.jspf.core.Logger#info(String, Throwable)
          */
+        @Override
         public void info(String message, Throwable t) {
             serviceLog.info(message, t);
         }
@@ -242,6 +248,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
         /**
          * @see org.apache.james.jspf.core.Logger#isDebugEnabled()
          */
+        @Override
         public boolean isDebugEnabled() {
             return serviceLog.isDebugEnabled();
         }
@@ -249,6 +256,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
         /**
          * @see org.apache.james.jspf.core.Logger#isErrorEnabled()
          */
+        @Override
         public boolean isErrorEnabled() {
             return serviceLog.isErrorEnabled();
         }
@@ -256,6 +264,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
         /**
          * @see org.apache.james.jspf.core.Logger#isFatalErrorEnabled()
          */
+        @Override
         public boolean isFatalErrorEnabled() {
             return serviceLog.isErrorEnabled();
         }
@@ -263,6 +272,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
         /**
          * @see org.apache.james.jspf.core.Logger#isInfoEnabled()
          */
+        @Override
         public boolean isInfoEnabled() {
             return serviceLog.isInfoEnabled();
         }
@@ -270,6 +280,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
         /**
          * @see org.apache.james.jspf.core.Logger#isWarnEnabled()
          */
+        @Override
         public boolean isWarnEnabled() {
             return serviceLog.isWarnEnabled();
         }
@@ -277,6 +288,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
         /**
          * @see org.apache.james.jspf.core.Logger#warn(String)
          */
+        @Override
         public void warn(String message) {
             serviceLog.warn(message);
         }
@@ -284,6 +296,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
         /**
          * @see org.apache.james.jspf.core.Logger#warn(String, Throwable)
          */
+        @Override
         public void warn(String message, Throwable t) {
             serviceLog.warn(message, t);
         }
@@ -291,15 +304,13 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
         /**
          * @see org.apache.james.jspf.core.Logger#getChildLogger(String)
          */
+        @Override
         public org.apache.james.jspf.core.Logger getChildLogger(String name) {
             return this;
         }
     }
 
-    /**
-     * @see org.apache.james.smtpserver.JamesMessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession,
-     *      org.apache.mailet.Mail)
-     */
+    @Override
     public HookResult onMessage(SMTPSession session, Mail mail) {
         // Store the spf header as attribute for later using
         mail.setAttribute(SPF_HEADER_MAIL_ATTRIBUTE_NAME, (String) session.getAttachment(SPF_HEADER, State.Transaction));

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java
index 3ef7774..14e6095 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java
@@ -109,10 +109,7 @@ public class SpamAssassinHandler implements JamesMessageHook, ProtocolHandler {
 
     }
 
-    /**
-     * @see org.apache.james.smtpserver.JamesMessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession,
-     *      org.apache.mailet.Mail)
-     */
+    @Override
     public HookResult onMessage(SMTPSession session, Mail mail) {
 
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
index c8b6e9c..f400763 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
@@ -105,10 +105,7 @@ public class URIRBLHandler implements JamesMessageHook, ProtocolHandler {
         this.getDetail = getDetail;
     }
 
-    /**
-     * @see org.apache.james.smtpserver.JamesMessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession,
-     *      org.apache.mailet.Mail)
-     */
+    @Override
     public HookResult onMessage(SMTPSession session, Mail mail) {
         if (check(session, mail)) {
             String uRblServer = (String) session.getAttachment(URBLSERVER, State.Transaction);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
index c218eee..e348c6d 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
@@ -133,12 +133,7 @@ public class ValidRcptHandler extends AbstractValidRcptHandler implements Protoc
         }
     }
 
-    /**
-     * @see
-     * org.apache.james.protocols.smtp.core.fastfail.AbstractValidRcptHandler
-     * #isLocalDomain(org.apache.james.protocols.smtp.SMTPSession,
-     * java.lang.String)
-     */
+    @Override
     protected boolean isLocalDomain(SMTPSession session, String domain) {
         try {
             return domains.containsDomain(domain);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
index 18c4fb8..04a2600 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
@@ -87,6 +87,7 @@ public class ValidRcptMX implements RcptHook, ProtocolHandler {
         bNetwork = new NetMatcher(networks, dnsServer);
     }
 
+    @Override
     public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
 
         String domain = rcpt.getDomain();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java
index 409ee93..61d8df8 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java
@@ -30,10 +30,7 @@ import org.apache.james.protocols.smtp.SMTPSession;
  */
 public class CommandHandlerResultJMXMonitor extends AbstractCommandHandlerResultJMXMonitor<SMTPSession> {
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.AbstractCommandHandlerResultJMXMonitor
-     * #createCommandHandlerStats(org.apache.james.protocols.api.handler.CommandHandler)
-     */
+    @Override
     protected AbstractCommandHandlerStats createCommandHandlerStats(CommandHandler<SMTPSession> handler) throws Exception {
         Collection<String> col = handler.getImplCommands();
         String cName = handler.getClass().getName();
@@ -41,6 +38,7 @@ public class CommandHandlerResultJMXMonitor extends AbstractCommandHandlerResult
         return new SMTPCommandHandlerStats(getJMXName(), cName, col.toArray(new String[col.size()]));
     }
 
+    @Override
     protected String getDefaultJMXName() {
         return "smtpserver";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java
index 14e7790..cb14c61 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java
@@ -24,9 +24,7 @@ import org.apache.james.protocols.smtp.SMTPSession;
 
 public class ConnectHandlerResultJMXMonitor extends AbstractConnectHandlerResultJMXMonitor<Response, SMTPSession> {
 
-    /**
-     * @see org.apache.james.protocols.lib.jmx.AbstractConnectHandlerResultJMXMonitor#getDefaultJMXName()
-     */
+    @Override
     protected String getDefaultJMXName() {
         return "smtpserver";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java
index 2d8c353..1163e21 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java
@@ -42,13 +42,7 @@ public class HookResultJMXMonitor implements HookResultHook, ExtensibleHandler,
     private final Map<String, HookStats> hookStats = new HashMap<>();
     private String jmxPath;
 
-    /**
-     * @see
-     * org.apache.james.protocols.smtp.hook.HookResultHook
-     * #onHookResult(org.apache.james.protocols.smtp.SMTPSession,
-     * org.apache.james.protocols.smtp.hook.HookResult, long,
-     * org.apache.james.protocols.smtp.hook.Hook)
-     */
+    @Override
     public HookResult onHookResult(SMTPSession session, HookResult result, long executionTime, Hook hook) {
         String hookName = hook.getClass().getName();
         HookStats stats = hookStats.get(hookName);
@@ -58,20 +52,14 @@ public class HookResultJMXMonitor implements HookResultHook, ExtensibleHandler,
         return result;
     }
 
-    /**
-     * @see
-     * org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
-     */
+    @Override
     public List<Class<?>> getMarkerInterfaces() {
         List<Class<?>> marker = new ArrayList<>();
         marker.add(Hook.class);
         return marker;
     }
 
-    /**
-     * @see
-     * org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
-     */
+    @Override
     public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException {
         if (interfaceName.equals(Hook.class)) {
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java
index 81c80fe..6636bc7 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java
@@ -73,37 +73,27 @@ public class HookStats extends StandardMBean implements HookStatsMBean, Disposab
         all.incrementAndGet();
     }
 
-    /**
-     * @see org.apache.james.smtpserver.jmx.HookStatsMBean#getOk()
-     */
+    @Override
     public long getOk() {
         return ok.get();
     }
 
-    /**
-     * @see org.apache.james.smtpserver.jmx.HookStatsMBean#getDeclined()
-     */
+    @Override
     public long getDeclined() {
         return declined.get();
     }
 
-    /**
-     * @see org.apache.james.smtpserver.jmx.HookStatsMBean#getDeny()
-     */
+    @Override
     public long getDeny() {
         return deny.get();
     }
 
-    /**
-     * @see org.apache.james.smtpserver.jmx.HookStatsMBean#getDenysoft()
-     */
+    @Override
     public long getDenysoft() {
         return denysoft.get();
     }
 
-    /**
-     * @see org.apache.james.lifecycle.api.Disposable#dispose()
-     */
+    @Override
     public void dispose() {
         try {
             mbeanserver.unregisterMBean(new ObjectName(name));
@@ -112,16 +102,12 @@ public class HookStats extends StandardMBean implements HookStatsMBean, Disposab
         }
     }
 
-    /**
-     * @see org.apache.james.smtpserver.jmx.HookStatsMBean#getName()
-     */
+    @Override
     public String getName() {
         return hookname;
     }
 
-    /**
-     * @see org.apache.james.smtpserver.jmx.HookStatsMBean#getAll()
-     */
+    @Override
     public long getAll() {
         return all.get();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java
index 49984f5..316c29d 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java
@@ -36,8 +36,7 @@ public class JMXHandlersLoader implements HandlersPackage {
         handlers.add(HookResultJMXMonitor.class.getName());
     }
 
-    /**
-     */
+    @Override
     public List<String> getHandlers() {
         return handlers;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java
index d41b321..4718b4c 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java
@@ -24,10 +24,7 @@ import org.apache.james.protocols.smtp.SMTPSession;
 
 public class LineHandlerResultJMXMonitor extends AbstractLineHandlerResultJMXMonitor<SMTPResponse, SMTPSession> {
 
-    /**
-     * @see
-     * org.apache.james.protocols.lib.jmx.AbstractLineHandlerResultJMXMonitor#getDefaultJMXName()
-     */
+    @Override
     protected String getDefaultJMXName() {
         return "smtpserver";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java
index 2d85eea..0cf4a9d 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java
@@ -47,33 +47,22 @@ public class SMTPCommandHandlerStats extends AbstractCommandHandlerStats impleme
         super(SMTPCommandHandlerStatsMBean.class, jmxPath, handlerName, commands);
     }
 
-    /**
-     * @see
-     * org.apache.james.smtpserver.jmx.SMTPCommandHandlerStatsMBean#getTemporaryError()
-     */
+    @Override
     public long getTemporaryError() {
         return temp.get();
     }
 
-    /**
-     * @see
-     * org.apache.james.smtpserver.jmx.SMTPCommandHandlerStatsMBean#getPermantError()
-     */
+    @Override
     public long getPermantError() {
         return perm.get();
     }
 
-    /**
-     * @see org.apache.james.smtpserver.jmx.SMTPCommandHandlerStatsMBean#getOk()
-     */
+    @Override
     public long getOk() {
         return ok.get();
     }
 
-    /**
-     * @see
-     * org.apache.james.protocols.lib.jmx.AbstractCommandHandlerStats#incrementStats(org.apache.james.protocols.api.Response)
-     */
+    @Override
     protected void incrementStats(Response response) {
         try {
             String code = response.getRetCode();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java
index 9c35bef..653b66d 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java
@@ -72,6 +72,7 @@ public class SMTPChannelUpstreamHandler extends BasicChannelUpstreamHandler {
      * 
      * @param ctx
      */
+    @Override
     protected void cleanup(ChannelHandlerContext ctx) {
         // Make sure we dispose everything on exit on session close
         SMTPSession smtpSession = (SMTPSession) ctx.getAttachment();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
index 78e1fe2..c35e778 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
@@ -197,13 +197,12 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe
      * 
      * @return port
      */
+    @Override
     protected int getDefaultPort() {
         return 25;
     }
 
-    /**
-     * @see org.apache.james.smtpserver.netty.SMTPServerMBean#getServiceType()
-     */
+    @Override
     public String getServiceType() {
         return "SMTP Service";
     }
@@ -216,6 +215,7 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe
         /**
          * @see org.apache.james.protocols.smtp.SMTPConfiguration#getHelloName()
          */
+        @Override
         public String getHelloName() {
             return SMTPServer.this.getHelloName();
         }
@@ -223,6 +223,7 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe
         /**
          * @see org.apache.james.protocols.smtp.SMTPConfiguration#getMaxMessageSize()
          */
+        @Override
         public long getMaxMessageSize() {
             return SMTPServer.this.maxMessageSize;
         }
@@ -230,6 +231,7 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe
         /**
          * @see org.apache.james.protocols.smtp.SMTPConfiguration#isRelayingAllowed(String)
          */
+        @Override
         public boolean isRelayingAllowed(String remoteIP) {
             boolean relayingAllowed = false;
             if (authorizedNetworks != null) {
@@ -241,6 +243,7 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe
         /**
          * @see org.apache.james.protocols.smtp.SMTPConfiguration#useHeloEhloEnforcement()
          */
+        @Override
         public boolean useHeloEhloEnforcement() {
             return SMTPServer.this.heloEhloEnforcement;
         }
@@ -254,6 +257,7 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe
         /**
          * @see org.apache.james.protocols.smtp.SMTPConfiguration#useAddressBracketsEnforcement()
          */
+        @Override
         public boolean useAddressBracketsEnforcement() {
             return SMTPServer.this.addressBracketsEnforcement;
         }
@@ -261,6 +265,7 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe
         /**
          * @see org.apache.james.protocols.smtp.SMTPConfiguration#isAuthRequired(java.lang.String)
          */
+        @Override
         public boolean isAuthRequired(String remoteIP) {
             if (SMTPServer.this.authRequired == AUTH_ANNOUNCE) {
                 return true;
@@ -294,62 +299,42 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe
 
     }
 
-    /**
-     * @see org.apache.james.smtpserver.netty.SMTPServerMBean#getMaximalMessageSize()
-     */
+    @Override
     public long getMaximalMessageSize() {
         return maxMessageSize;
     }
 
-    /**
-     * @see
-     * org.apache.james.smtpserver.netty.SMTPServerMBean#getAddressBracketsEnforcement()
-     */
+    @Override
     public boolean getAddressBracketsEnforcement() {
         return addressBracketsEnforcement;
     }
 
-    /**
-     * @see org.apache.james.smtpserver.netty.SMTPServerMBean#getHeloEhloEnforcement()
-     */
+    @Override
     public boolean getHeloEhloEnforcement() {
         return heloEhloEnforcement;
     }
     
-    /**
-     * @see
-     * org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer#getDefaultJMXName()
-     */
+    @Override
     protected String getDefaultJMXName() {
         return "smtpserver";
     }
 
-    /**
-     * @see
-     * org.apache.james.smtpserver.netty.SMTPServerMBean#setMaximalMessageSize(long)
-     */
+    @Override
     public void setMaximalMessageSize(long maxSize) {
         this.maxMessageSize = maxSize;
     }
 
-    /**
-     * @see org.apache.james.smtpserver.netty.SMTPServerMBean#setAddressBracketsEnforcement(boolean)
-     */
+    @Override
     public void setAddressBracketsEnforcement(boolean enforceAddressBrackets) {
         this.addressBracketsEnforcement = enforceAddressBrackets;
     }
 
-    /**
-     * @see
-     * org.apache.james.smtpserver.netty.SMTPServerMBean#setHeloEhloEnforcement(boolean)
-     */
+    @Override
     public void setHeloEhloEnforcement(boolean enforceHeloEHlo) {
         this.heloEhloEnforcement = enforceHeloEHlo;
     }
 
-    /**
-     * @see org.apache.james.smtpserver.netty.SMTPServerMBean#getHeloName()
-     */
+    @Override
     public String getHeloName() {
         return theConfigData.getHelloName();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
index 7a887c1..7dc053d 100644
--- a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
+++ b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
@@ -109,10 +109,7 @@ public class ActiveMQMailQueue extends JMSMailQueue implements ActiveMQSupport {
         this.useBlob = useBlob;
     }
 
-    /**
-     * @see
-     * org.apache.james.queue.jms.JMSMailQueue#populateMailMimeMessage(javax.jms.Message, org.apache.mailet.Mail)
-     */
+    @Override
     protected void populateMailMimeMessage(Message message, Mail mail) throws MessagingException, JMSException {
         if (message instanceof BlobMessage) {
             try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java
index cb8f5ce..e9d0e98 100644
--- a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java
+++ b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java
@@ -48,9 +48,7 @@ public class ActiveMQMailQueueItem extends JMSMailQueueItem implements ActiveMQS
         this.message = message;
     }
 
-    /**
-     * @see org.apache.james.queue.jms.JMSMailQueueItem#done(boolean)
-     */
+    @Override
     public void done(boolean success) throws MailQueueException {
         super.done(success);
         if (success) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java
index e8153ec..26faa1a 100644
--- a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java
+++ b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java
@@ -39,9 +39,7 @@ public class MimeMessageBlobMessageSource extends MimeMessageSource implements A
         this.sourceId = message.getJMSMessageID();
     }
 
-    /**
-     * @see org.apache.james.server.core.MimeMessageSource#getInputStream()
-     */
+    @Override
     public InputStream getInputStream() throws IOException {
         try {
             return message.getInputStream();
@@ -50,9 +48,7 @@ public class MimeMessageBlobMessageSource extends MimeMessageSource implements A
         }
     }
 
-    /**
-     * @see org.apache.james.server.core.MimeMessageSource#getSourceId()
-     */
+    @Override
     public String getSourceId() {
         return sourceId;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedManageableMailQueueContract.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedManageableMailQueueContract.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedManageableMailQueueContract.java
index 3eb9090..5aa9238 100644
--- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedManageableMailQueueContract.java
+++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedManageableMailQueueContract.java
@@ -34,6 +34,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
 @ExtendWith(ExecutorExtension.class)
 public interface DelayedManageableMailQueueContract extends DelayedMailQueueContract, ManageableMailQueueContract {
 
+    @Override
     ManageableMailQueue getManageableMailQueue();
 
     @Test

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedPriorityMailQueueContract.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedPriorityMailQueueContract.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedPriorityMailQueueContract.java
index a3fa18d..895aa88 100644
--- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedPriorityMailQueueContract.java
+++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedPriorityMailQueueContract.java
@@ -28,6 +28,7 @@ import org.junit.jupiter.api.Test;
 
 public interface DelayedPriorityMailQueueContract extends DelayedMailQueueContract, PriorityMailQueueContract {
 
+    @Override
     MailQueue getMailQueue();
 
     @Test


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


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

Posted by ma...@apache.org.
JAMES-2352 use @Override instead of javadoc comments


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f209526e
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f209526e
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f209526e

Branch: refs/heads/master
Commit: f209526e923bcd2b6fde95004de06d0aab11a234
Parents: 10ba38a
Author: Matthieu Baechler <ma...@apache.org>
Authored: Wed Mar 14 11:44:24 2018 +0100
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Fri Mar 16 11:12:47 2018 +0100

----------------------------------------------------------------------
 .../james/backends/es/ClientProviderImpl.java   |   1 +
 .../apache/james/mailbox/MailboxListener.java   |   3 +
 .../StandardMailboxMetaDataComparator.java      |   4 +-
 .../mailbox/acl/UnionMailboxACLResolver.java    |  10 --
 .../james/mailbox/model/FetchGroupImpl.java     |   8 +-
 .../james/mailbox/model/MessageResult.java      |   1 +
 .../model/PartContentDescriptorImpl.java        |   2 +
 .../james/mailbox/mock/MockMailboxSession.java  |  13 ++
 .../james/mailbox/quota/QuotaCountTest.java     |   2 +
 .../james/mailbox/quota/QuotaSizeTest.java      |   2 +
 .../james/mailbox/util/EventCollector.java      |   1 +
 .../CassandraMailboxSessionMapperFactory.java   |   2 +
 .../cassandra/CassandraSubscriptionManager.java |   5 +-
 .../mail/CassandraAnnotationMapper.java         |   6 +
 .../CassandraCombinationManagerTest.java        |   1 +
 .../cassandra/CassandraMailboxManagerTest.java  |   1 +
 .../CassandraMessageIdManagerQuotaTest.java     |   1 +
 ...CassandraMessageIdManagerSideEffectTest.java |   1 +
 .../CassandraMessageIdManagerStorageTest.java   |   1 +
 .../mail/CassandraAnnotationMapperTest.java     |   1 +
 .../mail/CassandraAttachmentMapperTest.java     |   1 +
 .../mail/CassandraGenericMailboxMapperTest.java |   1 +
 .../mail/CassandraMailboxMapperAclTest.java     |   1 +
 .../mail/CassandraMessageIdMapperTest.java      |   1 +
 .../mail/CassandraMessageMapperTest.java        |   1 +
 .../mail/CassandraMessageMoveTest.java          |   1 +
 ...assandraMessageWithAttachmentMapperTest.java |   1 +
 .../mailbox/elasticsearch/json/FieldImpl.java   |   3 +
 .../hbase/HBaseMailboxSessionMapperFactory.java |  10 +-
 .../mailbox/hbase/HBaseMessageManager.java      |   3 -
 .../hbase/HBaseNonTransactionalMapper.java      |   3 -
 .../mailbox/hbase/io/ChunkInputStream.java      |   8 --
 .../mailbox/hbase/io/ChunkOutputStream.java     |   5 -
 .../mailbox/hbase/mail/HBaseMessageMapper.java  |   8 --
 .../mailbox/hbase/mail/HBaseUidProvider.java    |  14 ---
 .../mailbox/hbase/mail/model/HBaseMailbox.java  |  30 -----
 .../hbase/user/HBaseSubscriptionMapper.java     |  16 ---
 .../mailbox/hbase/HBaseMailboxManagerTest.java  |   1 +
 .../mailbox/jcr/AbstractJCRScalingMapper.java   |   6 +-
 .../mailbox/jcr/JCRRepositoryAuthenticator.java |   5 +-
 .../mailbox/jcr/mail/JCRMailboxMapper.java      |  38 +-----
 .../mailbox/jcr/mail/JCRMessageMapper.java      |  39 ++----
 .../mailbox/jcr/mail/model/JCRMailbox.java      |  54 ++-------
 .../mailbox/jcr/mail/model/JCRProperty.java     |  31 +----
 .../mailbox/jcr/user/JCRSubscriptionMapper.java |  31 +----
 .../mailbox/jcr/user/model/JCRSubscription.java |  28 +----
 .../jcr/JCRMailboxManagerStressTest.java        |   1 +
 .../mailbox/jcr/JCRMailboxManagerTest.java      |   2 +
 .../mailbox/jpa/JPASubscriptionManager.java     |   4 +-
 .../mailbox/jpa/JPATransactionalMapper.java     |  10 +-
 .../mailbox/jpa/mail/JPAMailboxMapper.java      |  24 +---
 .../mailbox/jpa/mail/JPAMessageMapper.java      |  26 +---
 .../mailbox/jpa/mail/model/JPAMailbox.java      |  29 ++---
 .../mailbox/jpa/mail/model/JPAProperty.java     |   3 +
 .../openjpa/AbstractJPAMailboxMessage.java      |  35 ++----
 .../mailbox/jpa/user/JPASubscriptionMapper.java |  19 +--
 .../mailbox/jpa/user/model/JPASubscription.java |   8 +-
 .../mailbox/jpa/JPAMailboxManagerTest.java      |   2 +
 .../mailbox/jpa/JPASubscriptionManagerTest.java |   1 +
 .../jpa/JpaMailboxManagerStressTest.java        |   1 +
 .../jpa/mail/JpaAnnotationMapperTest.java       |   1 +
 .../mailbox/jpa/mail/JpaMailboxMapperTest.java  |   1 +
 .../mailbox/jpa/mail/JpaMessageMapperTest.java  |   1 +
 .../mailbox/kafka/KafkaMessageConsumer.java     |   3 +
 .../lucene/search/LuceneMessageSearchIndex.java |   6 -
 .../lucene/search/StrictImapSearchAnalyzer.java |   1 +
 .../LuceneMailboxMessageSearchIndexTest.java    |   9 ++
 .../maildir/mail/MaildirMailboxMapper.java      |  21 ----
 .../maildir/mail/MaildirMessageMapper.java      |  27 -----
 .../maildir/user/MaildirSubscriptionMapper.java |  15 ---
 ...mainUserMaildirMailboxManagerStressTest.java |   1 +
 .../DomainUserMaildirMailboxManagerTest.java    |   1 +
 ...FullUserMaildirMailboxManagerStressTest.java |   1 +
 .../FullUserMaildirMailboxManagerTest.java      |   1 +
 .../UserMaildirMailboxManagerStressTest.java    |   1 +
 .../inmemory/mail/InMemoryMailboxMapper.java    |  30 ++---
 .../user/InMemorySubscriptionMapper.java        |   5 +
 .../InMemoryCombinationManagerTest.java         |   1 +
 .../InMemoryMessageIdManagerStorageTest.java    |   1 +
 .../inmemory/InMemoryMessageManagerTest.java    |   1 +
 .../MemoryMailboxManagerStressTest.java         |   1 +
 .../inmemory/MemoryMailboxManagerTest.java      |   1 +
 .../InMemoryMailboxManagerAttachmentTest.java   |   1 +
 .../mail/InMemoryMessageIdMapperTest.java       |   1 +
 .../mail/MemoryAnnotationMapperTest.java        |   1 +
 .../mail/MemoryAttachmentMapperTest.java        |   1 +
 .../mail/MemoryMailboxMapperAclTest.java        |   1 +
 .../inmemory/mail/MemoryMailboxMapperTest.java  |   1 +
 .../inmemory/mail/MemoryMessageMapperTest.java  |   1 +
 .../inmemory/mail/MemoryMessageMoveTest.java    |   1 +
 .../MemoryMessageWithAttachmentMapperTest.java  |   1 +
 .../InMemoryPerUserMaxQuotaManagerTest.java     |   1 +
 .../james/mailbox/store/FakeAuthenticator.java  |   1 +
 .../mailbox/store/ImmutableMailboxMessage.java  |  21 ++++
 .../james/mailbox/store/LazyMimeDescriptor.java |   3 -
 .../store/MailboxSessionMapperFactory.java      |  15 +--
 .../james/mailbox/store/MessageResultImpl.java  |  49 ++------
 .../james/mailbox/store/MimeDescriptorImpl.java |  16 +++
 .../james/mailbox/store/ResultHeader.java       |  16 +--
 .../mailbox/store/SimpleMailboxMetaData.java    |  14 +--
 .../mailbox/store/SimpleMailboxSession.java     |  43 ++-----
 .../mailbox/store/StoreMailboxManager.java      |   1 +
 .../mailbox/store/StoreMessageManager.java      |  23 +---
 .../store/StoreMessageResultIterator.java       |  14 +++
 .../mailbox/store/StoreSubscriptionManager.java |  20 +--
 .../james/mailbox/store/event/EventFactory.java |  12 ++
 .../BroadcastDelegatingMailboxListener.java     |   1 +
 .../RegisteredDelegatingMailboxListener.java    |   1 +
 .../store/json/JacksonEventSerializer.java      |   2 +
 .../store/mail/model/impl/SimpleMailbox.java    |  40 ++----
 .../mail/model/impl/SimpleMailboxMessage.java   |  12 ++
 .../store/mail/model/impl/SimpleProperty.java   |  12 +-
 .../mailbox/store/quota/StoreQuotaManager.java  |   2 +
 .../mailbox/store/streaming/ByteContent.java    |   4 +-
 .../store/streaming/CountingInputStream.java    |   4 +-
 .../store/streaming/InputStreamContent.java     |   8 +-
 .../transaction/NonTransactionalMapper.java     |   4 +-
 .../store/transaction/TransactionalMapper.java  |   4 +-
 .../user/model/impl/SimpleSubscription.java     |   2 +
 .../mailbox/store/SimpleMailboxMembership.java  |  22 ++++
 .../james/mailbox/store/SimpleProperty.java     |   3 +
 .../StoreMessageIdManagerSideEffectTest.java    |   1 +
 .../mailbox/store/StringBuilderChannel.java     |   3 +
 .../james/mailbox/copier/MailboxCopierImpl.java |   4 +-
 .../james/mailbox/indexer/ReIndexerImpl.java    |   2 +
 .../command/IMAP165JpaMigrateCommand.java       |   4 +-
 .../command/IMAP168JpaMigrateCommand.java       |   4 +-
 .../command/IMAP172JpaMigrateCommand.java       |   4 +-
 .../command/IMAP176JpaMigrateCommand.java       |   4 +-
 .../command/IMAP180JpaMigrateCommand.java       |   4 +-
 .../command/IMAP184JpaMigrateCommand.java       |   4 +-
 .../james/ai/classic/BayesianAnalysis.java      |   3 +
 .../ai/classic/BayesianAnalysisFeeder.java      |   3 +
 .../james/ai/classic/CorpusLoaderThread.java    |   1 +
 .../ai/classic/TokenProbabilityStrength.java    |   1 +
 .../base/AutomaticallySentMailDetectorImpl.java |   4 +
 .../org/apache/mailet/base/GenericMailet.java   |   9 ++
 .../org/apache/mailet/base/GenericMatcher.java  |   8 ++
 .../mailet/base/GenericRecipientMatcher.java    |   1 +
 .../org/apache/mailet/base/MatcherInverter.java |  17 +--
 .../base/mail/AbstractDataContentHandler.java   |  13 +-
 .../mail/MessageDispositionNotification.java    |  13 +-
 .../mailet/base/mail/MultipartReport.java       |  13 +-
 .../apache/mailet/base/MatcherInverterTest.java |   3 +
 .../mailet/base/test/FakeMailContext.java       |  23 ++++
 .../mailet/base/test/FakeMailetConfig.java      |   4 +
 .../apache/james/transport/SMIMEKeyHolder.java  |   5 +
 .../james/transport/mailets/AbstractSign.java   |   5 +-
 .../transport/mailets/SMIMECheckSignature.java  |   2 +
 .../james/transport/mailets/SMIMEDecrypt.java   |   5 +-
 .../james/transport/mailets/SMIMESign.java      |  10 +-
 .../apache/james/transport/mailets/Sign.java    |   9 +-
 .../transport/matcher/IsSMIMEEncrypted.java     |   4 +-
 .../james/transport/matcher/IsSMIMESigned.java  |   4 +-
 .../matcher/IsX509CertificateSubject.java       |   2 +
 .../james/mailet/AbstractMailetdocsReport.java  |   8 ++
 .../james/mailet/AggregateMailetdocsReport.java |   1 +
 .../james/mailet/MailetMatcherDescriptor.java   |   4 +-
 .../apache/james/mailet/MailetdocsReport.java   |   1 +
 .../transport/mailets/AddHabeasWarrantMark.java |   2 +
 .../james/transport/mailets/ClamAVScan.java     |  11 +-
 .../james/transport/mailets/ClassifyBounce.java |  11 +-
 .../james/transport/mailets/HeadersToHTTP.java  |  11 +-
 .../james/transport/mailets/OnlyText.java       |   8 +-
 .../transport/mailets/PostmasterAlias.java      |   7 +-
 .../transport/mailets/RecoverAttachment.java    |  13 +-
 .../transport/mailets/RemoveMailAttribute.java  |   1 +
 .../transport/mailets/SerialiseToHTTP.java      |  11 +-
 .../james/transport/mailets/ServerTime.java     |   7 +-
 .../transport/mailets/StripAttachment.java      |   5 -
 .../james/transport/mailets/UnwrapText.java     |   8 +-
 .../transport/mailets/UseHeaderRecipients.java  |   8 +-
 .../james/transport/mailets/WrapText.java       |   8 +-
 .../james/transport/mailets/debug/Counter.java  |   2 +
 .../transport/mailets/debug/DumpSystemErr.java  |   7 +-
 .../mailets/debug/ExceptionThrowingMailet.java  |   7 +-
 .../james/transport/mailets/debug/Identity.java |  12 +-
 .../matchers/AbstractQuotaMatcher.java          |   1 +
 .../apache/james/transport/matchers/All.java    |   5 +-
 .../matchers/AttachmentFileNameIs.java          |   6 +-
 .../transport/matchers/CommandForListserv.java  |  10 +-
 .../matchers/CommandListservMatcher.java        |   6 +-
 .../matchers/CompareNumericHeaderValue.java     |  10 +-
 .../james/transport/matchers/FetchedFrom.java   |   1 +
 .../transport/matchers/FileRegexMatcher.java    |   4 +-
 .../transport/matchers/GenericRegexMatcher.java |   8 +-
 .../james/transport/matchers/HasAttachment.java |   1 +
 .../matchers/HasHabeasWarrantMark.java          |   2 +
 .../james/transport/matchers/HasHeader.java     |   2 +
 .../transport/matchers/HasHeaderWithPrefix.java |   1 +
 .../transport/matchers/HasMailAttribute.java    |   8 +-
 .../matchers/HasMailAttributeWithValue.java     |  12 +-
 .../HasMailAttributeWithValueRegex.java         |   8 +-
 .../james/transport/matchers/HasMimeType.java   |   2 +
 .../apache/james/transport/matchers/HostIs.java |  10 +-
 .../james/transport/matchers/HostIsLocal.java   |   5 +-
 .../transport/matchers/IsSingleRecipient.java   |   1 +
 .../james/transport/matchers/NESSpamCheck.java  |   1 +
 .../james/transport/matchers/RecipientIs.java   |   2 +
 .../transport/matchers/RecipientIsLocal.java    |   1 +
 .../transport/matchers/RecipientIsRegex.java    |   2 +
 .../james/transport/matchers/RelayLimit.java    |   2 +
 .../transport/matchers/SMTPAuthSuccessful.java  |   1 +
 .../transport/matchers/SMTPAuthUserIs.java      |   2 +
 .../transport/matchers/SMTPIsAuthNetwork.java   |   1 +
 .../james/transport/matchers/SenderHostIs.java  |   2 +
 .../transport/matchers/SenderHostIsLocal.java   |   1 +
 .../james/transport/matchers/SenderIs.java      |   2 +
 .../james/transport/matchers/SenderIsLocal.java |   1 +
 .../james/transport/matchers/SenderIsNull.java  |   1 +
 .../james/transport/matchers/SenderIsRegex.java |   2 +
 .../james/transport/matchers/SentByMailet.java  |   1 +
 .../transport/matchers/SizeGreaterThan.java     |  10 +-
 .../james/transport/matchers/SubjectIs.java     |   1 +
 .../transport/matchers/SubjectStartsWith.java   |   1 +
 .../apache/james/transport/matchers/UserIs.java |   2 +
 .../matchers/HasMailAttributeTest.java          |   3 +
 .../HasMailAttributeWithValueRegexTest.java     |   4 +
 .../matchers/HasMailAttributeWithValueTest.java |   3 +
 .../transport/matchers/SMTPAuthUserIsTest.java  |   5 +
 .../james/mpt/ant/MailProtocolTestTask.java     |   3 +
 .../org/apache/james/mpt/ant/TestAddUser.java   |   2 +
 .../apache/james/mpt/ant/TestRunScripts.java    |   3 +
 .../main/java/org/apache/james/mpt/Runner.java  |   1 +
 .../org/apache/james/mpt/api/HostSystem.java    |   1 +
 .../james/mpt/helper/ByteBufferInputStream.java |   1 +
 .../mpt/helper/ByteBufferOutputStream.java      |   1 +
 .../apache/james/mpt/helper/ScriptBuilder.java  |   1 +
 .../james/mpt/host/ExternalHostSystem.java      |   4 +
 .../apache/james/mpt/monitor/NullMonitor.java   |   3 +
 .../james/mpt/monitor/SystemLoggingMonitor.java |   3 +
 .../protocol/FileProtocolSessionBuilder.java    |   1 +
 .../james/mpt/protocol/ProtocolSession.java     |  16 +++
 .../GenericSimpleScriptedTestProtocol.java      |   2 +
 .../mpt/script/ImapScriptedTestProtocol.java    |   1 +
 .../james/mpt/session/ExternalSession.java      |   5 +
 .../mpt/session/ExternalSessionFactory.java     |   1 +
 .../james/mpt/user/ScriptedUserAdder.java       |   1 +
 .../org/apache/james/mpt/DiscardProtocol.java   |   3 +
 .../apache/james/mpt/TestDiscardProtocol.java   |   1 +
 .../apache/james/mpt/TestScriptedUserAdder.java |   2 +
 .../cassandra/CassandraQuotaTest.java           |   1 +
 .../james/mpt/host/JamesImapHostSystem.java     |   8 ++
 .../mpt/imapmailbox/cyrus/CyrusACLCommands.java |   1 +
 .../imapmailbox/cyrus/CyrusACLIntegration.java  |   1 +
 .../imapmailbox/cyrus/host/CyrusHostSystem.java |   2 +
 .../cyrus/host/GrantRightsOnCyrusHost.java      |   1 +
 .../host/MailboxMessageAppenderOnCyrusHost.java |   1 +
 .../ElasticSearchUidSearchOnIndex.java          |   1 +
 .../james/JamesDeploymentValidation.java        |   1 +
 .../james/host/ExternalJamesHostSystem.java     |   2 +
 .../hbase/HBaseAuthenticatePlain.java           |   1 +
 .../hbase/HBaseAuthenticatedState.java          |   1 +
 .../hbase/HBaseConcurrentSessions.java          |   1 +
 .../mpt/imapmailbox/hbase/HBaseCondstore.java   |   1 +
 .../james/mpt/imapmailbox/hbase/HBaseCopy.java  |   1 +
 .../mpt/imapmailbox/hbase/HBaseEvents.java      |   1 +
 .../mpt/imapmailbox/hbase/HBaseExpunge.java     |   1 +
 .../james/mpt/imapmailbox/hbase/HBaseFetch.java |   1 +
 .../hbase/HBaseFetchBodySection.java            |   1 +
 .../hbase/HBaseFetchBodyStructure.java          |   1 +
 .../imapmailbox/hbase/HBaseFetchHeaders.java    |   1 +
 .../mpt/imapmailbox/hbase/HBaseListing.java     |   1 +
 .../hbase/HBaseMailboxAnnotation.java           |   1 +
 .../hbase/HBaseMailboxWithLongNameError.java    |   1 +
 .../james/mpt/imapmailbox/hbase/HBaseMove.java  |   1 +
 .../hbase/HBaseNonAuthenticatedState.java       |   1 +
 .../imapmailbox/hbase/HBasePartialFetch.java    |   1 +
 .../mpt/imapmailbox/hbase/HBaseQuotaTest.java   |   2 +
 .../mpt/imapmailbox/hbase/HBaseRename.java      |   1 +
 .../mpt/imapmailbox/hbase/HBaseSearch.java      |   1 +
 .../mpt/imapmailbox/hbase/HBaseSecurity.java    |   1 +
 .../mpt/imapmailbox/hbase/HBaseSelect.java      |   1 +
 .../imapmailbox/hbase/HBaseSelectedInbox.java   |   1 +
 .../imapmailbox/hbase/HBaseSelectedState.java   |   1 +
 .../mpt/imapmailbox/hbase/HBaseUidSearch.java   |   1 +
 .../hbase/HBaseUidSearchOnIndex.java            |   1 +
 .../hbase/HBaseUserFlagsSupport.java            |   1 +
 .../inmemory/InMemoryAuthenticatePlain.java     |   1 +
 .../inmemory/InMemoryAuthenticatedState.java    |   1 +
 .../inmemory/InMemoryConcurrentSessions.java    |   1 +
 .../imapmailbox/inmemory/InMemoryCondstore.java |   1 +
 .../mpt/imapmailbox/inmemory/InMemoryCopy.java  |   1 +
 .../imapmailbox/inmemory/InMemoryEvents.java    |   1 +
 .../imapmailbox/inmemory/InMemoryExpunge.java   |   1 +
 .../mpt/imapmailbox/inmemory/InMemoryFetch.java |   1 +
 .../inmemory/InMemoryFetchBodySection.java      |   1 +
 .../inmemory/InMemoryFetchBodyStructure.java    |   1 +
 .../inmemory/InMemoryFetchHeaders.java          |   1 +
 .../imapmailbox/inmemory/InMemoryListing.java   |   1 +
 .../InMemoryListingWithSharingTest.java         |   1 +
 .../inmemory/InMemoryMailboxAnnotation.java     |   1 +
 .../InMemoryMailboxWithLongNameSuccess.java     |   1 +
 .../mpt/imapmailbox/inmemory/InMemoryMove.java  |   1 +
 .../inmemory/InMemoryNonAuthenticatedState.java |   1 +
 .../inmemory/InMemoryPartialFetch.java          |   1 +
 .../imapmailbox/inmemory/InMemoryQuotaTest.java |   2 +
 .../imapmailbox/inmemory/InMemoryRename.java    |   1 +
 .../imapmailbox/inmemory/InMemorySearch.java    |   1 +
 .../imapmailbox/inmemory/InMemorySecurity.java  |   1 +
 .../imapmailbox/inmemory/InMemorySelect.java    |   1 +
 .../inmemory/InMemorySelectedInbox.java         |   1 +
 .../inmemory/InMemorySelectedState.java         |   1 +
 .../imapmailbox/inmemory/InMemoryUidSearch.java |   1 +
 .../inmemory/InMemoryUidSearchOnIndex.java      |   1 +
 .../inmemory/InMemoryUserFlagsSupport.java      |   1 +
 .../imapmailbox/jpa/JpaAuthenticatePlain.java   |   1 +
 .../imapmailbox/jpa/JpaAuthenticatedState.java  |   1 +
 .../imapmailbox/jpa/JpaConcurrentSessions.java  |   1 +
 .../james/mpt/imapmailbox/jpa/JpaCondstore.java |   1 +
 .../james/mpt/imapmailbox/jpa/JpaCopy.java      |   1 +
 .../james/mpt/imapmailbox/jpa/JpaEvents.java    |   1 +
 .../james/mpt/imapmailbox/jpa/JpaExpunge.java   |   1 +
 .../james/mpt/imapmailbox/jpa/JpaFetch.java     |   1 +
 .../imapmailbox/jpa/JpaFetchBodySection.java    |   1 +
 .../imapmailbox/jpa/JpaFetchBodyStructure.java  |   1 +
 .../mpt/imapmailbox/jpa/JpaFetchHeaders.java    |   1 +
 .../james/mpt/imapmailbox/jpa/JpaListing.java   |   1 +
 .../imapmailbox/jpa/JpaMailboxAnnotation.java   |   1 +
 .../jpa/JpaMailboxWithLongNameError.java        |   1 +
 .../james/mpt/imapmailbox/jpa/JpaMove.java      |   1 +
 .../jpa/JpaNonAuthenticatedState.java           |   1 +
 .../mpt/imapmailbox/jpa/JpaPartialFetch.java    |   1 +
 .../james/mpt/imapmailbox/jpa/JpaQuotaTest.java |   2 +
 .../james/mpt/imapmailbox/jpa/JpaRename.java    |   1 +
 .../james/mpt/imapmailbox/jpa/JpaSearch.java    |   1 +
 .../james/mpt/imapmailbox/jpa/JpaSecurity.java  |   1 +
 .../james/mpt/imapmailbox/jpa/JpaSelect.java    |   1 +
 .../mpt/imapmailbox/jpa/JpaSelectedInbox.java   |   1 +
 .../mpt/imapmailbox/jpa/JpaSelectedState.java   |   1 +
 .../james/mpt/imapmailbox/jpa/JpaUidSearch.java |   1 +
 .../imapmailbox/jpa/JpaUidSearchOnIndex.java    |   1 +
 .../imapmailbox/jpa/JpaUserFlagsSupport.java    |   1 +
 .../lucenesearch/LuceneAuthenticatePlain.java   |   1 +
 .../lucenesearch/LuceneAuthenticatedState.java  |   1 +
 .../lucenesearch/LuceneConcurrentSessions.java  |   1 +
 .../lucenesearch/LuceneCondstore.java           |   1 +
 .../imapmailbox/lucenesearch/LuceneCopy.java    |   1 +
 .../imapmailbox/lucenesearch/LuceneEvents.java  |   1 +
 .../imapmailbox/lucenesearch/LuceneExpunge.java |   1 +
 .../imapmailbox/lucenesearch/LuceneFetch.java   |   1 +
 .../lucenesearch/LuceneFetchBodySection.java    |   1 +
 .../lucenesearch/LuceneFetchBodyStructure.java  |   1 +
 .../lucenesearch/LuceneFetchHeaders.java        |   1 +
 .../imapmailbox/lucenesearch/LuceneListing.java |   1 +
 .../lucenesearch/LuceneMailboxAnnotation.java   |   1 +
 .../LuceneMailboxWithLongNameError.java         |   1 +
 .../imapmailbox/lucenesearch/LuceneMove.java    |   1 +
 .../LuceneNonAuthenticatedState.java            |   1 +
 .../lucenesearch/LucenePartialFetch.java        |   1 +
 .../lucenesearch/LuceneQuotaTest.java           |   2 +
 .../imapmailbox/lucenesearch/LuceneRename.java  |   1 +
 .../imapmailbox/lucenesearch/LuceneSearch.java  |   1 +
 .../lucenesearch/LuceneSecurity.java            |   1 +
 .../imapmailbox/lucenesearch/LuceneSelect.java  |   1 +
 .../lucenesearch/LuceneSelectedInbox.java       |   1 +
 .../lucenesearch/LuceneSelectedState.java       |   1 +
 .../lucenesearch/LuceneUidSearch.java           |   1 +
 .../lucenesearch/LuceneUidSearchOnIndex.java    |   1 +
 .../lucenesearch/LuceneUserFlagsSupport.java    |   1 +
 .../maildir/MaildirAuthenticatePlain.java       |   1 +
 .../maildir/MaildirAuthenticatedState.java      |   1 +
 .../maildir/MaildirConcurrentSessions.java      |   1 +
 .../imapmailbox/maildir/MaildirCondstore.java   |   1 +
 .../mpt/imapmailbox/maildir/MaildirCopy.java    |   1 +
 .../mpt/imapmailbox/maildir/MaildirEvents.java  |   1 +
 .../mpt/imapmailbox/maildir/MaildirExpunge.java |   1 +
 .../mpt/imapmailbox/maildir/MaildirFetch.java   |   1 +
 .../maildir/MaildirFetchBodySection.java        |   1 +
 .../maildir/MaildirFetchBodyStructure.java      |   1 +
 .../maildir/MaildirFetchHeaders.java            |   1 +
 .../mpt/imapmailbox/maildir/MaildirListing.java |   1 +
 .../maildir/MaildirMailboxAnnotation.java       |   1 +
 .../MaildirMailboxWithLongNameError.java        |   1 +
 .../mpt/imapmailbox/maildir/MaildirMove.java    |   1 +
 .../maildir/MaildirNonAuthenticatedState.java   |   1 +
 .../maildir/MaildirPartialFetch.java            |   1 +
 .../imapmailbox/maildir/MaildirQuotaTest.java   |   2 +
 .../mpt/imapmailbox/maildir/MaildirRename.java  |   1 +
 .../mpt/imapmailbox/maildir/MaildirSearch.java  |   1 +
 .../imapmailbox/maildir/MaildirSecurity.java    |   1 +
 .../mpt/imapmailbox/maildir/MaildirSelect.java  |   1 +
 .../maildir/MaildirSelectedInbox.java           |   1 +
 .../maildir/MaildirSelectedState.java           |   1 +
 .../imapmailbox/maildir/MaildirUidSearch.java   |   1 +
 .../maildir/MaildirUidSearchOnIndex.java        |   1 +
 .../maildir/MaildirUserFlagsSupport.java        |   1 +
 .../cassandra/CassandraAuthenticateTest.java    |   2 +
 .../cassandra/CassandraCapabilityTest.java      |   2 +
 .../cassandra/CassandraCheckScriptTest.java     |   2 +
 .../cassandra/CassandraDeleteScriptTest.java    |   2 +
 .../cassandra/CassandraGetScriptTest.java       |   2 +
 .../cassandra/CassandraHaveSpaceTest.java       |   2 +
 .../cassandra/CassandraListScriptsTest.java     |   2 +
 .../cassandra/CassandraLogoutTest.java          |   2 +
 .../cassandra/CassandraNoopTest.java            |   2 +
 .../cassandra/CassandraPutScriptTest.java       |   2 +
 .../cassandra/CassandraRenameScriptTest.java    |   2 +
 .../cassandra/CassandraSetActiveTest.java       |   2 +
 .../cassandra/CassandraStartTlsTest.java        |   2 +
 .../cassandra/CassandraUnauthenticatedTest.java |   2 +
 .../cassandra/host/CassandraHostSystem.java     |   2 +
 .../managesieve/file/FileAuthenticateTest.java  |   2 +
 .../managesieve/file/FileCapabilityTest.java    |   2 +
 .../managesieve/file/FileCheckScriptTest.java   |   2 +
 .../managesieve/file/FileDeleteScriptTest.java  |   2 +
 .../mpt/managesieve/file/FileGetScriptTest.java |   2 +
 .../mpt/managesieve/file/FileHaveSpaceTest.java |   2 +
 .../managesieve/file/FileListScriptsTest.java   |   2 +
 .../mpt/managesieve/file/FileLogoutTest.java    |   2 +
 .../mpt/managesieve/file/FileNoopTest.java      |   2 +
 .../mpt/managesieve/file/FilePutScriptTest.java |   2 +
 .../managesieve/file/FileRenameScriptTest.java  |   2 +
 .../mpt/managesieve/file/FileSetActiveTest.java |   2 +
 .../mpt/managesieve/file/FileStartTlsTest.java  |   2 +
 .../file/FileUnauthenticatedTest.java           |   2 +
 .../managesieve/file/host/FileHostSystem.java   |   3 +
 .../mpt/smtp/CassandraForwardSmtpTest.java      |   1 +
 .../smtp/CassandraSmtpStarttlsCommandTest.java  |   1 +
 .../smtp/host/CassandraJamesSmtpHostSystem.java |   1 +
 .../james/mpt/maven/MailProtocolTest.java       |  15 +--
 .../james/mpt/maven/MailProtocolTestMojo.java   |   1 +
 .../api/AbstractProtocolTransport.java          |   4 +-
 .../james/protocols/api/AbstractResponse.java   |   5 +
 .../apache/james/protocols/api/BaseRequest.java |   8 +-
 .../protocols/api/CombinedInputStream.java      |   8 +-
 .../api/ProtocolConfigurationImpl.java          |  17 +--
 .../james/protocols/api/ProtocolImpl.java       |  15 +--
 .../protocols/api/ProtocolSessionImpl.java      |  72 +++--------
 .../apache/james/protocols/api/Response.java    |   3 +
 .../api/future/FutureResponseImpl.java          |  26 +---
 .../api/future/FutureStreamResponseImpl.java    |   5 +-
 .../handler/AbstractProtocolHandlerChain.java   |   9 +-
 .../api/handler/CommandDispatcher.java          |  14 +--
 .../api/handler/CommandHandlerResultLogger.java |   1 +
 .../protocols/api/handler/MultiLineHandler.java |   5 +-
 .../api/handler/ProtocolHandlerChainImpl.java   | 121 +++++--------------
 .../api/handler/UnknownCommandHandler.java      |   5 +-
 .../api/AbstractProtocolTransportTest.java      |  16 +++
 .../api/utils/BogusTrustManagerFactory.java     |   3 +
 .../apache/james/imap/api/message/IdRange.java  |   5 +
 .../imap/decode/ImapRequestLineReader.java      |   4 +
 .../decode/base/AbstractImapCommandParser.java  |  10 +-
 .../imap/decode/main/DefaultImapDecoder.java    |   6 +-
 .../AbstractMessageRangeCommandParser.java      |   1 +
 .../parser/AbstractSelectionCommandParser.java  |   2 +
 .../decode/parser/AbstractUidCommandParser.java |   1 +
 .../imap/decode/parser/AppendCommandParser.java |   7 +-
 .../parser/AuthenticateCommandParser.java       |   7 +-
 .../decode/parser/CapabilityCommandParser.java  |   7 +-
 .../imap/decode/parser/CheckCommandParser.java  |   7 +-
 .../imap/decode/parser/CloseCommandParser.java  |   7 +-
 .../decode/parser/CompressCommandParser.java    |   7 +-
 .../imap/decode/parser/CreateCommandParser.java |   7 +-
 .../imap/decode/parser/DeleteCommandParser.java |   7 +-
 .../decode/parser/ExpungeCommandParser.java     |   7 +-
 .../imap/decode/parser/FetchCommandParser.java  |   9 +-
 .../imap/decode/parser/IdleCommandParser.java   |   7 +-
 .../imap/decode/parser/ImapParserFactory.java   |   4 +-
 .../imap/decode/parser/ListCommandParser.java   |   8 +-
 .../imap/decode/parser/LoginCommandParser.java  |   7 +-
 .../imap/decode/parser/LogoutCommandParser.java |   7 +-
 .../imap/decode/parser/LsubCommandParser.java   |   6 +-
 .../decode/parser/NamespaceCommandParser.java   |   7 +-
 .../imap/decode/parser/NoopCommandParser.java   |   7 +-
 .../imap/decode/parser/RenameCommandParser.java |   7 +-
 .../imap/decode/parser/SearchCommandParser.java |   1 +
 .../decode/parser/StartTLSCommandParser.java    |   7 +-
 .../imap/decode/parser/StatusCommandParser.java |   7 +-
 .../imap/decode/parser/StoreCommandParser.java  |   8 +-
 .../decode/parser/SubscribeCommandParser.java   |   7 +-
 .../imap/decode/parser/UidCommandParser.java    |  15 +--
 .../decode/parser/UnselectCommandParser.java    |   7 +-
 .../decode/parser/UnsubscribeCommandParser.java |   7 +-
 .../james/imap/encode/ACLResponseEncoder.java   |   9 +-
 .../imap/encode/AnnotationResponseEncoder.java  |   2 +
 .../encode/AuthenticateResponseEncoder.java     |  10 +-
 .../imap/encode/CapabilityResponseEncoder.java  |  13 +-
 .../encode/ContinuationResponseEncoder.java     |   2 +
 .../imap/encode/ESearchResponseEncoder.java     |   6 +-
 .../imap/encode/EnableResponseEncoder.java      |  14 +--
 .../imap/encode/ExistsResponseEncoder.java      |   2 +
 .../imap/encode/ExpungeResponseEncoder.java     |   2 +
 .../james/imap/encode/FetchResponseEncoder.java |   2 +
 .../james/imap/encode/FlagsResponseEncoder.java |   2 +
 .../james/imap/encode/LSubResponseEncoder.java  |   2 +
 .../james/imap/encode/ListResponseEncoder.java  |   2 +
 .../imap/encode/ListRightsResponseEncoder.java  |  14 +--
 .../encode/MailboxStatusResponseEncoder.java    |   2 +
 .../imap/encode/MyRightsResponseEncoder.java    |  16 +--
 .../james/imap/encode/QuotaResponseEncoder.java |   9 +-
 .../imap/encode/QuotaRootResponseEncoder.java   |   9 +-
 .../imap/encode/RecentResponseEncoder.java      |   2 +
 .../imap/encode/SearchResponseEncoder.java      |   2 +
 .../imap/encode/StatusResponseEncoder.java      |   2 +
 .../james/imap/encode/XListResponseEncoder.java |   2 +
 .../encode/base/AbstractChainedImapEncoder.java |   1 +
 .../james/imap/encode/base/EndImapEncoder.java  |   6 +-
 .../encode/base/ImapResponseComposerImpl.java   | 105 ++++------------
 .../encode/main/DefaultImapEncoderFactory.java  |   4 +-
 .../imap/encode/main/DefaultLocalizer.java      |   4 +-
 .../imap/main/AbstractImapRequestHandler.java   |   1 +
 .../imap/main/DefaultImapDecoderFactory.java    |   1 +
 .../apache/james/imap/main/ResponseEncoder.java |   1 +
 .../message/request/AbstractImapRequest.java    |   2 +
 .../response/AbstactStatusResponseFactory.java  |  16 +++
 .../response/ImmutableStatusResponse.java       |  20 +--
 .../response/UnpooledStatusResponseFactory.java |   1 +
 .../processor/AbstractSelectionProcessor.java   |  22 +---
 .../james/imap/processor/AppendProcessor.java   |   8 +-
 .../imap/processor/AuthenticateProcessor.java   |  13 +-
 .../imap/processor/CapabilityProcessor.java     |  13 +-
 .../james/imap/processor/CheckProcessor.java    |   1 +
 .../james/imap/processor/CloseProcessor.java    |   1 +
 .../james/imap/processor/CompressProcessor.java |  12 +-
 .../james/imap/processor/CreateProcessor.java   |   8 +-
 .../imap/processor/DeleteACLProcessor.java      |   7 +-
 .../james/imap/processor/DeleteProcessor.java   |   8 +-
 .../james/imap/processor/EnableProcessor.java   |  12 +-
 .../james/imap/processor/ExpungeProcessor.java  |   6 +-
 .../james/imap/processor/GetACLProcessor.java   |   7 +-
 .../imap/processor/GetAnnotationProcessor.java  |   4 +-
 .../james/imap/processor/GetQuotaProcessor.java |   7 +-
 .../imap/processor/GetQuotaRootProcessor.java   |   1 +
 .../james/imap/processor/IdleProcessor.java     |   5 +
 .../james/imap/processor/LSubProcessor.java     |   8 +-
 .../james/imap/processor/ListProcessor.java     |  14 +--
 .../imap/processor/ListRightsProcessor.java     |   7 +-
 .../james/imap/processor/LoginProcessor.java    |  12 +-
 .../james/imap/processor/LogoutProcessor.java   |   1 +
 .../james/imap/processor/MyRightsProcessor.java |   5 +-
 .../imap/processor/NamespaceProcessor.java      |   5 +-
 .../james/imap/processor/NoopProcessor.java     |   1 +
 .../james/imap/processor/RenameProcessor.java   |   9 +-
 .../james/imap/processor/SearchProcessor.java   |   6 +-
 .../james/imap/processor/SetACLProcessor.java   |   7 +-
 .../imap/processor/SetAnnotationProcessor.java  |   4 +-
 .../james/imap/processor/SetQuotaProcessor.java |   1 +
 .../james/imap/processor/StartTLSProcessor.java |  13 +-
 .../james/imap/processor/StatusProcessor.java   |   9 +-
 .../james/imap/processor/StoreProcessor.java    |   7 +-
 .../imap/processor/SubscribeProcessor.java      |   8 +-
 .../james/imap/processor/UnselectProcessor.java |  14 +--
 .../imap/processor/UnsubscribeProcessor.java    |   8 +-
 .../james/imap/processor/XListProcessor.java    |   5 +-
 .../base/AbstractChainedProcessor.java          |   6 -
 .../base/ImapResponseMessageProcessor.java      |   1 +
 .../processor/base/SelectedMailboxImpl.java     |   9 ++
 .../processor/base/UnknownRequestProcessor.java |   1 +
 .../james/imap/processor/fetch/AddressImpl.java |  16 +--
 .../processor/fetch/ContentBodyElement.java     |  13 +-
 .../imap/processor/fetch/EmptyContent.java      |   5 +-
 .../imap/processor/fetch/EnvelopeImpl.java      |  40 ++----
 .../imap/processor/fetch/FetchProcessor.java    |   8 +-
 .../imap/processor/fetch/MimeBodyElement.java   |  14 +--
 .../fetch/MimeDescriptorStructure.java          |  64 +++-------
 .../imap/processor/fetch/MimePathImpl.java      |   4 +-
 .../fetch/PartialFetchBodyElement.java          |  20 +--
 .../james/protocols/imap/DecodingException.java |   1 +
 .../james/protocols/imap/IMAPRequest.java       |  13 +-
 .../james/protocols/imap/IMAPSession.java       |   2 +
 .../imap/core/IMAPCommandDispatcher.java        |   1 +
 .../imap/utils/FixedLengthInputStream.java      |   9 ++
 .../decode/ImapRequestStreamLineReader.java     |   6 +-
 .../main/OutputStreamImapResponseWriter.java    |   9 +-
 .../james/imap/encode/FakeImapSession.java      |  20 ++-
 .../encode/base/ByteImapResponseWriter.java     |   5 +-
 .../UnpooledStatusResponseFactoryTest.java      |   1 +
 .../james/imap/processor/LSubProcessorTest.java |   3 +
 .../processor/StatusResponseTypeMatcher.java    |   8 +-
 .../base/FakeMailboxListenerFlagsUpdate.java    |   4 +-
 .../base/MailboxEventAnalyserTest.java          |   4 +
 .../fetch/MailboxMessageResultUtilsTest.java    |   4 +
 .../james/protocols/lmtp/LMTPConfiguration.java |  16 +--
 .../protocols/lmtp/LMTPConfigurationImpl.java   |   5 +-
 .../james/protocols/lmtp/LMTPMultiResponse.java |  15 +--
 .../protocols/lmtp/AbstractLMTPSServerTest.java |   1 +
 .../protocols/lmtp/AbstractLMTPServerTest.java  |   4 +
 .../apache/james/managesieve/jsieve/Parser.java |   2 +
 .../james/managesieve/util/SettableSession.java |   9 ++
 .../protocols/netty/AbstractAsyncServer.java    |  30 +----
 .../netty/AbstractChannelPipelineFactory.java   |   4 +-
 .../protocols/netty/NettyProtocolTransport.java |  40 ++----
 .../james/protocols/pop3/POP3Response.java      |   1 +
 .../james/protocols/pop3/POP3SessionImpl.java   |  17 +--
 .../protocols/pop3/POP3StartTlsResponse.java    |   3 +
 .../protocols/pop3/POP3StreamResponse.java      |   8 +-
 .../pop3/core/AbstractApopCmdHandler.java       |   5 +-
 .../pop3/core/AbstractPassCmdHandler.java       |   5 +-
 .../protocols/pop3/core/CapaCmdHandler.java     |  23 +---
 .../protocols/pop3/core/DeleCmdHandler.java     |   5 +-
 .../protocols/pop3/core/ListCmdHandler.java     |   5 +-
 .../protocols/pop3/core/NoopCmdHandler.java     |   5 +-
 .../protocols/pop3/core/QuitCmdHandler.java     |   5 +-
 .../protocols/pop3/core/RetrCmdHandler.java     |   5 +-
 .../protocols/pop3/core/RsetCmdHandler.java     |   5 +-
 .../protocols/pop3/core/StatCmdHandler.java     |   5 +-
 .../protocols/pop3/core/StlsCmdHandler.java     |  12 +-
 .../protocols/pop3/core/TopCmdHandler.java      |   7 +-
 .../protocols/pop3/core/UidlCmdHandler.java     |   9 +-
 .../protocols/pop3/core/UnknownCmdHandler.java  |   1 +
 .../protocols/pop3/core/UserCmdHandler.java     |   9 +-
 .../pop3/core/WelcomeMessageHandler.java        |   5 +-
 .../protocols/pop3/mailbox/AbstractMailbox.java |   7 +-
 .../protocols/pop3/mailbox/ImapMailbox.java     |   4 +
 .../james/protocols/pop3/utils/MockMailbox.java |   7 ++
 .../pop3/utils/TestPassCmdHandler.java          |   1 +
 .../james/protocols/smtp/MailEnvelopeImpl.java  |  20 +--
 .../protocols/smtp/SMTPConfigurationImpl.java   |  17 +--
 .../smtp/SMTPProtocolHandlerChain.java          |   1 +
 .../james/protocols/smtp/SMTPResponse.java      |   4 +-
 .../james/protocols/smtp/SMTPSession.java       |   1 +
 .../james/protocols/smtp/SMTPSessionImpl.java   |  17 +--
 .../protocols/smtp/SMTPStartTlsResponse.java    |   3 +
 .../AbstractAuthRequiredToRelayRcptHook.java    |   7 +-
 .../smtp/core/AbstractHookableCmdHandler.java   |  19 +--
 ...tSenderAuthIdentifyVerificationRcptHook.java |   7 +-
 .../AcceptRecipientIfRelayingIsAllowed.java     |   7 +-
 .../protocols/smtp/core/DataCmdHandler.java     |  17 +--
 .../smtp/core/DataLineMessageHookHandler.java   |  10 +-
 .../protocols/smtp/core/ExpnCmdHandler.java     |   5 +-
 .../protocols/smtp/core/HeloCmdHandler.java     |  26 ++--
 .../protocols/smtp/core/HelpCmdHandler.java     |   5 +-
 .../protocols/smtp/core/MailCmdHandler.java     |  37 ++----
 .../protocols/smtp/core/NoopCmdHandler.java     |   5 +-
 .../smtp/core/PostmasterAbuseRcptHook.java      |   4 +-
 .../protocols/smtp/core/QuitCmdHandler.java     |  26 ++--
 .../protocols/smtp/core/RcptCmdHandler.java     |  18 ++-
 .../protocols/smtp/core/RsetCmdHandler.java     |   5 +-
 .../smtp/core/SeparatingDataLineFilter.java     |   5 +-
 .../protocols/smtp/core/UnknownCmdHandler.java  |   4 +-
 .../protocols/smtp/core/VrfyCmdHandler.java     |   5 +-
 .../smtp/core/WelcomeMessageHandler.java        |   4 +-
 .../smtp/core/esmtp/AuthCmdHandler.java         |  29 ++---
 .../smtp/core/esmtp/EhloCmdHandler.java         |  39 ++----
 .../smtp/core/esmtp/MailSizeEsmtpExtension.java |  22 +---
 .../smtp/core/esmtp/StartTlsCmdHandler.java     |   6 +-
 .../core/fastfail/AbstractGreylistHandler.java  |   4 +-
 .../core/fastfail/AbstractValidRcptHandler.java |   4 +-
 .../smtp/core/fastfail/DNSRBLHandler.java       |   4 +-
 .../smtp/core/fastfail/MaxRcptHandler.java      |   4 +-
 .../core/fastfail/MaxUnknownCmdHandler.java     |   5 +-
 .../fastfail/ResolvableEhloHeloHandler.java     |   8 +-
 .../fastfail/ReverseEqualsEhloHeloHandler.java  |   3 -
 .../smtp/core/fastfail/SpamTrapHandler.java     |   4 +-
 .../fastfail/SupressDuplicateRcptHandler.java   |   4 +-
 .../core/fastfail/ValidSenderDomainHandler.java |   4 +-
 .../smtp/core/log/HookResultLogger.java         |   1 +
 .../james/protocols/smtp/hook/SimpleHook.java   |   4 +
 .../protocols/smtp/AbstractSMTPServerTest.java  |  11 ++
 .../smtp/core/fastfail/DNSRBLHandlerTest.java   |   6 +
 .../smtp/core/fastfail/MaxRcptHandlerTest.java  |   3 +
 .../core/fastfail/MaxUnknownCmdHandlerTest.java |   3 +
 .../fastfail/ResolvableEhloHeloHandlerTest.java |   7 ++
 .../fastfail/ValidSenderDomainHandlerTest.java  |   4 +
 .../smtp/utils/BaseFakeSMTPSession.java         |  69 ++++-------
 .../protocols/smtp/utils/TestMessageHook.java   |   1 +
 .../james/app/spring/JamesAppSpringMain.java    |  17 +--
 .../james/cli/probe/impl/JmxDataProbe.java      |   1 +
 .../james/cli/probe/impl/JmxMailboxProbe.java   |   1 +
 .../james/cli/probe/impl/JmxQuotaProbe.java     |   1 +
 .../james/cli/probe/impl/JmxSieveProbe.java     |   1 +
 .../server/core/JamesServerResourceLoader.java  |  19 +--
 .../apache/james/server/core/MailHeaders.java   |   2 +
 .../org/apache/james/server/core/MailImpl.java  |   2 +
 .../core/MimeMessageInputStreamSource.java      |   2 +
 .../james/server/core/MimeMessageUtil.java      |   3 +
 .../james/server/core/MimeMessageWrapper.java   |  15 ---
 .../mailbox/ResilientClusterProvider.java       |   1 +
 .../james/modules/server/DNSServiceModule.java  |   1 +
 .../onami/lifecycle/AbstractBasicStageable.java |   3 -
 .../lifecycle/AbstractMethodTypeListener.java   |   3 -
 .../onami/lifecycle/AbstractStageable.java      |   3 -
 .../james/onami/lifecycle/DefaultStager.java    |  18 ---
 .../onami/lifecycle/LifeCycleStageModule.java   |   3 -
 .../james/onami/lifecycle/NoOpStageHandler.java |   6 -
 .../james/onami/lifecycle/StageableMethod.java  |   3 -
 .../mailbox/MailboxCopierManagement.java        |  12 +-
 .../mailbox/MailboxManagerManagement.java       |   8 --
 .../store/UserRepositoryAuthenticator.java      |   1 +
 .../spring/bean/AbstractBeanFactory.java        |   1 +
 .../bean/factory/AbstractBeanFactory.java       |   1 +
 .../MailetLoaderBeanFactory.java                |   4 +-
 .../MatcherLoaderBeanFactory.java               |   4 +-
 .../MailRepositoryStoreBeanFactory.java         |   9 +-
 .../ConfigurationBeanFactoryPostProcessor.java  |   1 +
 .../FileSystemBeanFactoryPostProcessor.java     |   5 +-
 ...erConfigurationBeanFactoryPostProcessor.java |   5 +-
 ...oxConfigurationBeanFactoryPostProcessor.java |   1 +
 .../context/JamesServerApplicationContext.java  |  25 +---
 .../web/JamesServerWebApplicationContext.java   |  29 ++---
 .../AbstractLifecycleBeanPostProcessor.java     |  14 +--
 .../lifecycle/ConfigurationProviderImpl.java    |  14 +--
 .../spring/lifecycle/LogProviderImpl.java       |  31 ++---
 ...AbstractOSGIAnnotationBeanPostProcessor.java |  12 +-
 ...OSGIResourceAnnotationBeanPostProcessor.java |   4 +-
 .../spring/mailbox/SpringResolver.java          |   6 +-
 .../resource/DefaultJamesResourceLoader.java    |   5 +
 .../james/util/BodyOffsetInputStream.java       |  12 +-
 .../james/util/RestrictingRMISocketFactory.java |   2 +
 .../james/util/bayesian/BayesianAnalyzer.java   |   1 +
 .../JMXEnabledScheduledThreadPoolExecutor.java  |  26 ++--
 .../JMXEnabledThreadPoolExecutor.java           |  26 ++--
 .../james/util/retry/DoublingRetrySchedule.java |   5 -
 .../james/util/retry/ExceptionRetryHandler.java |  11 +-
 .../util/retry/naming/LoggingRetryHandler.java  |   2 -
 .../naming/NamingExceptionRetryHandler.java     |   4 -
 .../util/retry/naming/RetryingContext.java      |  83 +------------
 .../naming/directory/RetryingDirContext.java    |  66 ----------
 .../retry/naming/ldap/RetryingLdapContext.java  |  21 ----
 .../util/retry/ExceptionRetryHandlerTest.java   |   8 --
 .../naming/NamingExceptionRetryHandlerTest.java |   8 --
 .../cassandra/CassandraDomainListTest.java      |   1 +
 .../CassandraRecipientRewriteTableTest.java     |   2 +
 .../cassandra/CassandraSieveRepositoryTest.java |   1 +
 .../cassandra/CassandraUsersRepositoryTest.java |   2 +
 .../mailrepository/file/MBoxMailRepository.java |  39 +++---
 .../file/MimeMessageStreamRepositorySource.java |  11 +-
 .../file/SieveFileRepository.java               |   2 +
 .../james/user/file/UsersFileRepository.java    |  39 ++----
 .../mailrepository/FileMailRepositoryTest.java  |   4 +
 .../rrt/file/XMLRecipientRewriteTableTest.java  |   2 +
 .../file/SieveFileRepositoryTest.java           |   4 +
 .../user/file/UsersFileRepositoryTest.java      |   2 +
 .../james/domainlist/hbase/HBaseDomainList.java |   9 --
 .../rrt/hbase/HBaseRecipientRewriteTable.java   |  15 ---
 .../james/user/hbase/HBaseUsersRepository.java  |  27 -----
 .../domainlist/hbase/HBaseDomainListTest.java   |   4 +-
 .../hbase/HBaseRecipientRewriteTableTest.java   |   4 +-
 .../user/hbase/HBaseUsersRepositoryTest.java    |   3 -
 .../mailrepository/jcr/JCRMailRepository.java   |   7 +-
 .../james/user/jcr/JCRUsersRepository.java      |   8 ++
 .../apache/james/user/jcr/model/JCRUser.java    |   3 +
 .../mailrepository/jdbc/JDBCMailRepository.java |  17 +--
 .../mailrepository/jdbc/MessageInputStream.java |  38 ++----
 .../jdbc/MimeMessageJDBCSource.java             |   5 +-
 .../rrt/jdbc/JDBCRecipientRewriteTable.java     |  17 +--
 .../user/jdbc/AbstractJdbcUsersRepository.java  |  11 +-
 .../user/jdbc/JamesUsersJdbcRepository.java     |  14 +--
 .../rrt/jdbc/JDBCRecipientRewriteTableTest.java |   2 +
 .../jdbc/DefaultUsersJdbcRepositoryTest.java    |   2 +
 .../user/jdbc/JamesUsersJdbcRepositoryTest.java |   2 +
 .../CassandraAccessTokenRepositoryTest.java     |   1 +
 .../CassandraNotificationRegistryTest.java      |   1 +
 .../CassandraVacationRepositoryTest.java        |   1 +
 .../access/MemoryAccessTokenRepositoryTest.java |   1 +
 .../james/rrt/jpa/JPARecipientRewriteTable.java |  16 +--
 .../james/user/jpa/JPAUsersRepository.java      |  17 +--
 .../apache/james/user/jpa/model/JPAUser.java    |  12 +-
 .../james/domainlist/jpa/JPADomainListTest.java |   1 +
 .../rrt/jpa/JPARecipientRewriteTableTest.java   |   2 +
 .../james/user/jpa/JpaUsersRepositoryTest.java  |   1 +
 .../james/user/ldap/ReadOnlyLDAPUser.java       |   3 +
 .../user/ldap/ReadOnlyUsersLDAPRepository.java  |  33 ++---
 .../lib/AbstractMailRepository.java             |  19 ++-
 .../repository/file/AbstractFileRepository.java |   1 +
 .../file/ClassLoaderObjectInputStream.java      |   1 +
 .../repository/file/ExtensionFileFilter.java    |   1 +
 .../file/FilePersistentObjectRepository.java    |  22 +---
 .../file/NumberedRepositoryFileFilter.java      |   4 +-
 .../rrt/lib/AbstractRecipientRewriteTable.java  |  68 +++--------
 .../lib/RecipientRewriteTableManagement.java    |  60 ++-------
 .../user/lib/AbstractJamesUsersRepository.java  |  43 +++----
 .../james/user/lib/AbstractUsersRepository.java |  14 +--
 .../james/user/lib/model/DefaultJamesUser.java  |  32 ++---
 .../james/user/lib/model/DefaultUser.java       |  12 +-
 .../domainlist/memory/MemoryDomainListTest.java |   1 +
 .../memory/MemoryRecipientRewriteTableTest.java |   2 +
 .../user/memory/MemoryUsersRepositoryTest.java  |   1 +
 .../dnsservice/api/mock/MockDNSService.java     |  18 ---
 .../dnsservice/dnsjava/DNSJavaService.java      |   1 +
 .../library/MXHostAddressIterator.java          |   3 -
 .../configuration/SmtpConfiguration.java        |   1 +
 .../mailetcontainer/impl/JamesMailSpooler.java  |   4 +-
 .../impl/JamesMailetContext.java                |   6 +-
 .../mailetcontainer/impl/MailetConfigImpl.java  |  14 +--
 .../mailetcontainer/impl/MatcherConfigImpl.java |   3 +
 .../impl/camel/CamelCompositeProcessor.java     |  14 +--
 .../impl/camel/CamelMailetProcessor.java        |  23 ++--
 .../impl/camel/CamelProcessor.java              |   1 +
 .../impl/camel/DisposeProcessor.java            |   4 +-
 .../impl/camel/MailStateEquals.java             |   4 +-
 .../impl/camel/MailStateNotEquals.java          |   4 +-
 .../impl/camel/MatcherMatch.java                |   4 +-
 .../jmx/JMXStateCompositeProcessorListener.java |  11 +-
 .../jmx/JMXStateMailetProcessorListener.java    |  17 +--
 .../impl/jmx/MailProcessorManagement.java       |  28 ++---
 .../impl/jmx/MailetManagement.java              |  35 ++----
 .../impl/jmx/MatcherManagement.java             |  46 ++-----
 .../mailetcontainer/impl/matchers/And.java      |   1 +
 .../impl/matchers/GenericCompositeMatcher.java  |   2 +
 .../mailetcontainer/impl/matchers/Not.java      |   1 +
 .../james/mailetcontainer/impl/matchers/Or.java |   1 +
 .../mailetcontainer/impl/matchers/Xor.java      |   1 +
 .../lib/AbstractStateCompositeProcessor.java    |  11 +-
 .../lib/AbstractStateMailetProcessor.java       |  10 +-
 .../mailets/AbstractRecipientRewriteTable.java  |   1 +
 .../transport/mailets/BayesianAnalysis.java     |   4 +
 .../mailets/BayesianAnalysisFeeder.java         |  14 +--
 .../james/transport/mailets/FromRepository.java |  11 +-
 .../james/transport/mailets/JDBCAlias.java      |  11 +-
 .../mailets/JDBCRecipientRewriteTable.java      |   6 +-
 .../james/transport/mailets/LocalDelivery.java  |   3 +
 .../james/transport/mailets/RemoteDelivery.java |   1 +
 .../org/apache/james/transport/mailets/SPF.java |  24 +++-
 .../james/transport/mailets/SpamAssassin.java   |  12 +-
 .../UsersRepositoryAliasingForwarding.java      |   1 +
 .../transport/mailets/WhiteListManager.java     |  14 +--
 .../mailets/XMLRecipientRewriteTable.java       |   6 +-
 .../transport/mailets/jsieve/DiscardAction.java |   1 +
 .../mailets/jsieve/FileIntoAction.java          |   1 +
 .../transport/mailets/jsieve/KeepAction.java    |   1 +
 .../mailets/jsieve/RedirectAction.java          |   1 +
 .../transport/mailets/jsieve/RejectAction.java  |   1 +
 .../mailets/jsieve/SieveMailAdapter.java        |  40 +++---
 .../mailets/managesieve/ManageSieveMailet.java  |   1 +
 .../mailets/redirect/ProcessRedirectNotify.java |   1 +
 .../delivery/RemoteDeliverySocketFactory.java   |   5 +
 .../matchers/AbstractSQLWhitelistMatcher.java   |   1 +
 .../matchers/AbstractStorageQuota.java          |   1 +
 .../transport/matchers/InSpammerBlacklist.java  |   2 +
 .../james/transport/matchers/IsInWhiteList.java |  19 +--
 .../transport/matchers/MailboxQuotaFixed.java   |   5 +-
 .../matchers/NetworkIsInWhitelist.java          |  18 +--
 .../transport/matchers/SenderInFakeDomain.java  |   1 +
 .../org/apache/james/fetchmail/Account.java     |  14 +--
 .../org/apache/james/fetchmail/FetchMail.java   |   4 +-
 .../apache/james/fetchmail/FetchScheduler.java  |   6 +-
 .../apache/james/fetchmail/FolderProcessor.java |   3 +-
 .../james/fetchmail/MessageProcessor.java       |   3 +-
 .../apache/james/fetchmail/StoreProcessor.java  |   3 +-
 .../apache/james/jmap/mailet/SentByJmap.java    |   1 +
 .../james/jmap/methods/GetMailboxesMethod.java  |   1 +
 .../methods/SetMailboxesCreationProcessor.java  |   1 +
 .../SetMailboxesDestructionProcessor.java       |   1 +
 .../james/jmap/methods/SetMessagesMethod.java   |   1 +
 .../james/jmap/model/MailboxProperty.java       |   1 +
 .../AbstractNettyImapRequestLineReader.java     |   5 +-
 .../netty/ChannelImapResponseWriter.java        |   8 +-
 .../james/imapserver/netty/IMAPServer.java      |   8 +-
 .../netty/ImapRequestFrameDecoder.java          |   6 +-
 .../netty/NettyImapRequestLineReader.java       |   2 +
 .../imapserver/netty/NettyImapSession.java      |  77 +++---------
 .../netty/NettyStreamImapRequestLineReader.java |   2 +
 .../AbstractCommandHandlerResultJMXMonitor.java |  18 +--
 .../lib/jmx/AbstractCommandHandlerStats.java    |  20 +--
 .../AbstractConnectHandlerResultJMXMonitor.java |  17 +--
 .../AbstractLineHandlerResultJMXMonitor.java    |  17 +--
 .../protocols/lib/jmx/ConnectHandlerStats.java  |  16 +--
 .../protocols/lib/jmx/LineHandlerStats.java     |  16 +--
 .../netty/AbstractConfigurableAsyncServer.java  |  41 ++-----
 ...ledOrderedMemoryAwareThreadPoolExecutor.java |  24 +---
 .../james/lmtpserver/CoreCmdHandlerLoader.java  |   4 +-
 .../james/lmtpserver/jmx/JMXHandlersLoader.java |   4 +-
 .../james/lmtpserver/netty/LMTPServer.java      |  30 ++---
 .../netty/ManageSieveServer.java                |   1 +
 .../netty/ManageSieveServerFactory.java         |   1 +
 .../pop3server/core/CoreCmdHandlerLoader.java   |   3 +-
 .../jmx/CommandHandlerResultJMXMonitor.java     |   5 +-
 .../jmx/ConnectHandlerResultJMXMonitor.java     |   5 +-
 .../james/pop3server/jmx/JMXHandlersLoader.java |   3 +-
 .../jmx/LineHandlerResultJMXMonitor.java        |   5 +-
 .../pop3server/jmx/POP3CommandHandlerStats.java |  15 +--
 .../james/pop3server/netty/POP3Server.java      |   5 +-
 .../AddDefaultAttributesMessageHook.java        |   1 +
 .../smtpserver/AuthRequiredToRelayRcptHook.java |   6 +-
 .../james/smtpserver/CoreCmdHandlerLoader.java  |   3 +-
 .../DataLineJamesMessageHookHandler.java        |   1 +
 .../james/smtpserver/JamesDataCmdHandler.java   |   1 +
 .../james/smtpserver/JamesMailCmdHandler.java   |   4 +-
 .../james/smtpserver/JamesRcptCmdHandler.java   |   4 +-
 .../james/smtpserver/MailPriorityHandler.java   |   6 +-
 .../james/smtpserver/POP3BeforeSMTPHandler.java |   8 +-
 .../james/smtpserver/SendMailHandler.java       |   1 +
 .../SenderAuthIdentifyVerificationRcptHook.java |   8 +-
 .../james/smtpserver/SetMimeHeaderHandler.java  |   1 +
 .../smtpserver/UsersRepositoryAuthHook.java     |   5 +-
 .../fastfail/JDBCGreylistHandler.java           |  26 +---
 .../james/smtpserver/fastfail/SPFHandler.java   |  27 +++--
 .../fastfail/SpamAssassinHandler.java           |   5 +-
 .../smtpserver/fastfail/URIRBLHandler.java      |   5 +-
 .../smtpserver/fastfail/ValidRcptHandler.java   |   7 +-
 .../james/smtpserver/fastfail/ValidRcptMX.java  |   1 +
 .../jmx/CommandHandlerResultJMXMonitor.java     |   6 +-
 .../jmx/ConnectHandlerResultJMXMonitor.java     |   4 +-
 .../smtpserver/jmx/HookResultJMXMonitor.java    |  18 +--
 .../apache/james/smtpserver/jmx/HookStats.java  |  28 ++---
 .../james/smtpserver/jmx/JMXHandlersLoader.java |   3 +-
 .../jmx/LineHandlerResultJMXMonitor.java        |   5 +-
 .../smtpserver/jmx/SMTPCommandHandlerStats.java |  19 +--
 .../netty/SMTPChannelUpstreamHandler.java       |   1 +
 .../james/smtpserver/netty/SMTPServer.java      |  47 +++----
 .../james/queue/activemq/ActiveMQMailQueue.java |   5 +-
 .../queue/activemq/ActiveMQMailQueueItem.java   |   4 +-
 .../activemq/MimeMessageBlobMessageSource.java  |   8 +-
 .../api/DelayedManageableMailQueueContract.java |   1 +
 .../api/DelayedPriorityMailQueueContract.java   |   1 +
 .../PriorityManageableMailQueueContract.java    |   1 +
 898 files changed, 2311 insertions(+), 4178 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ClientProviderImpl.java
----------------------------------------------------------------------
diff --git a/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ClientProviderImpl.java b/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ClientProviderImpl.java
index d4d3e4b..317c0b7 100644
--- a/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ClientProviderImpl.java
+++ b/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ClientProviderImpl.java
@@ -54,6 +54,7 @@ public class ClientProviderImpl implements ClientProvider {
     }
 
 
+    @Override
     public Client get() {
         TransportClient transportClient = TransportClient.builder().build();
         ConsumerChainer<Host> consumer = Throwing.consumer(host -> transportClient

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java
index 16f6bb8..1facc04 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java
@@ -75,6 +75,7 @@ public interface MailboxListener {
          * 
          * @return session
          */
+        @Override
         public MailboxSession getSession() {
             return session;
         }
@@ -211,6 +212,7 @@ public interface MailboxListener {
          * 
          * @return flags
          */
+        @Override
         public abstract MessageMetaData getMetaData(MessageUid uid);
     }
 
@@ -250,6 +252,7 @@ public interface MailboxListener {
          * 
          * @return flags
          */
+        @Override
         public abstract MessageMetaData getMetaData(MessageUid uid);
         
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/api/src/main/java/org/apache/james/mailbox/StandardMailboxMetaDataComparator.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/StandardMailboxMetaDataComparator.java b/mailbox/api/src/main/java/org/apache/james/mailbox/StandardMailboxMetaDataComparator.java
index a876c26..7aa0ea4 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/StandardMailboxMetaDataComparator.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/StandardMailboxMetaDataComparator.java
@@ -58,9 +58,7 @@ public class StandardMailboxMetaDataComparator implements Comparator<MailboxMeta
         return result;
     }
 
-    /**
-     * @see Comparator#compare(Object, Object)
-     */
+    @Override
     public int compare(MailboxMetaData one, MailboxMetaData two) {
         return order(one, two);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java b/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java
index bdf6357..7e620f1 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java
@@ -223,10 +223,6 @@ public class UnionMailboxACLResolver implements MailboxACLResolver {
         }
     }
 
-    /**
-     * @see org.apache.james.mailbox.MailboxACLResolver#applyGlobalACL(org.apache
-     *      .james.mailbox.MailboxACL, boolean)
-     */
     @Override
     public MailboxACL applyGlobalACL(MailboxACL resourceACL, boolean resourceOwnerIsGroup) throws UnsupportedRightException {
         return resourceOwnerIsGroup ? resourceACL.union(groupGlobalACL) : resourceACL.union(userGlobalACL);
@@ -304,12 +300,6 @@ public class UnionMailboxACLResolver implements MailboxACLResolver {
         return result.toArray(new Rfc4314Rights[result.size()]);
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MailboxACLResolver#rightsOf(java.
-     *      lang.String, org.apache.james.mailbox.store.mail.MailboxACLResolver.
-     *      GroupMembershipResolver, org.apache.james.mailbox.MailboxACL,
-     *      java.lang.String)
-     */
     @Override
     public Rfc4314Rights resolveRights(String requestUser, GroupMembershipResolver groupMembershipResolver, MailboxACL resourceACL, String resourceOwner, boolean resourceOwnerIsGroup) throws UnsupportedRightException {
         Rfc4314Rights[] positiveNegativePair = { MailboxACL.NO_RIGHTS, MailboxACL.NO_RIGHTS };

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/api/src/main/java/org/apache/james/mailbox/model/FetchGroupImpl.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/FetchGroupImpl.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/FetchGroupImpl.java
index 2f03b86..c5d0430 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/FetchGroupImpl.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/FetchGroupImpl.java
@@ -54,6 +54,7 @@ public class FetchGroupImpl implements MessageResult.FetchGroup {
         this.partContentDescriptors = partContentDescriptors;
     }
 
+    @Override
     public int content() {
         return content;
     }
@@ -66,12 +67,7 @@ public class FetchGroupImpl implements MessageResult.FetchGroup {
         return "Fetch " + content;
     }
 
-    /**
-     * Gets content descriptors for the parts to be fetched.
-     * 
-     * @return <code>Set</code> of {@link org.apache.james.mailbox.MessageResult.FetchGroup.PartContentDescriptor},
-     *         possibly null
-     */
+    @Override
     public Set<PartContentDescriptor> getPartContentDescriptors() {
         return partContentDescriptors;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java
index 128760a..b0591bd 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java
@@ -265,5 +265,6 @@ public interface MessageResult extends Comparable<MessageResult>, MessageMetaDat
         int[] getPositions();
     }
 
+    @Override
     MessageId getMessageId();
 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/api/src/main/java/org/apache/james/mailbox/model/PartContentDescriptorImpl.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/PartContentDescriptorImpl.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/PartContentDescriptorImpl.java
index 013a897..6072220 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/PartContentDescriptorImpl.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/PartContentDescriptorImpl.java
@@ -46,10 +46,12 @@ public class PartContentDescriptorImpl implements PartContentDescriptor {
         this.content = this.content | content;
     }
 
+    @Override
     public int content() {
         return content;
     }
 
+    @Override
     public MimePath path() {
         return path;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java
index 678d436..71d32a3 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java
@@ -43,14 +43,17 @@ public class MockMailboxSession implements MailboxSession {
     public MockMailboxSession(String username, long sessionId) {
         this.user = new User() {
 
+            @Override
             public String getUserName() {
                 return username;
             }
 
+            @Override
             public String getPassword() {
                 return null;
             }
 
+            @Override
             public List<Locale> getLocalePreferences() {
                 return new ArrayList<>();
             }
@@ -68,42 +71,52 @@ public class MockMailboxSession implements MailboxSession {
         type = SessionType.User;
     }
 
+    @Override
     public void close() {
         this.open = false;
     }
 
+    @Override
     public Map<Object, Object> getAttributes() {
         return attrs;
     }
 
+    @Override
     public String getOtherUsersSpace() {
         return null;
     }
 
+    @Override
     public String getPersonalSpace() {
         return "";
     }
 
+    @Override
     public long getSessionId() {
         return sessionId;
     }
 
+    @Override
     public Collection<String> getSharedSpaces() {
         return new ArrayList<>();
     }
 
+    @Override
     public User getUser() {
         return user;
     }
 
+    @Override
     public boolean isOpen() {
         return open;
     }
 
+    @Override
     public char getPathDelimiter() {
         return '.';
     }
 
+    @Override
     public SessionType getType() {
         return type;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaCountTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaCountTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaCountTest.java
index b057374..9148001 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaCountTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaCountTest.java
@@ -24,10 +24,12 @@ import nl.jqno.equalsverifier.EqualsVerifier;
 
 public class QuotaCountTest implements QuotaValueTest<QuotaCount> {
 
+    @Override
     public QuotaCount instance(long value) {
         return QuotaCount.count(value);
     }
 
+    @Override
     public QuotaCount unlimited() {
         return QuotaCount.unlimited();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaSizeTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaSizeTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaSizeTest.java
index 893b97e..cc036d8 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaSizeTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaSizeTest.java
@@ -24,10 +24,12 @@ import nl.jqno.equalsverifier.EqualsVerifier;
 
 public class QuotaSizeTest implements QuotaValueTest<QuotaSize> {
 
+    @Override
     public QuotaSize instance(long value) {
         return QuotaSize.size(value);
     }
 
+    @Override
     public QuotaSize unlimited() {
         return QuotaSize.unlimited();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java b/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java
index fb17648..13f1020 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java
@@ -53,6 +53,7 @@ public class EventCollector implements MailboxListener {
         return events;
     }
 
+    @Override
     public void event(Event event) {
         events.add(event);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java
index b70516c..f25c738 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java
@@ -176,10 +176,12 @@ public class CassandraMailboxSessionMapperFactory extends MailboxSessionMapperFa
         return new CassandraSubscriptionMapper(session, cassandraUtils);
     }
 
+    @Override
     public ModSeqProvider getModSeqProvider() {
         return modSeqProvider;
     }
 
+    @Override
     public UidProvider getUidProvider() {
         return uidProvider;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManager.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManager.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManager.java
index 401f388..f85b4f6 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManager.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManager.java
@@ -37,10 +37,7 @@ public class CassandraSubscriptionManager extends StoreSubscriptionManager {
         super(mapperFactory);
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.StoreSubscriptionManager#createSubscription(org.apache.james.mailbox.MailboxSession,
-     *      java.lang.String)
-     */
+    @Override
     protected Subscription createSubscription(MailboxSession session, String mailbox) {
         return new SimpleSubscription(session.getUser().getUserName(), mailbox);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapper.java
index 2cea9d4..f689e39 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapper.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapper.java
@@ -59,6 +59,7 @@ public class CassandraAnnotationMapper extends NonTransactionalMapper implements
         this.cassandraUtils = cassandraUtils;
     }
 
+    @Override
     public List<MailboxAnnotation> getAllAnnotations(MailboxId mailboxId) {
         CassandraId cassandraId = (CassandraId)mailboxId;
         return cassandraUtils.convertToStream(session.execute(getStoredAnnotationsQuery(cassandraId)))
@@ -66,6 +67,7 @@ public class CassandraAnnotationMapper extends NonTransactionalMapper implements
             .collect(Collectors.toList());
     }
 
+    @Override
     public List<MailboxAnnotation> getAnnotationsByKeys(MailboxId mailboxId, Set<MailboxAnnotationKey> keys) {
         CassandraId cassandraId = (CassandraId)mailboxId;
         return cassandraUtils.convertToStream(session.execute(getStoredAnnotationsQueryForKeys(cassandraId, keys)))
@@ -73,6 +75,7 @@ public class CassandraAnnotationMapper extends NonTransactionalMapper implements
             .collect(Collectors.toList());
     }
 
+    @Override
     public List<MailboxAnnotation> getAnnotationsByKeysWithOneDepth(MailboxId mailboxId, Set<MailboxAnnotationKey> keys) {
         CassandraId cassandraId = (CassandraId)mailboxId;
         return keys.stream()
@@ -80,6 +83,7 @@ public class CassandraAnnotationMapper extends NonTransactionalMapper implements
             .collect(Guavate.toImmutableList());
     }
 
+    @Override
     public List<MailboxAnnotation> getAnnotationsByKeysWithAllDepth(MailboxId mailboxId, Set<MailboxAnnotationKey> keys) {
         CassandraId cassandraId = (CassandraId)mailboxId;
         return keys.stream()
@@ -87,12 +91,14 @@ public class CassandraAnnotationMapper extends NonTransactionalMapper implements
             .collect(Guavate.toImmutableList());
     }
 
+    @Override
     public void deleteAnnotation(MailboxId mailboxId, MailboxAnnotationKey key) {
         session.execute(delete().from(CassandraAnnotationTable.TABLE_NAME)
             .where(eq(CassandraAnnotationTable.MAILBOX_ID, ((CassandraId) mailboxId).asUuid()))
             .and(eq(CassandraAnnotationTable.KEY, key.asString())));
     }
 
+    @Override
     public void insertAnnotation(MailboxId mailboxId, MailboxAnnotation mailboxAnnotation) {
         Preconditions.checkArgument(!mailboxAnnotation.isNil());
         session.execute(insertInto(CassandraAnnotationTable.TABLE_NAME)

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTest.java
index 7ac4e73..ad412d5 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTest.java
@@ -52,6 +52,7 @@ public class CassandraCombinationManagerTest extends AbstractCombinationManagerT
     
     private CassandraCluster cassandra;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         CassandraModuleComposite modules = new CassandraModuleComposite(

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
index cba1f6e..ad8acaa 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
@@ -74,6 +74,7 @@ public class CassandraMailboxManagerTest extends MailboxManagerTest {
         return CassandraMailboxManagerProvider.provideMailboxManager(cassandra.getConf(), cassandra.getTypesProvider());
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         super.tearDown();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerQuotaTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerQuotaTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerQuotaTest.java
index 9d18c8e..62ecd26 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerQuotaTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerQuotaTest.java
@@ -52,6 +52,7 @@ public class CassandraMessageIdManagerQuotaTest extends AbstractMessageIdManager
 
     private CassandraCluster cassandra;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         CassandraModuleComposite modules = new CassandraModuleComposite(

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java
index 24e64c2..4326bf7 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java
@@ -49,6 +49,7 @@ public class CassandraMessageIdManagerSideEffectTest extends AbstractMessageIdMa
 
     private CassandraCluster cassandra;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         CassandraModuleComposite modules = new CassandraModuleComposite(

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java
index bd83a42..8e9750c 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java
@@ -62,6 +62,7 @@ public class CassandraMessageIdManagerStorageTest extends AbstractMessageIdManag
     @Rule
     public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule();
 
+    @Override
     @Before
     public void setUp() throws Exception {
         CassandraModuleComposite modules = new CassandraModuleComposite(

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapperTest.java
index ec23ad8..fd8e8e3 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapperTest.java
@@ -47,6 +47,7 @@ public class CassandraAnnotationMapperTest extends AnnotationMapperTest {
     
     private CassandraCluster cassandra;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         CassandraModuleComposite modules = new CassandraModuleComposite(

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapperTest.java
index 9325241..14ddd79 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapperTest.java
@@ -50,6 +50,7 @@ public class CassandraAttachmentMapperTest extends AttachmentMapperTest {
     
     private CassandraCluster cassandra;
 
+    @Override
     @Before
     public void setUp() throws MailboxException {
         CassandraModuleComposite modules = new CassandraModuleComposite(

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraGenericMailboxMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraGenericMailboxMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraGenericMailboxMapperTest.java
index 836768b..c92d4bd 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraGenericMailboxMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraGenericMailboxMapperTest.java
@@ -47,6 +47,7 @@ public class CassandraGenericMailboxMapperTest extends MailboxMapperTest {
     
     private CassandraCluster cassandra;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         CassandraModuleComposite modules = new CassandraModuleComposite(

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperAclTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperAclTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperAclTest.java
index 286d90e..251a508 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperAclTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperAclTest.java
@@ -47,6 +47,7 @@ public class CassandraMailboxMapperAclTest extends MailboxMapperACLTest {
     
     private CassandraCluster cassandra;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         CassandraModuleComposite modules = new CassandraModuleComposite(

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java
index b7499bb..bc7f9b4 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java
@@ -47,6 +47,7 @@ public class CassandraMessageIdMapperTest extends MessageIdMapperTest {
     
     private CassandraCluster cassandra;
 
+    @Override
     @Before
     public void setUp() throws MailboxException {
         CassandraModuleComposite modules = new CassandraModuleComposite(

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
index e5f472f..fa64788 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
@@ -57,6 +57,7 @@ public class CassandraMessageMapperTest extends MessageMapperTest {
 
     private CassandraCluster cassandra;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         CassandraModuleComposite modules = new CassandraModuleComposite(

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMoveTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMoveTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMoveTest.java
index 0f41fa3..b2a1021 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMoveTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMoveTest.java
@@ -47,6 +47,7 @@ public class CassandraMessageMoveTest extends MessageMoveTest {
     
     private CassandraCluster cassandra;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         CassandraModuleComposite modules = new CassandraModuleComposite(

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageWithAttachmentMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageWithAttachmentMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageWithAttachmentMapperTest.java
index 9efe448..4dbba4f 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageWithAttachmentMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageWithAttachmentMapperTest.java
@@ -47,6 +47,7 @@ public class CassandraMessageWithAttachmentMapperTest extends MessageWithAttachm
     
     private CassandraCluster cassandra;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         CassandraModuleComposite modules = new CassandraModuleComposite(

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/FieldImpl.java
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/FieldImpl.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/FieldImpl.java
index 211e481..d56d71e 100644
--- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/FieldImpl.java
+++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/FieldImpl.java
@@ -33,14 +33,17 @@ public class FieldImpl implements Field {
         this.body = body;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public String getBody() {
         return body;
     }
 
+    @Override
     public ByteSequence getRaw() {
         return null;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java
----------------------------------------------------------------------
diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java
index c8ce4e3..db441ca 100644
--- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java
+++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java
@@ -160,18 +160,12 @@ public class HBaseMailboxSessionMapperFactory extends MailboxSessionMapperFactor
         return conf;
     }
 
-    /**
-     * Returns the ModSeqProvider used.
-     * @return The used modSeqProvider
-     */
+    @Override
     public ModSeqProvider getModSeqProvider() {
         return modSeqProvider;
     }
 
-    /**
-     * Returns the UidProvider that generates UID's for mailboxes.
-     * @return The provider that generates UID's for mailboxes
-     */
+    @Override
     public UidProvider getUidProvider() {
         return uidProvider;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java
----------------------------------------------------------------------
diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java
index 076aa21..95884c4 100644
--- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java
+++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java
@@ -59,9 +59,6 @@ public class HBaseMessageManager extends StoreMessageManager {
 
     }
 
-    /**
-     * Support user flags
-     */
     @Override
     protected Flags getPermanentFlags(MailboxSession session) {
         Flags flags = super.getPermanentFlags(session);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseNonTransactionalMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseNonTransactionalMapper.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseNonTransactionalMapper.java
index bea36b8..bcf5990 100644
--- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseNonTransactionalMapper.java
+++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseNonTransactionalMapper.java
@@ -28,9 +28,6 @@ import org.apache.james.mailbox.store.transaction.NonTransactionalMapper;
  */
 public class HBaseNonTransactionalMapper extends NonTransactionalMapper {
 
-    /**
-     * End request
-     */
     @Override
     public void endRequest() {
         //TODO: maybe do some thing more wise here?

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/io/ChunkInputStream.java
----------------------------------------------------------------------
diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/io/ChunkInputStream.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/io/ChunkInputStream.java
index 900757a..277a0e5 100644
--- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/io/ChunkInputStream.java
+++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/io/ChunkInputStream.java
@@ -57,11 +57,6 @@ public class ChunkInputStream extends InputStream {
         this(conf, Bytes.toBytes(tableName), Bytes.toBytes(cf), key);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.io.InputStream#read()
-     */
     @Override
     public int read() throws IOException {
         if (chunk == null || pos + 1 == chunk.length) {
@@ -105,9 +100,6 @@ public class ChunkInputStream extends InputStream {
         }
     }
 
-    /**
-     * Not supported
-     */
     @Override
     public boolean markSupported() {
         return false;


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


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

Posted by ma...@apache.org.
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-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


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

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirEvents.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirEvents.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirEvents.java
index d8784dd..db447ac 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirEvents.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirEvents.java
@@ -29,6 +29,7 @@ public class MaildirEvents extends Events {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirExpunge.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirExpunge.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirExpunge.java
index 86b22a9..c9abdd4 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirExpunge.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirExpunge.java
@@ -29,6 +29,7 @@ public class MaildirExpunge extends Expunge {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetch.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetch.java
index 5fb37f0..bc50801 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetch.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetch.java
@@ -29,6 +29,7 @@ public class MaildirFetch extends Fetch {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchBodySection.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchBodySection.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchBodySection.java
index 8c505c0..042634d 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchBodySection.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchBodySection.java
@@ -29,6 +29,7 @@ public class MaildirFetchBodySection extends FetchBodySection {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchBodyStructure.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchBodyStructure.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchBodyStructure.java
index 2d07b73..c210769 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchBodyStructure.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchBodyStructure.java
@@ -29,6 +29,7 @@ public class MaildirFetchBodyStructure extends FetchBodyStructure {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchHeaders.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchHeaders.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchHeaders.java
index 0209729..bb3d23b 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchHeaders.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchHeaders.java
@@ -29,6 +29,7 @@ public class MaildirFetchHeaders extends FetchHeaders {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirListing.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirListing.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirListing.java
index 00bbd1d..9996800 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirListing.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirListing.java
@@ -29,6 +29,7 @@ public class MaildirListing extends Listing {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxAnnotation.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxAnnotation.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxAnnotation.java
index 0398fd7..fa9c598 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxAnnotation.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxAnnotation.java
@@ -29,6 +29,7 @@ public class MaildirMailboxAnnotation extends MailboxAnnotation {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxWithLongNameError.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxWithLongNameError.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxWithLongNameError.java
index 9355b75..872bc23 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxWithLongNameError.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxWithLongNameError.java
@@ -31,6 +31,7 @@ public class MaildirMailboxWithLongNameError extends MailboxWithLongNameError {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMove.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMove.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMove.java
index 823aed4..3f1143c 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMove.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMove.java
@@ -29,6 +29,7 @@ public class MaildirMove extends Move {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirNonAuthenticatedState.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirNonAuthenticatedState.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirNonAuthenticatedState.java
index cb67c08..fc20ad8 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirNonAuthenticatedState.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirNonAuthenticatedState.java
@@ -29,6 +29,7 @@ public class MaildirNonAuthenticatedState extends NonAuthenticatedState {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirPartialFetch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirPartialFetch.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirPartialFetch.java
index 58082c6..ca67774 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirPartialFetch.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirPartialFetch.java
@@ -29,6 +29,7 @@ public class MaildirPartialFetch extends PartialFetch {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirQuotaTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirQuotaTest.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirQuotaTest.java
index c69718b..28afd21 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirQuotaTest.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirQuotaTest.java
@@ -29,6 +29,7 @@ public class MaildirQuotaTest extends QuotaTest {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();
@@ -40,6 +41,7 @@ public class MaildirQuotaTest extends QuotaTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirRename.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirRename.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirRename.java
index e631cf5..97ab5a3 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirRename.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirRename.java
@@ -29,6 +29,7 @@ public class MaildirRename extends Rename {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSearch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSearch.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSearch.java
index ea0e61d..79b90c3 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSearch.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSearch.java
@@ -29,6 +29,7 @@ public class MaildirSearch extends Search {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSecurity.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSecurity.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSecurity.java
index 7a06c07..ab2c5d5 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSecurity.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSecurity.java
@@ -29,6 +29,7 @@ public class MaildirSecurity extends Security {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelect.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelect.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelect.java
index 9c0bc7b..852296d 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelect.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelect.java
@@ -29,6 +29,7 @@ public class MaildirSelect extends Select {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelectedInbox.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelectedInbox.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelectedInbox.java
index 46c655b..797d933 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelectedInbox.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelectedInbox.java
@@ -29,6 +29,7 @@ public class MaildirSelectedInbox extends SelectedInbox {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelectedState.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelectedState.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelectedState.java
index 4021469..6a21b83 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelectedState.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelectedState.java
@@ -29,6 +29,7 @@ public class MaildirSelectedState extends SelectedState {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUidSearch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUidSearch.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUidSearch.java
index 3dd23de..7bdcd6e 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUidSearch.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUidSearch.java
@@ -29,6 +29,7 @@ public class MaildirUidSearch extends UidSearch {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUidSearchOnIndex.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUidSearchOnIndex.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUidSearchOnIndex.java
index fd26238..7487bfa 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUidSearchOnIndex.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUidSearchOnIndex.java
@@ -29,6 +29,7 @@ public class MaildirUidSearchOnIndex extends UidSearchOnIndex {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUserFlagsSupport.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUserFlagsSupport.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUserFlagsSupport.java
index 01b567a..f65800c 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUserFlagsSupport.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUserFlagsSupport.java
@@ -29,6 +29,7 @@ public class MaildirUserFlagsSupport extends UserFlagsSupport {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraAuthenticateTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraAuthenticateTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraAuthenticateTest.java
index ae45946..38b8af9 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraAuthenticateTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraAuthenticateTest.java
@@ -35,6 +35,7 @@ public class CassandraAuthenticateTest extends AuthenticateTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraAuthenticateTest extends AuthenticateTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCapabilityTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCapabilityTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCapabilityTest.java
index 802e685..e9fc00a 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCapabilityTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCapabilityTest.java
@@ -35,6 +35,7 @@ public class CassandraCapabilityTest extends CapabilityTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraCapabilityTest extends CapabilityTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCheckScriptTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCheckScriptTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCheckScriptTest.java
index a137f79..ad0362c 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCheckScriptTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCheckScriptTest.java
@@ -35,6 +35,7 @@ public class CassandraCheckScriptTest extends CheckScriptTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraCheckScriptTest extends CheckScriptTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraDeleteScriptTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraDeleteScriptTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraDeleteScriptTest.java
index 24f02ee..27fe710 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraDeleteScriptTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraDeleteScriptTest.java
@@ -35,6 +35,7 @@ public class CassandraDeleteScriptTest extends DeleteScriptTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraDeleteScriptTest extends DeleteScriptTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraGetScriptTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraGetScriptTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraGetScriptTest.java
index 7b9caac..cb2387f 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraGetScriptTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraGetScriptTest.java
@@ -35,6 +35,7 @@ public class CassandraGetScriptTest extends GetScriptTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraGetScriptTest extends GetScriptTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraHaveSpaceTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraHaveSpaceTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraHaveSpaceTest.java
index 0571979..13361b3 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraHaveSpaceTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraHaveSpaceTest.java
@@ -35,6 +35,7 @@ public class CassandraHaveSpaceTest extends HaveSpaceTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraHaveSpaceTest extends HaveSpaceTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraListScriptsTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraListScriptsTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraListScriptsTest.java
index 92292a6..dc8f7c4 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraListScriptsTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraListScriptsTest.java
@@ -35,6 +35,7 @@ public abstract class CassandraListScriptsTest extends ListScriptsTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public abstract class CassandraListScriptsTest extends ListScriptsTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraLogoutTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraLogoutTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraLogoutTest.java
index c3b6512..3b9058f 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraLogoutTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraLogoutTest.java
@@ -35,6 +35,7 @@ public class CassandraLogoutTest extends LogoutTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraLogoutTest extends LogoutTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraNoopTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraNoopTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraNoopTest.java
index 1663e8b..cf4b4f0 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraNoopTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraNoopTest.java
@@ -35,6 +35,7 @@ public class CassandraNoopTest extends NoopTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraNoopTest extends NoopTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraPutScriptTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraPutScriptTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraPutScriptTest.java
index 9ba8908..6df620a 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraPutScriptTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraPutScriptTest.java
@@ -35,6 +35,7 @@ public class CassandraPutScriptTest extends PutScriptTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraPutScriptTest extends PutScriptTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraRenameScriptTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraRenameScriptTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraRenameScriptTest.java
index 2ae6162..6972ecf 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraRenameScriptTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraRenameScriptTest.java
@@ -35,6 +35,7 @@ public class CassandraRenameScriptTest extends RenameScriptTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraRenameScriptTest extends RenameScriptTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraSetActiveTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraSetActiveTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraSetActiveTest.java
index f47b3c6..17fa268 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraSetActiveTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraSetActiveTest.java
@@ -35,6 +35,7 @@ public class CassandraSetActiveTest extends SetActiveTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraSetActiveTest extends SetActiveTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraStartTlsTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraStartTlsTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraStartTlsTest.java
index e4506d1..94db175 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraStartTlsTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraStartTlsTest.java
@@ -35,6 +35,7 @@ public class CassandraStartTlsTest extends StartTlsTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraStartTlsTest extends StartTlsTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraUnauthenticatedTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraUnauthenticatedTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraUnauthenticatedTest.java
index bf3a509..36bfca0 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraUnauthenticatedTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraUnauthenticatedTest.java
@@ -35,6 +35,7 @@ public class CassandraUnauthenticatedTest extends UnauthenticatedTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraUnauthenticatedTest extends UnauthenticatedTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/host/CassandraHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/host/CassandraHostSystem.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/host/CassandraHostSystem.java
index 28c89df..4532781 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/host/CassandraHostSystem.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/host/CassandraHostSystem.java
@@ -53,6 +53,7 @@ public class CassandraHostSystem extends JamesManageSieveHostSystem {
         super.beforeTest();
     }
 
+    @Override
     protected SieveRepository createSieveRepository() throws Exception {
         return new CassandraSieveRepository(
             new CassandraSieveDAO(cassandra.getConf()),
@@ -60,6 +61,7 @@ public class CassandraHostSystem extends JamesManageSieveHostSystem {
             new CassandraActiveScriptDAO(cassandra.getConf()));
     }
 
+    @Override
     protected UsersRepository createUsersRepository() {
         CassandraUsersRepository cassandraUsersRepository = new CassandraUsersRepository(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION);
         cassandraUsersRepository.setEnableVirtualHosting(false);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileAuthenticateTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileAuthenticateTest.java b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileAuthenticateTest.java
index 3c4050a..56057b2 100644
--- a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileAuthenticateTest.java
+++ b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileAuthenticateTest.java
@@ -31,6 +31,7 @@ public class FileAuthenticateTest extends AuthenticateTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileAuthenticateTest extends AuthenticateTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileCapabilityTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileCapabilityTest.java b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileCapabilityTest.java
index 26541d7..4a5f614 100644
--- a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileCapabilityTest.java
+++ b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileCapabilityTest.java
@@ -31,6 +31,7 @@ public class FileCapabilityTest extends CapabilityTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileCapabilityTest extends CapabilityTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileCheckScriptTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileCheckScriptTest.java b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileCheckScriptTest.java
index 68d96ee..a5fada9 100644
--- a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileCheckScriptTest.java
+++ b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileCheckScriptTest.java
@@ -31,6 +31,7 @@ public class FileCheckScriptTest extends CheckScriptTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileCheckScriptTest extends CheckScriptTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileDeleteScriptTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileDeleteScriptTest.java b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileDeleteScriptTest.java
index ed93212..af59e0c 100644
--- a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileDeleteScriptTest.java
+++ b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileDeleteScriptTest.java
@@ -31,6 +31,7 @@ public class FileDeleteScriptTest extends DeleteScriptTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileDeleteScriptTest extends DeleteScriptTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileGetScriptTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileGetScriptTest.java b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileGetScriptTest.java
index 563f9ba..2ea659e 100644
--- a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileGetScriptTest.java
+++ b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileGetScriptTest.java
@@ -31,6 +31,7 @@ public class FileGetScriptTest extends GetScriptTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileGetScriptTest extends GetScriptTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileHaveSpaceTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileHaveSpaceTest.java b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileHaveSpaceTest.java
index 4bb2739..3dfd7e1 100644
--- a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileHaveSpaceTest.java
+++ b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileHaveSpaceTest.java
@@ -31,6 +31,7 @@ public class FileHaveSpaceTest extends HaveSpaceTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileHaveSpaceTest extends HaveSpaceTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileListScriptsTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileListScriptsTest.java b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileListScriptsTest.java
index 497e186..2dfe67b 100644
--- a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileListScriptsTest.java
+++ b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileListScriptsTest.java
@@ -31,6 +31,7 @@ public abstract class FileListScriptsTest extends ListScriptsTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public abstract class FileListScriptsTest extends ListScriptsTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileLogoutTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileLogoutTest.java b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileLogoutTest.java
index 2adc4c5..866eb52 100644
--- a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileLogoutTest.java
+++ b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileLogoutTest.java
@@ -30,6 +30,7 @@ import com.google.inject.Injector;
 public class FileLogoutTest extends LogoutTest {
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -43,6 +44,7 @@ public class FileLogoutTest extends LogoutTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileNoopTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileNoopTest.java b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileNoopTest.java
index 1dc4571..1432cc8 100644
--- a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileNoopTest.java
+++ b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileNoopTest.java
@@ -31,6 +31,7 @@ public class FileNoopTest extends NoopTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileNoopTest extends NoopTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FilePutScriptTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FilePutScriptTest.java b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FilePutScriptTest.java
index 50a72bc..0594fc0 100644
--- a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FilePutScriptTest.java
+++ b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FilePutScriptTest.java
@@ -31,6 +31,7 @@ public class FilePutScriptTest extends PutScriptTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FilePutScriptTest extends PutScriptTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileRenameScriptTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileRenameScriptTest.java b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileRenameScriptTest.java
index 35bf256..8624ae3 100644
--- a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileRenameScriptTest.java
+++ b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileRenameScriptTest.java
@@ -31,6 +31,7 @@ public class FileRenameScriptTest extends RenameScriptTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileRenameScriptTest extends RenameScriptTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileSetActiveTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileSetActiveTest.java b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileSetActiveTest.java
index 3ec799a..e847e0c 100644
--- a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileSetActiveTest.java
+++ b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileSetActiveTest.java
@@ -31,6 +31,7 @@ public class FileSetActiveTest extends SetActiveTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileSetActiveTest extends SetActiveTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileStartTlsTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileStartTlsTest.java b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileStartTlsTest.java
index d37365f..408794d 100644
--- a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileStartTlsTest.java
+++ b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileStartTlsTest.java
@@ -31,6 +31,7 @@ public class FileStartTlsTest extends StartTlsTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileStartTlsTest extends StartTlsTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileUnauthenticatedTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileUnauthenticatedTest.java b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileUnauthenticatedTest.java
index 1f6eeab..c8d0d3d 100644
--- a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileUnauthenticatedTest.java
+++ b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileUnauthenticatedTest.java
@@ -31,6 +31,7 @@ public class FileUnauthenticatedTest extends UnauthenticatedTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileUnauthenticatedTest extends UnauthenticatedTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java
index 7847e99..384c454 100644
--- a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java
+++ b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java
@@ -40,14 +40,17 @@ public class FileHostSystem extends JamesManageSieveHostSystem {
 
     private static FileSystem getFileSystem() {
         return new FileSystem() {
+            @Override
             public File getBasedir() throws FileNotFoundException {
                 return new File(System.getProperty("java.io.tmpdir"));
             }
             
+            @Override
             public InputStream getResource(String url) throws IOException {
                 return new FileInputStream(getFile(url));
             }
             
+            @Override
             public File getFile(String fileURL) throws FileNotFoundException {
                 return new File(getBasedir(), fileURL.substring(FileSystem.FILE_PROTOCOL.length()));
             }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java
index 0adbeb0..fdadf26 100644
--- a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java
+++ b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java
@@ -33,6 +33,7 @@ public class CassandraForwardSmtpTest extends ForwardSmtpTest {
     
     private SmtpHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java
index 5fa2d7a..d448f42 100644
--- a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java
+++ b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java
@@ -33,6 +33,7 @@ public class CassandraSmtpStarttlsCommandTest extends SmtpStarttlsCommandTest {
     
     private SmtpHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
index 3556014..51c942a 100644
--- a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
+++ b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
@@ -96,6 +96,7 @@ public class CassandraJamesSmtpHostSystem extends ExternalSessionFactory impleme
         folder.delete();
     }
 
+    @Override
     public InMemoryDNSService getInMemoryDnsService() {
         return inMemoryDNSService;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java
----------------------------------------------------------------------
diff --git a/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java b/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java
index 1190a5d..a9a6eb5 100644
--- a/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java
+++ b/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java
@@ -162,29 +162,20 @@ public class MailProtocolTest implements Monitor {
     }
 
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mpt.Monitor#debug(char)
-     */
+    @Override
     public void debug(char character) {
         //getLog().debug("'" + character + "'");
         // do nothing by default
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mpt.Monitor#debug(java.lang.String)
-     */
+    @Override
     public void debug(String message) {
         //getLog().debug(message);
         // do nothing by default
 
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mpt.Monitor#note(java.lang.String)
-     */
+    @Override
     public void note(String message) {
         //getLog().debug(message);
         System.out.println(message);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTestMojo.java
----------------------------------------------------------------------
diff --git a/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTestMojo.java b/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTestMojo.java
index c2ce668..f6ae11a 100644
--- a/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTestMojo.java
+++ b/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTestMojo.java
@@ -38,6 +38,7 @@ public class MailProtocolTestMojo extends AbstractMojo {
      */
     private MailProtocolTest[] mailProtocolTests;
 
+    @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
         for (MailProtocolTest test : mailProtocolTests) {
             test.execute();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
index e5723ff..8b814bb 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
@@ -44,9 +44,7 @@ public abstract class AbstractProtocolTransport implements ProtocolTransport {
     private final Queue<Response> responses = new LinkedBlockingQueue<>();
     private volatile boolean isAsync = false;
     
-    /**
-     * @see org.apache.james.protocols.api.ProtocolTransport#writeResponse(org.apache.james.protocols.api.Response, org.apache.james.protocols.api.ProtocolSession)
-     */
+    @Override
     public final void writeResponse(Response response, ProtocolSession session) {
         // if we already in asynchrnous mode we simply enqueue the response
         // we do this synchronously because we may have a dequeuer thread working on

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java
index 0878d79..a607cad 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java
@@ -69,6 +69,7 @@ public abstract class AbstractResponse implements Response {
      * 
      * @return the SMTPCode
      */
+    @Override
     public String getRetCode() {
         return retCode;
     }
@@ -88,6 +89,7 @@ public abstract class AbstractResponse implements Response {
      * 
      * @return true if session is ended
      */
+    @Override
     public boolean isEndSession() {
         return endSession;
     }
@@ -116,14 +118,17 @@ public abstract class AbstractResponse implements Response {
     public Response immutable() {
         return new Response() {
             
+            @Override
             public boolean isEndSession() {
                 return AbstractResponse.this.isEndSession();
             }
             
+            @Override
             public String getRetCode() {
                 return AbstractResponse.this.getRetCode();
             }
             
+            @Override
             public List<CharSequence> getLines() {
                 return AbstractResponse.this.getLines();
             }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java b/protocols/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java
index 4d7d6f3..8b1ed75 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java
@@ -34,16 +34,12 @@ public class BaseRequest implements Request {
         
     }
     
-    /**
-     * @see org.apache.james.protocols.api.Request#getArgument()
-     */
+    @Override
     public String getArgument() {
         return argument;
     }
 
-    /**
-     * @see org.apache.james.protocols.api.Request#getCommand()
-     */
+    @Override
     public String getCommand() {
         return command;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/CombinedInputStream.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/CombinedInputStream.java b/protocols/api/src/main/java/org/apache/james/protocols/api/CombinedInputStream.java
index 156d865..31bbc71 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/CombinedInputStream.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/CombinedInputStream.java
@@ -40,10 +40,7 @@ public class CombinedInputStream extends SequenceInputStream implements Iterable
         streams = new InputStream[] {s1, s2};
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.lang.Iterable#iterator()
-     */
+    @Override
     public Iterator<InputStream> iterator() {
         return new Iterator<InputStream>() {
             private int count = 0;
@@ -52,6 +49,7 @@ public class CombinedInputStream extends SequenceInputStream implements Iterable
              * (non-Javadoc)
              * @see java.util.Iterator#hasNext()
              */
+            @Override
             public boolean hasNext() {
                 return count < streams.length;
             }
@@ -60,6 +58,7 @@ public class CombinedInputStream extends SequenceInputStream implements Iterable
              * (non-Javadoc)
              * @see java.util.Iterator#next()
              */
+            @Override
             public InputStream next() {
                 if (hasNext())  {
                     return streams[count++];
@@ -71,6 +70,7 @@ public class CombinedInputStream extends SequenceInputStream implements Iterable
             /**
              * Read-Only
              */
+            @Override
             public void remove() {
                 throw new UnsupportedOperationException("Read-Only");
             }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolConfigurationImpl.java b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolConfigurationImpl.java
index 6911178..9cbf4cb 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolConfigurationImpl.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolConfigurationImpl.java
@@ -47,12 +47,7 @@ public class ProtocolConfigurationImpl implements ProtocolConfiguration {
         DEFAULT_HELLO_NAME = hName;
     }
     
-    /*
-     * 
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.protocols.pop3.POP3Configuration#getHelloName()
-     */
+    @Override
     public String getHelloName() {
         if (helloName == null) {
             return DEFAULT_HELLO_NAME;
@@ -64,10 +59,7 @@ public class ProtocolConfigurationImpl implements ProtocolConfiguration {
         this.helloName = helloName;
     }
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolConfiguration#getGreeting()
-     */
+    @Override
     public String getGreeting() {
         return greeting;
     }
@@ -76,10 +68,7 @@ public class ProtocolConfigurationImpl implements ProtocolConfiguration {
         this.greeting = greeting;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolConfiguration#getSoftwareName()
-     */
+    @Override
     public String getSoftwareName() {
         return softwareName;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
index de2d74b..962019e 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
@@ -34,26 +34,17 @@ public abstract class ProtocolImpl implements Protocol {
         this.config = config;
     }
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.Protocol#getProtocolChain()
-     */
+    @Override
     public ProtocolHandlerChain getProtocolChain() {
         return chain;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.Protocol#newSession(org.apache.james.protocols.api.ProtocolTransport)
-     */
+    @Override
     public ProtocolSession newSession(ProtocolTransport transport) {
         return new ProtocolSessionImpl(transport, config);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.Protocol#getConfiguration()
-     */
+    @Override
     public ProtocolConfiguration getConfiguration() {
         return config;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
index 0d07b76..5aec3ee 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
@@ -47,32 +47,22 @@ public class ProtocolSessionImpl implements ProtocolSession {
         this.config = config;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolSession#getLocalAddress()
-     */
+    @Override
     public InetSocketAddress getLocalAddress() {
         return transport.getLocalAddress();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolSession#getRemoteAddress()
-     */
+    @Override
     public InetSocketAddress getRemoteAddress() {
         return transport.getRemoteAddress();
     }
 
-    /**
-     * @see org.apache.james.protocols.api.ProtocolSession#getUser()
-     */
+    @Override
     public String getUser() {
         return user;
     }
 
-    /**
-     * @see org.apache.james.protocols.api.ProtocolSession#setUser(java.lang.String)
-     */
+    @Override
     public void setUser(String user) {
         this.user = user;
     }
@@ -86,38 +76,28 @@ public class ProtocolSessionImpl implements ProtocolSession {
         return transport;
     }
 
-    /**
-     * @see org.apache.james.protocols.api.ProtocolSession#isStartTLSSupported()
-     */
+    @Override
     public boolean isStartTLSSupported() {
         return transport.isStartTLSSupported();
     }
 
-    /**
-     * @see org.apache.james.protocols.api.ProtocolSession#isTLSStarted()
-     */
+    @Override
     public boolean isTLSStarted() {
         return transport.isTLSStarted();
     }
 
-    /**
-     * @see org.apache.james.protocols.api.ProtocolSession#getSessionID()
-     */
+    @Override
     public String getSessionID() {
         return transport.getId();
     }
     
     
-    /**
-     * @see org.apache.james.protocols.api.ProtocolSession#getConnectionState()
-     */
+    @Override
     public Map<String, Object> getConnectionState() {
         return connectionState;
     }
 
-    /**
-     * @see org.apache.james.protocols.api.ProtocolSession#getState()
-     */
+    @Override
     public Map<String, Object> getState() {
         return sessionState;
     }
@@ -126,6 +106,7 @@ public class ProtocolSessionImpl implements ProtocolSession {
      * This implementation just returns <code>null</code>. Sub-classes should
      * overwrite this if needed
      */
+    @Override
     public Response newLineTooLongResponse() {
         return null;
     }
@@ -134,6 +115,7 @@ public class ProtocolSessionImpl implements ProtocolSession {
      * This implementation just returns <code>null</code>. Sub-classes should
      * overwrite this if needed
      */
+    @Override
     public Response newFatalErrorResponse() {
         return null;
     }
@@ -142,21 +124,17 @@ public class ProtocolSessionImpl implements ProtocolSession {
      * This implementation just clears the sessions state. Sub-classes should
      * overwrite this if needed
      */
+    @Override
     public void resetState() {
         sessionState.clear();
     }
 
-    /**
-     * @see org.apache.james.protocols.api.ProtocolSession#getConfiguration()
-     */
+    @Override
     public ProtocolConfiguration getConfiguration() {
         return config;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolSession#setAttachment(java.lang.String, java.lang.Object, org.apache.james.protocols.api.ProtocolSession.State)
-     */
+    @Override
     public Object setAttachment(String key, Object value, State state) {
         if (state == State.Connection) {
             if (value == null) {
@@ -173,10 +151,7 @@ public class ProtocolSessionImpl implements ProtocolSession {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolSession#getAttachment(java.lang.String, org.apache.james.protocols.api.ProtocolSession.State)
-     */
+    @Override
     public Object getAttachment(String key, State state) {
         if (state == State.Connection) {
             return connectionState.get(key);
@@ -188,6 +163,7 @@ public class ProtocolSessionImpl implements ProtocolSession {
     /**
      * Returns a Charset for US-ASCII
      */
+    @Override
     public Charset getCharset() {
         return CHARSET;
     }
@@ -195,30 +171,22 @@ public class ProtocolSessionImpl implements ProtocolSession {
     /**
      * Returns "\r\n";
      */
+    @Override
     public String getLineDelimiter() {
         return DELIMITER;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolSession#popLineHandler()
-     */
+    @Override
     public void popLineHandler() {
         transport.popLineHandler();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolSession#getPushedLineHandlerCount()
-     */
+    @Override
     public int getPushedLineHandlerCount() {
         return transport.getPushedLineHandlerCount();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolSession#pushLineHandler(org.apache.james.protocols.api.handler.LineHandler)
-     */
+    @Override
     public <T extends ProtocolSession> void pushLineHandler(LineHandler<T> overrideCommandHandler) {
         transport.pushLineHandler(overrideCommandHandler, this);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/Response.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/Response.java b/protocols/api/src/main/java/org/apache/james/protocols/api/Response.java
index 58283a8..48e5d3c 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/Response.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/Response.java
@@ -34,15 +34,18 @@ public interface Response {
      */
     Response DISCONNECT = new Response() {
 
+        @Override
         public String getRetCode() {
             return "";
         }
 
+        @Override
         @SuppressWarnings("unchecked")
         public List<CharSequence> getLines() {
             return Collections.EMPTY_LIST;
         }
 
+        @Override
         public boolean isEndSession() {
             return true;
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java
index 577cd4c..eed41c6 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java
@@ -61,6 +61,7 @@ public class FutureResponseImpl implements FutureResponse {
         }
     }
 
+    @Override
     public synchronized void addListener(ResponseListener listener) {
         if (isReady()) {
             listener.onResponse(this);
@@ -72,10 +73,7 @@ public class FutureResponseImpl implements FutureResponse {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.FutureResponse#removeListener(org.apache.james.protocols.api.FutureResponse.ResponseListener)
-     */
+    @Override
     public synchronized void removeListener(ResponseListener listener) {
         if (!isReady()) {
             if (listeners != null) {
@@ -84,38 +82,26 @@ public class FutureResponseImpl implements FutureResponse {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.FutureResponse#isReady()
-     */
+    @Override
     public synchronized boolean isReady() {
         return response != null;
     }
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.Response#getLines()
-     */
+    @Override
     public List<CharSequence> getLines() {
         checkReady();
         return response.getLines();
     }
 
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.Response#getRetCode()
-     */
+    @Override
     public String getRetCode() {
         checkReady();
         return response.getRetCode();
     }
 
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.Response#isEndSession()
-     */
+    @Override
     public boolean isEndSession() {
         checkReady();
         return response.isEndSession();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureStreamResponseImpl.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureStreamResponseImpl.java b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureStreamResponseImpl.java
index d09388e..211ecde 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureStreamResponseImpl.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureStreamResponseImpl.java
@@ -44,10 +44,7 @@ public class FutureStreamResponseImpl extends FutureResponseImpl implements Stre
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.StreamResponse#getStream()
-     */
+    @Override
     public InputStream getStream() {
         checkReady();
         return ((StreamResponse) response).getStream();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
index 14ea246..0b1803f 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
@@ -37,9 +37,7 @@ public abstract class AbstractProtocolHandlerChain implements ProtocolHandlerCha
      */
     protected abstract List<ProtocolHandler> getHandlers();
 
-    /**
-     * @see org.apache.james.protocols.api.handler.ProtocolHandlerChain#getHandlers(java.lang.Class)
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public <T> LinkedList<T> getHandlers(Class<T> type) {
         List<ProtocolHandler> handlers = getHandlers();
@@ -70,10 +68,7 @@ public abstract class AbstractProtocolHandlerChain implements ProtocolHandlerCha
     }
     
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.handler.ProtocolHandlerChain#destroy()
-     */
+    @Override
     public void destroy() {
         List<ProtocolHandler> handlers = getHandlers(ProtocolHandler.class);
         for (ProtocolHandler handler: handlers) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
index 13d5a90..da59a3a 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
@@ -110,10 +110,7 @@ public class CommandDispatcher<SessionT extends ProtocolSession> implements Exte
         return handlers;
     }
 
-    /**
-     * @throws WiringException 
-     * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
-     */
+    @Override
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public void wireExtensions(Class interfaceName, List extensions) throws WiringException {
         if (interfaceName.equals(ProtocolHandlerResultHandler.class)) {
@@ -143,10 +140,7 @@ public class CommandDispatcher<SessionT extends ProtocolSession> implements Exte
 
     }
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.handler.LineHandler#onLine(org.apache.james.protocols.api.ProtocolSession, java.nio.ByteBuffer)
-     */
+    @Override
     public Response onLine(SessionT session, ByteBuffer line) {
         
         try {
@@ -254,9 +248,7 @@ public class CommandDispatcher<SessionT extends ProtocolSession> implements Exte
 
     }
    
-    /**
-     * @see org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
-     */
+    @Override
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public List<Class<?>> getMarkerInterfaces() {
         List res = new LinkedList();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java
index 123bafe..c2283de 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java
@@ -34,6 +34,7 @@ public class CommandHandlerResultLogger implements ProtocolHandlerResultHandler<
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CommandHandlerResultLogger.class);
 
+    @Override
     public Response onResponse(ProtocolSession session, Response response, long executionTime, ProtocolHandler handler) {
         if (handler instanceof CommandHandler) {
             LOGGER.debug("{}: {}", handler.getClass().getName(), response);


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


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

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java
index fd4cd35..e3e5476 100644
--- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java
+++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java
@@ -102,10 +102,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#addToEnvironment(java.lang.String,
-     *      java.lang.Object)
-     */
     @Override
     public Object addToEnvironment(final String propName, final Object propVal)
             throws NamingException {
@@ -119,9 +115,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#bind(javax.naming.Name, java.lang.Object)
-     */
     @Override
     public void bind(final Name name, final Object obj) throws NamingException {
         new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries
@@ -135,9 +128,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#bind(java.lang.String, java.lang.Object)
-     */
     @Override
     public void bind(final String name, final Object obj) throws NamingException {
         new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries
@@ -151,9 +141,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#close()
-     */
     @Override
     public void close() throws NamingException {
         new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries
@@ -167,10 +154,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#composeName(javax.naming.Name,
-     *      javax.naming.Name)
-     */
     @Override
     public Name composeName(final Name name, final Name prefix) throws NamingException {
         return (Name) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries
@@ -183,9 +166,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#composeName(java.lang.String, java.lang.String)
-     */
     @Override
     public String composeName(final String name, final String prefix) throws NamingException {
         return (String) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries
@@ -198,9 +178,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#createSubcontext(javax.naming.Name)
-     */
     @Override
     public Context createSubcontext(final Name name) throws NamingException {
         final Context context = getDelegate();
@@ -213,9 +190,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         };
     }
 
-    /**
-     * @see javax.naming.Context#createSubcontext(java.lang.String)
-     */
     @Override
     public Context createSubcontext(final String name) throws NamingException {
         final Context context = getDelegate();
@@ -228,10 +202,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         };
     }
 
-    /**
-     * @return
-     * @see javax.naming.Context#destroySubcontext(javax.naming.Name)
-     */
     @Override
     public void destroySubcontext(final Name name) throws NamingException {
         new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries
@@ -245,9 +215,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#destroySubcontext(java.lang.String)
-     */
     @Override
     public void destroySubcontext(final String name) throws NamingException {
         new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries
@@ -261,9 +228,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#getEnvironment()
-     */
     @Override
     public Hashtable<?, ?> getEnvironment() throws NamingException {
         return (Hashtable<?, ?>) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this,
@@ -276,9 +240,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#getNameInNamespace()
-     */
     @Override
     public String getNameInNamespace() throws NamingException {
         return (String) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries
@@ -291,9 +252,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#getNameParser(javax.naming.Name)
-     */
     @Override
     public NameParser getNameParser(final Name name) throws NamingException {
         return (NameParser) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries
@@ -306,9 +264,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#getNameParser(java.lang.String)
-     */
     @Override
     public NameParser getNameParser(final String name) throws NamingException {
         return (NameParser) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries
@@ -385,9 +340,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#lookup(javax.naming.Name)
-     */
     @Override
     public Object lookup(final Name name) throws NamingException {
         return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries
@@ -400,9 +352,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#lookup(java.lang.String)
-     */
     @Override
     public Object lookup(final String name) throws NamingException {
         return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries
@@ -415,9 +364,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#lookupLink(javax.naming.Name)
-     */
     @Override
     public Object lookupLink(final Name name) throws NamingException {
         return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries
@@ -430,9 +376,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#lookupLink(java.lang.String)
-     */
     @Override
     public Object lookupLink(final String name) throws NamingException {
         return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries
@@ -445,9 +388,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#rebind(javax.naming.Name, java.lang.Object)
-     */
     @Override
     public void rebind(final Name name, final Object obj) throws NamingException {
         new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries
@@ -461,9 +401,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#rebind(java.lang.String, java.lang.Object)
-     */
     @Override
     public void rebind(final String name, final Object obj) throws NamingException {
         new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries
@@ -477,9 +414,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#removeFromEnvironment(java.lang.String)
-     */
     @Override
     public Object removeFromEnvironment(final String propName) throws NamingException {
         return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries
@@ -492,9 +426,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#rename(javax.naming.Name, javax.naming.Name)
-     */
     @Override
     public void rename(final Name oldName, final Name newName) throws NamingException {
         new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries
@@ -508,9 +439,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#rename(java.lang.String, java.lang.String)
-     */
     @Override
     public void rename(final String oldName, final String newName) throws NamingException {
         new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries
@@ -524,9 +452,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#unbind(javax.naming.Name)
-     */
     @Override
     public void unbind(final Name name) throws NamingException {
         new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries
@@ -540,9 +465,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#unbind(java.lang.String)
-     */
     @Override
     public void unbind(final String name) throws NamingException {
         new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, schedule, maxRetries) {
@@ -555,15 +477,12 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     */
+    @Override
     public Context getDelegate() {
         return delegate;
     }
     
     
-    /**
-     */
     @Override
     public void resetDelegate() throws Exception {
         if (null != delegate) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/retry/naming/directory/RetryingDirContext.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/directory/RetryingDirContext.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/directory/RetryingDirContext.java
index 047be38..32c0004 100644
--- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/directory/RetryingDirContext.java
+++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/directory/RetryingDirContext.java
@@ -57,10 +57,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         super(schedule, maxRetries);
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#bind(javax.naming.Name,
-     *      java.lang.Object, javax.naming.directory.Attributes)
-     */
     @Override
     public void bind(final Name name, final Object obj, final Attributes attrs)
             throws NamingException {
@@ -74,10 +70,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#bind(java.lang.String,
-     *      java.lang.Object, javax.naming.directory.Attributes)
-     */
     @Override
     public void bind(final String name, final Object obj, final Attributes attrs)
             throws NamingException {
@@ -91,10 +83,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#createSubcontext(javax.naming.Name,
-     *      javax.naming.directory.Attributes)
-     */
     @Override
     public DirContext createSubcontext(final Name name, final Attributes attrs)
             throws NamingException {
@@ -108,10 +96,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#createSubcontext(java.lang.String,
-     *      javax.naming.directory.Attributes)
-     */
     @Override
     public DirContext createSubcontext(final String name, final Attributes attrs)
             throws NamingException {
@@ -125,9 +109,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#getAttributes(javax.naming.Name)
-     */
     @Override
     public Attributes getAttributes(final Name name) throws NamingException {
         return (Attributes) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this,
@@ -140,9 +121,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#getAttributes(java.lang.String)
-     */
     @Override
     public Attributes getAttributes(final String name) throws NamingException {
         return (Attributes) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this,
@@ -155,10 +133,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#getAttributes(javax.naming.Name,
-     *      java.lang.String[])
-     */
     @Override
     public Attributes getAttributes(final Name name, final String[] attrIds) throws NamingException {
         return (Attributes) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this,
@@ -171,10 +145,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#getAttributes(java.lang.String,
-     *      java.lang.String[])
-     */
     @Override
     public Attributes getAttributes(final String name, final String[] attrIds)
             throws NamingException {
@@ -188,9 +158,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#getSchema(javax.naming.Name)
-     */
     @Override
     public DirContext getSchema(final Name name) throws NamingException {
         final Context context = getDelegate();
@@ -203,9 +170,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         };
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#getSchema(java.lang.String)
-     */
     @Override
     public DirContext getSchema(final String name) throws NamingException {
         final Context context = getDelegate();
@@ -218,9 +182,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         };
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#getSchemaClassDefinition(javax.naming.Name)
-     */
     @Override
     public DirContext getSchemaClassDefinition(final Name name) throws NamingException {
         final Context context = getDelegate();
@@ -233,9 +194,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         };
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#getSchemaClassDefinition(java.lang.String)
-     */
     @Override
     public DirContext getSchemaClassDefinition(final String name) throws NamingException {
         final Context context = getDelegate();
@@ -248,10 +206,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         };
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#modifyAttributes(javax.naming.Name,
-     *      javax.naming.directory.ModificationItem[])
-     */
     @Override
     public void modifyAttributes(final Name name, final ModificationItem[] mods)
             throws NamingException {
@@ -265,10 +219,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#modifyAttributes(java.lang.String,
-     *      javax.naming.directory.ModificationItem[])
-     */
     @Override
     public void modifyAttributes(final String name, final ModificationItem[] mods)
             throws NamingException {
@@ -282,10 +232,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#modifyAttributes(javax.naming.Name,
-     *      int, javax.naming.directory.Attributes)
-     */
     @Override
     public void modifyAttributes(final Name name, final int modOp, final Attributes attrs)
             throws NamingException {
@@ -299,10 +245,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#modifyAttributes(java.lang.String,
-     *      int, javax.naming.directory.Attributes)
-     */
     @Override
     public void modifyAttributes(final String name, final int modOp, final Attributes attrs)
             throws NamingException {
@@ -316,10 +258,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#rebind(javax.naming.Name,
-     *      java.lang.Object, javax.naming.directory.Attributes)
-     */
     @Override
     public void rebind(final Name name, final Object obj, final Attributes attrs)
             throws NamingException {
@@ -333,10 +271,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#rebind(java.lang.String,
-     *      java.lang.Object, javax.naming.directory.Attributes)
-     */
     @Override
     public void rebind(final String name, final Object obj, final Attributes attrs)
             throws NamingException {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java
index 760c29f..c144132 100644
--- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java
+++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java
@@ -51,9 +51,6 @@ public abstract class RetryingLdapContext extends RetryingDirContext implements
         super(schedule, maxRetries);
     }
 
-    /**
-     * @see javax.naming.ldap.LdapContext#extendedOperation(javax.naming.ldap.ExtendedRequest)
-     */
     @Override
     public ExtendedResponse extendedOperation(final ExtendedRequest request) throws NamingException {
         return (ExtendedResponse) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()) {
@@ -64,9 +61,6 @@ public abstract class RetryingLdapContext extends RetryingDirContext implements
             }.perform();
     }
 
-    /**
-     * @see javax.naming.ldap.LdapContext#getConnectControls()
-     */
     @Override
     public Control[] getConnectControls() throws NamingException {
         return (Control[]) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()) {
@@ -77,9 +71,6 @@ public abstract class RetryingLdapContext extends RetryingDirContext implements
             }.perform();
     }
 
-    /**
-     * @see javax.naming.ldap.LdapContext#getRequestControls()
-     */
     @Override
     public Control[] getRequestControls() throws NamingException {
         return (Control[]) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()) {
@@ -90,9 +81,6 @@ public abstract class RetryingLdapContext extends RetryingDirContext implements
             }.perform();
     }
 
-    /**
-     * @see javax.naming.ldap.LdapContext#getResponseControls()
-     */
     @Override
     public Control[] getResponseControls() throws NamingException {
         return (Control[]) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()) {
@@ -103,9 +91,6 @@ public abstract class RetryingLdapContext extends RetryingDirContext implements
             }.perform();
     }
 
-    /**
-     * @see javax.naming.ldap.LdapContext#newInstance(javax.naming.ldap.Control[])
-     */
     @Override
     public LdapContext newInstance(final Control[] requestControls) throws NamingException {
         final Context context = getDelegate();
@@ -118,9 +103,6 @@ public abstract class RetryingLdapContext extends RetryingDirContext implements
         };
     }
 
-    /**
-     * @see javax.naming.ldap.LdapContext#reconnect(javax.naming.ldap.Control[])
-     */
     @Override
     public void reconnect(final Control[] connCtls) throws NamingException {
         new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()) {
@@ -132,9 +114,6 @@ public abstract class RetryingLdapContext extends RetryingDirContext implements
             }.perform();
     }
 
-    /**
-     * @see javax.naming.ldap.LdapContext#setRequestControls(javax.naming.ldap.Control[])
-     */
     @Override
     public void setRequestControls(final Control[] requestControls) throws NamingException {
         new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java b/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java
index f6335bb..d8a20fd 100644
--- a/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java
+++ b/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java
@@ -54,22 +54,16 @@ public class ExceptionRetryHandlerTest {
 
     private class TestRetryingProxy implements ExceptionRetryingProxy {
 
-    /**
-     */
     @Override
     public Context getDelegate() {
         return null;
     }
 
-    /**
-     */
     @Override
     public Context newDelegate() throws Exception {
         return null;
     }
 
-    /**
-     */
     @Override
     public void resetDelegate() throws Exception {
     }
@@ -77,8 +71,6 @@ public class ExceptionRetryHandlerTest {
 
     private class TestRetrySchedule implements RetrySchedule {
 
-    /**
-     */
     @Override
     public long getInterval(int index) {
         return index;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java b/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
index 351d494..fe1b1e1 100644
--- a/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
+++ b/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
@@ -52,22 +52,16 @@ public class NamingExceptionRetryHandlerTest {
 
     private class TestRetryingProxy implements ExceptionRetryingProxy {
 
-    /**
-     */
     @Override
     public Context getDelegate() {
         return null;
     }
 
-    /**
-     */
     @Override
     public Context newDelegate() throws NamingException {
         return null;
     }
 
-    /**
-     */
     @Override
     public void resetDelegate() throws NamingException {
     }
@@ -75,8 +69,6 @@ public class NamingExceptionRetryHandlerTest {
 
     private class TestRetrySchedule implements RetrySchedule {
 
-    /**
-     */
     @Override
     public long getInterval(int index) {
         return index;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java
index be722db..033a2e0 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java
@@ -33,6 +33,7 @@ public class CassandraDomainListTest extends AbstractDomainListTest {
 
     private CassandraCluster cassandra;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         cassandra = CassandraCluster.create(new CassandraDomainListModule(), cassandraServer.getIp(), cassandraServer.getBindingPort());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java
index a5b21d8..8fe0e98 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java
@@ -35,12 +35,14 @@ public class CassandraRecipientRewriteTableTest extends AbstractRecipientRewrite
 
     private CassandraCluster cassandra;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         cassandra = CassandraCluster.create(new CassandraRRTModule(), cassandraServer.getIp(), cassandraServer.getBindingPort());
         super.setUp();
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         super.tearDown();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java
index 8f039fb..93352ee 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java
@@ -34,6 +34,7 @@ public class CassandraSieveRepositoryTest extends AbstractSieveRepositoryTest {
     
     private CassandraCluster cassandra;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         cassandra = CassandraCluster.create(new CassandraSieveRepositoryModule(), cassandraServer.getIp(), cassandraServer.getBindingPort());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-cassandra/src/test/java/org/apache/james/user/cassandra/CassandraUsersRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/user/cassandra/CassandraUsersRepositoryTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/user/cassandra/CassandraUsersRepositoryTest.java
index 7ac7e55..a3e5955 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/user/cassandra/CassandraUsersRepositoryTest.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/user/cassandra/CassandraUsersRepositoryTest.java
@@ -34,12 +34,14 @@ public class CassandraUsersRepositoryTest extends AbstractUsersRepositoryTest {
     
     private CassandraCluster cassandra;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         cassandra = CassandraCluster.create(new CassandraUsersRepositoryModule(), cassandraServer.getIp(), cassandraServer.getBindingPort());
         super.setUp();
     }
     
+    @Override
     @After
     public void tearDown() throws Exception {
         super.tearDown();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
index 00f05e2..caed732 100755
--- a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
+++ b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
@@ -161,6 +161,7 @@ public class MBoxMailRepository implements MailRepository, Configurable {
         MimeMessage messageAction(String messageSeparator, String bodyText, long messageStart);
     }
 
+    @Override
     public void configure(HierarchicalConfiguration configuration) throws ConfigurationException {
         /*
       The repository configuration
@@ -381,10 +382,12 @@ public class MBoxMailRepository implements MailRepository, Configurable {
                 ins.seek(messageStart - 1);
             }
             MessageAction op = new MessageAction() {
+                @Override
                 public boolean isComplete() {
                     return true;
                 }
 
+                @Override
                 public MimeMessage messageAction(String messageSeparator, String bodyText, long messageStart) {
                     if (key.equals(generateKeyValue(bodyText))) {
                         LOGGER.debug("{} Located message. Returning MIME message", this.getClass().getName());
@@ -432,10 +435,12 @@ public class MBoxMailRepository implements MailRepository, Configurable {
             }
             this.mList = new Hashtable<>((int) initialCapacity);
             this.parseMboxFile(ins, new MessageAction() {
+                @Override
                 public boolean isComplete() {
                     return false;
                 }
 
+                @Override
                 public MimeMessage messageAction(String messageSeparator, String bodyText, long messageStart) {
                     String key = generateKeyValue(bodyText);
                     mList.put(key, messageStart);
@@ -461,9 +466,7 @@ public class MBoxMailRepository implements MailRepository, Configurable {
         }
     }
 
-    /**
-     * @see org.apache.james.mailrepository.api.MailRepository#store(Mail)
-     */
+    @Override
     public void store(Mail mc) {
         LOGGER.debug("Will store message to file {}", mboxFile);
 
@@ -499,9 +502,7 @@ public class MBoxMailRepository implements MailRepository, Configurable {
         }
     }
 
-    /**
-     * @see org.apache.james.mailrepository.api.MailRepository#list()
-     */
+    @Override
     public Iterator<String> list() {
         ArrayList<String> keys = loadKeysAsArray();
 
@@ -524,9 +525,7 @@ public class MBoxMailRepository implements MailRepository, Configurable {
         return new ArrayList<>(mList.keySet());
     }
 
-    /**
-     * @see org.apache.james.mailrepository.api.MailRepository#retrieve(String)
-     */
+    @Override
     public Mail retrieve(String key) {
 
         loadKeys();
@@ -544,9 +543,7 @@ public class MBoxMailRepository implements MailRepository, Configurable {
         return res;
     }
 
-    /**
-     * @see org.apache.james.mailrepository.api.MailRepository#remove(Mail)
-     */
+    @Override
     public void remove(Mail mail) {
         ArrayList<Mail> remArray = new ArrayList<>();
         remArray.add(mail);
@@ -597,9 +594,7 @@ public class MBoxMailRepository implements MailRepository, Configurable {
         }
     }
 
-    /**
-     * @see org.apache.james.mailrepository.api.MailRepository#remove(Collection)
-     */
+    @Override
     public void remove(final Collection<Mail> mails) {
         LOGGER.debug("Removing entry for key {}", mails);
         // The plan is as follows:
@@ -610,10 +605,12 @@ public class MBoxMailRepository implements MailRepository, Configurable {
             RandomAccessFile ins = new RandomAccessFile(mboxFile, "r"); // The source
             final RandomAccessFile outputFile = new RandomAccessFile(mboxFile + WORKEXT, "rw"); // The destination
             parseMboxFile(ins, new MessageAction() {
+                @Override
                 public boolean isComplete() {
                     return false;
                 }
 
+                @Override
                 public MimeMessage messageAction(String messageSeparator, String bodyText, long messageStart) {
                     // Write out the messages as we go, until we reach the key
                     // we want
@@ -671,9 +668,7 @@ public class MBoxMailRepository implements MailRepository, Configurable {
         }
     }
 
-    /**
-     * @see org.apache.james.mailrepository.api.MailRepository#remove(String)
-     */
+    @Override
     public void remove(String key) {
         loadKeys();
         try {
@@ -689,16 +684,12 @@ public class MBoxMailRepository implements MailRepository, Configurable {
         unlockMBox();
     }
 
-    /**
-     * @see org.apache.james.mailrepository.api.MailRepository#lock(String)
-     */
+    @Override
     public boolean lock(String key) {
         return false;
     }
 
-    /**
-     * @see org.apache.james.mailrepository.api.MailRepository#unlock(String)
-     */
+    @Override
     public boolean unlock(String key) {
         return false;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java
index ec39f82..ed37186 100644
--- a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java
+++ b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java
@@ -73,22 +73,17 @@ public class MimeMessageStreamRepositorySource extends MimeMessageSource {
      * 
      * @return the String ID
      */
+    @Override
     public String getSourceId() {
         return repositoryName + "/" + key;
     }
 
-    /**
-     * Return the InputStream
-     * 
-     * @return stream return the InputStream
-     */
+    @Override
     public InputStream getInputStream() throws IOException {
         return sr.get(key);
     }
 
-    /**
-     * @see org.apache.james.server.core.MimeMessageSource#getMessageSize()
-     */
+    @Override
     public long getMessageSize() throws IOException {
         if (size == -1) {
             if (sr instanceof org.apache.james.repository.file.FilePersistentStreamRepository) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java
index c9c597b..54984aa 100644
--- a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java
+++ b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java
@@ -207,6 +207,7 @@ public class SieveFileRepository implements SieveRepository {
         }
     }
 
+    @Override
     public List<ScriptSummary> listScripts(String user) throws StorageException {
         File[] files = getUserDirectory(user).listFiles();
         List<ScriptSummary> summaries = new ArrayList<>(files.length);
@@ -275,6 +276,7 @@ public class SieveFileRepository implements SieveRepository {
         return new DateTime(getActiveFile(user).lastModified());
     }
 
+    @Override
     public void setActive(String user, String name) throws ScriptNotFoundException, StorageException {
         synchronized (lock) {
             // Turn off currently active script, if any

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java b/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
index d2aca34..1d47ff2 100644
--- a/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
+++ b/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
@@ -72,9 +72,7 @@ public class UsersFileRepository extends AbstractJamesUsersRepository {
         this.fileSystem = fileSystem;
     }
 
-    /**
-     * @see org.apache.james.user.lib.AbstractJamesUsersRepository#doConfigure(org.apache.commons.configuration.HierarchicalConfiguration)
-     */
+    @Override
     protected void doConfigure(HierarchicalConfiguration configuration) throws ConfigurationException {
         super.doConfigure(configuration);
         destination = configuration.getString("destination.[@URL]");
@@ -105,16 +103,12 @@ public class UsersFileRepository extends AbstractJamesUsersRepository {
         }
     }
 
-    /**
-     * @see org.apache.james.user.api.UsersRepository#list()
-     */
+    @Override
     public Iterator<String> list() {
         return objectRepository.list();
     }
 
-    /**
-     * @see org.apache.james.user.lib.AbstractJamesUsersRepository#doAddUser(org.apache.james.user.api.model.User)
-     */
+    @Override
     protected void doAddUser(User user) throws UsersRepositoryException {
         if (contains(user.getUserName())) {
             throw new UsersRepositoryException(user.getUserName() + " already exists.");
@@ -126,10 +120,7 @@ public class UsersFileRepository extends AbstractJamesUsersRepository {
         }
     }
 
-    /**
-     * @throws UsersRepositoryException
-     * @see org.apache.james.user.api.UsersRepository#getUserByName(java.lang.String)
-     */
+    @Override
     public synchronized User getUserByName(String name) throws UsersRepositoryException {
         if (ignoreCase) {
             name = getRealName(name);
@@ -182,10 +173,7 @@ public class UsersFileRepository extends AbstractJamesUsersRepository {
         return getRealName(name, ignoreCase);
     }
 
-    /**
-     * @throws UsersRepositoryException
-     * @see org.apache.james.user.lib.AbstractJamesUsersRepository#doUpdateUser(org.apache.james.user.api.model.User)
-     */
+    @Override
     protected void doUpdateUser(User user) throws UsersRepositoryException {
         try {
             objectRepository.put(user.getUserName(), user);
@@ -194,18 +182,14 @@ public class UsersFileRepository extends AbstractJamesUsersRepository {
         }
     }
 
-    /**
-     * @see org.apache.james.user.api.UsersRepository#removeUser(java.lang.String)
-     */
+    @Override
     public synchronized void removeUser(String name) throws UsersRepositoryException {
         if (!objectRepository.remove(name)) {
             throw new UsersRepositoryException("User " + name + " does not exist");
         }
     }
 
-    /**
-     * @see org.apache.james.user.api.UsersRepository#contains(java.lang.String)
-     */
+    @Override
     public boolean contains(String name) throws UsersRepositoryException {
         if (ignoreCase) {
             return containsCaseInsensitive(name);
@@ -228,10 +212,7 @@ public class UsersFileRepository extends AbstractJamesUsersRepository {
         return false;
     }
 
-    /**
-     * @see org.apache.james.user.api.UsersRepository#test(java.lang.String,
-     *      java.lang.String)
-     */
+    @Override
     public boolean test(String name, String password) throws UsersRepositoryException {
         User user;
         try {
@@ -245,9 +226,7 @@ public class UsersFileRepository extends AbstractJamesUsersRepository {
         return user.verifyPassword(password);
     }
 
-    /**
-     * @see org.apache.james.user.api.UsersRepository#countUsers()
-     */
+    @Override
     public int countUsers() throws UsersRepositoryException {
         int count = 0;
         for (Iterator<String> it = list(); it.hasNext(); it.next()) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java b/server/data/data-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
index c9797d5..a2a69aa 100644
--- a/server/data/data-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
+++ b/server/data/data-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
@@ -66,6 +66,7 @@ public class FileMailRepositoryTest {
     @DisplayName("Default configuration")
     public class DefaultFileMailRepositoryTest extends GenericFileMailRepositoryTest {
 
+        @Override
         protected DefaultConfigurationBuilder withConfigurationOptions(DefaultConfigurationBuilder configuration) {
             configuration.addProperty("[@FIFO]", "false");
             configuration.addProperty("[@CACHEKEYS]", "true");
@@ -77,6 +78,7 @@ public class FileMailRepositoryTest {
     @DisplayName("No cache configuration")
     public class NoCacheFileMailRepositoryTest extends GenericFileMailRepositoryTest {
 
+        @Override
         protected DefaultConfigurationBuilder withConfigurationOptions(DefaultConfigurationBuilder configuration) {
             configuration.addProperty("[@FIFO]", "false");
             configuration.addProperty("[@CACHEKEYS]", "false");
@@ -88,6 +90,7 @@ public class FileMailRepositoryTest {
     @DisplayName("Fifo configuration")
     public class FifoFileMailRepositoryTest extends GenericFileMailRepositoryTest {
 
+        @Override
         protected DefaultConfigurationBuilder withConfigurationOptions(DefaultConfigurationBuilder configuration) {
             configuration.addProperty("[@FIFO]", "true");
             configuration.addProperty("[@CACHEKEYS]", "true");
@@ -99,6 +102,7 @@ public class FileMailRepositoryTest {
     @DisplayName("Fifo no cache configuration")
     public class FifoNoCacheFileMailRepositoryTest extends GenericFileMailRepositoryTest {
 
+        @Override
         protected DefaultConfigurationBuilder withConfigurationOptions(DefaultConfigurationBuilder configuration) {
             configuration.addProperty("[@FIFO]", "true");
             configuration.addProperty("[@CACHEKEYS]", "false");

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java b/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
index 07d7f79..0c59bea 100644
--- a/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
+++ b/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
@@ -43,12 +43,14 @@ public class XMLRecipientRewriteTableTest extends AbstractRecipientRewriteTableT
 
     private final DefaultConfigurationBuilder defaultConfiguration = new DefaultConfigurationBuilder();
 
+    @Override
     @Before
     public void setUp() throws Exception {
         defaultConfiguration.setDelimiterParsingDisabled(true);
         super.setUp();
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         super.tearDown();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java b/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java
index 876b004..dd194f5 100644
--- a/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java
+++ b/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java
@@ -21,17 +21,21 @@ public class SieveFileRepositoryTest extends AbstractSieveRepositoryTest {
 
     private FileSystem fileSystem;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         this.fileSystem = new FileSystem() {
+            @Override
             public File getBasedir() throws FileNotFoundException {
                 return new File(System.getProperty("java.io.tmpdir"));
             }
             
+            @Override
             public InputStream getResource(String url) throws IOException {
                 return new FileInputStream(getFile(url));
             }
             
+            @Override
             public File getFile(String fileURL) throws FileNotFoundException {
                 return new File(getBasedir(), fileURL.substring(FileSystem.FILE_PROTOCOL.length()));
             }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java b/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
index 2f45630..a2826cf 100644
--- a/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
+++ b/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
@@ -54,6 +54,7 @@ public class UsersFileRepositoryTest extends AbstractUsersRepositoryTest {
         this.usersRepository = getUsersRepository();
     }
 
+    @Override
     @After
     public void tearDown() throws IOException {
         FileUtils.forceDelete(targetRepositoryFolder);
@@ -100,6 +101,7 @@ public class UsersFileRepositoryTest extends AbstractUsersRepositoryTest {
     public void addUserShouldThrowWhenSameUsernameWithDifferentCase() throws UsersRepositoryException {
     }
 
+    @Override
     protected void disposeUsersRepository() throws UsersRepositoryException {
         if (this.usersRepository != null) {
             Iterator<String> i = this.usersRepository.list();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java b/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java
index e1289b8..d7bdbcc 100644
--- a/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java
+++ b/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java
@@ -56,9 +56,6 @@ public class HBaseDomainList extends AbstractDomainList {
         super(dns);
     }
 
-    /**
-     * @see org.apache.james.domainlist.api.DomainList#containsDomain(String)
-     */
     @Override
     protected boolean containsDomainInternal(String domain) throws DomainListException {
         HTableInterface table = null;
@@ -84,9 +81,6 @@ public class HBaseDomainList extends AbstractDomainList {
         return false;
     }
 
-    /**
-     * @see org.apache.james.domainlist.api.DomainList#addDomain(String)
-     */
     @Override
     public void addDomain(String domain) throws DomainListException {
         String lowerCasedDomain = domain.toLowerCase(Locale.US);
@@ -136,9 +130,6 @@ public class HBaseDomainList extends AbstractDomainList {
         }
     }
 
-    /**
-     * @see org.apache.james.domainlist.lib.AbstractDomainList#getDomainListInternal()
-     */
     @Override
     protected List<String> getDomainListInternal() throws DomainListException {
         List<String> list = new ArrayList<>();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java b/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java
index 93709ab..1a3cf51 100644
--- a/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java
+++ b/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java
@@ -54,9 +54,6 @@ public class HBaseRecipientRewriteTable extends AbstractRecipientRewriteTable {
     private static final Logger log = LoggerFactory.getLogger(HBaseRecipientRewriteTable.class.getName());
     private static final String ROW_SEPARATOR = "@";
 
-    /**
-     * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#addMappingInternal(String, String, String)
-     */
     @Override
     protected void addMappingInternal(String user, String domain, Mapping mapping) throws RecipientRewriteTableException {
         String fixedUser = getFixedUser(user);
@@ -70,9 +67,6 @@ public class HBaseRecipientRewriteTable extends AbstractRecipientRewriteTable {
         }
     }
 
-    /**
-     * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#getUserDomainMappingsInternal(String, String)
-     */
     @Override
     protected Mappings getUserDomainMappingsInternal(String user, String domain) throws
             RecipientRewriteTableException {
@@ -109,9 +103,6 @@ public class HBaseRecipientRewriteTable extends AbstractRecipientRewriteTable {
         return list;
     }
 
-    /**
-     * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#getAllMappingsInternal()
-     */
     @Override
     protected Map<String, Mappings> getAllMappingsInternal() throws RecipientRewriteTableException {
         HTableInterface table = null;
@@ -161,9 +152,6 @@ public class HBaseRecipientRewriteTable extends AbstractRecipientRewriteTable {
         return map;
     }
 
-    /**
-     * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#mapAddressInternal(String, String)
-     */
     @Override
     protected String mapAddressInternal(String user, String domain) throws RecipientRewriteTableException {
         HTableInterface table = null;
@@ -203,9 +191,6 @@ public class HBaseRecipientRewriteTable extends AbstractRecipientRewriteTable {
         return null;
     }
 
-    /**
-     * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#removeMappingInternal(String, String, String)
-     */
     @Override
     protected void removeMappingInternal(String user, String domain, Mapping mapping) throws
             RecipientRewriteTableException {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java b/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java
index 701b998..024b5b8 100644
--- a/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java
+++ b/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java
@@ -58,18 +58,12 @@ public class HBaseUsersRepository extends AbstractUsersRepository {
      */
     private String algo;
 
-    /**
-     * @see org.apache.james.user.lib.AbstractUsersRepository#doConfigure(HierarchicalConfiguration)
-     */
     @Override
     public void doConfigure(HierarchicalConfiguration config) throws ConfigurationException {
         algo = config.getString("algorithm", "MD5");
         super.doConfigure(config);
     }
 
-    /**
-     * @see org.apache.james.user.api.UsersRepository#getUserByName(String)
-     */
     @Override
     public User getUserByName(String name) throws UsersRepositoryException {
         KeyValue keyValue = getKeyValue(name);
@@ -80,9 +74,6 @@ public class HBaseUsersRepository extends AbstractUsersRepository {
         return user;
     }
 
-    /**
-     * @see org.apache.james.user.api.UsersRepository#updateUser(User)
-     */
     @Override
     public void updateUser(User user) throws UsersRepositoryException {
         if (user == null) {
@@ -98,9 +89,6 @@ public class HBaseUsersRepository extends AbstractUsersRepository {
         putUser((DefaultUser) user, false);
     }
 
-    /**
-     * @see org.apache.james.user.api.UsersRepository#removeUser(String)
-     */
     @Override
     public void removeUser(String name) throws UsersRepositoryException {
         HTableInterface table = null;
@@ -123,18 +111,12 @@ public class HBaseUsersRepository extends AbstractUsersRepository {
         }
     }
 
-    /**
-     * @see org.apache.james.user.api.UsersRepository#contains(String)
-     */
     @Override
     public boolean contains(String name) throws UsersRepositoryException {
         KeyValue keyValue = getKeyValue(name.toLowerCase(Locale.US));
         return (keyValue != null);
     }
 
-    /**
-     * @see org.apache.james.user.api.UsersRepository#test(String, String)
-     */
     @Override
     public boolean test(String name, String password) throws UsersRepositoryException {
         KeyValue keyValue = getKeyValue(name);
@@ -146,9 +128,6 @@ public class HBaseUsersRepository extends AbstractUsersRepository {
         return false;
     }
 
-    /**
-     * @see org.apache.james.user.api.UsersRepository#countUsers()
-     */
     @Override
     public int countUsers() throws UsersRepositoryException {
         HTableInterface table = null;
@@ -181,9 +160,6 @@ public class HBaseUsersRepository extends AbstractUsersRepository {
         }
     }
 
-    /**
-     * @see org.apache.james.user.api.UsersRepository#list()
-     */
     @Override
     public Iterator<String> list() throws UsersRepositoryException {
         List<String> list = new ArrayList<>();
@@ -217,9 +193,6 @@ public class HBaseUsersRepository extends AbstractUsersRepository {
         return list.iterator();
     }
 
-    /**
-     * @see org.apache.james.user.lib.AbstractUsersRepository#doAddUser(String, String)
-     */
     @Override
     protected void doAddUser(String username, String password) throws UsersRepositoryException {
         DefaultUser user = new DefaultUser(username, algo);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java b/server/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java
index 9b83fe2..d8af78c 100644
--- a/server/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java
+++ b/server/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java
@@ -46,6 +46,7 @@ public class HBaseDomainListTest extends AbstractDomainListTest {
         TablePool.getInstance(cluster.getConf());
     }
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();
@@ -59,9 +60,6 @@ public class HBaseDomainListTest extends AbstractDomainListTest {
         }
     }
 
-    /**
-     * @see org.apache.james.domainlist.lib.AbstractDomainListTest#createDomainList()
-     */
     @Override
     protected DomainList createDomainList() throws Exception {
         HBaseDomainList domainList = new HBaseDomainList(getDNSServer("localhost"));

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java b/server/data/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java
index acfa754..7015000 100644
--- a/server/data/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java
+++ b/server/data/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java
@@ -43,14 +43,12 @@ public class HBaseRecipientRewriteTableTest extends AbstractRecipientRewriteTabl
         super.setUp();
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         super.tearDown();
     }
     
-    /**
-     * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest#getRecipientRewriteTable()
-     */
     @Override
     protected AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception {
         HBaseRecipientRewriteTable rrt = new HBaseRecipientRewriteTable();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java b/server/data/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java
index 8267076..4099a3e 100644
--- a/server/data/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java
+++ b/server/data/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java
@@ -70,9 +70,6 @@ public class HBaseUsersRepositoryTest extends AbstractUsersRepositoryTest {
         }
     }
 
-    /**
-     * @see org.apache.james.user.lib.AbstractUsersRepositoryTest#getUsersRepository()
-     */
     @Override
     protected AbstractUsersRepository getUsersRepository() throws Exception {
         HBaseUsersRepository userRepository = new HBaseUsersRepository();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java b/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
index 0b36906..1f9328c 100644
--- a/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
+++ b/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
@@ -98,11 +98,6 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep
         CndImporter.registerNodeTypes(new InputStreamReader(Thread.currentThread().getContextClassLoader().getResourceAsStream("org/apache/james/imap/jcr/james.cnd")), login());
     }
 
-    /**
-     * @see
-     * org.apache.james.mailrepository.lib.AbstractMailRepository
-     * #doConfigure(org.apache.commons.configuration.HierarchicalConfiguration)
-     */
     @Override
     public void doConfigure(HierarchicalConfiguration config) throws ConfigurationException {
         this.workspace = config.getString("workspace", null);
@@ -122,6 +117,7 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep
         return repository.login(creds, workspace);
     }
 
+    @Override
     public Iterator<String> list() throws MessagingException {
         try {
             Session session = login();
@@ -143,6 +139,7 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep
         }
     }
 
+    @Override
     public Mail retrieve(String key) throws MessagingException {
         try {
             Session session = login();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java b/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
index 35245d8..6248989 100644
--- a/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
+++ b/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
@@ -67,6 +67,7 @@ public class JCRUsersRepository extends AbstractUsersRepository {
         this.repository = repository;
     }
 
+    @Override
     public void doConfigure(HierarchicalConfiguration config) throws ConfigurationException {
         this.workspace = config.getString("workspace", null);
         String username = config.getString("username", null);
@@ -94,6 +95,7 @@ public class JCRUsersRepository extends AbstractUsersRepository {
      * @return the user being retrieved, null if the user doesn't exist
      * 
      */
+    @Override
     public User getUserByName(String username) {
         User user;
         try {
@@ -142,6 +144,7 @@ public class JCRUsersRepository extends AbstractUsersRepository {
      * @throws UsersRepositoryException
      *            If an error occurred
      */
+    @Override
     public void updateUser(User user) throws UsersRepositoryException {
         if (user != null && user instanceof JCRUser) {
             final JCRUser jcrUser = (JCRUser) user;
@@ -181,6 +184,7 @@ public class JCRUsersRepository extends AbstractUsersRepository {
      *            the user to remove from the repository
      * @throws UsersRepositoryException
      */
+    @Override
     public void removeUser(String username) throws UsersRepositoryException {
         try {
             final Session session = login();
@@ -212,6 +216,7 @@ public class JCRUsersRepository extends AbstractUsersRepository {
      * @return whether the user is in the repository
      * @throws UsersRepositoryException
      */
+    @Override
     public boolean contains(String name) throws UsersRepositoryException {
         try {
             final Session session = login();
@@ -247,6 +252,7 @@ public class JCRUsersRepository extends AbstractUsersRepository {
      * 
      * @since James 1.2.2
      */
+    @Override
     public boolean test(String username, String password) throws UsersRepositoryException {
         try {
             final Session session = login();
@@ -284,6 +290,7 @@ public class JCRUsersRepository extends AbstractUsersRepository {
      * @return the number of users in the repository
      * @throws UsersRepositoryException
      */
+    @Override
     public int countUsers() throws UsersRepositoryException {
         try {
             final Session session = login();
@@ -314,6 +321,7 @@ public class JCRUsersRepository extends AbstractUsersRepository {
      *         repository.
      * @throws UsersRepositoryException
      */
+    @Override
     public Iterator<String> list() throws UsersRepositoryException {
         final Collection<String> userNames = new ArrayList<>();
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java
----------------------------------------------------------------------
diff --git a/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java b/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java
index 9eb20b5..c40fcf5 100644
--- a/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java
+++ b/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java
@@ -57,6 +57,7 @@ public class JCRUser implements User {
         this.hashedSaltedPassword = hashedSaltedPassword;
     }
 
+    @Override
     public String getUserName() {
         return userName;
     }
@@ -70,6 +71,7 @@ public class JCRUser implements User {
         return hashedSaltedPassword;
     }
 
+    @Override
     public boolean setPassword(String newPass) {
         final boolean result;
         if (newPass == null) {
@@ -81,6 +83,7 @@ public class JCRUser implements User {
         return result;
     }
 
+    @Override
     public boolean verifyPassword(String pass) {
         final boolean result;
         result = pass != null && hashedSaltedPassword.equals(hashPassword(userName, pass));

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
index 3487a3c..9ce7211 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
@@ -161,6 +161,7 @@ public class JDBCMailRepository extends AbstractMailRepository {
         this.fileSystem = fileSystem;
     }
 
+    @Override
     protected void doConfigure(HierarchicalConfiguration configuration) throws ConfigurationException {
         super.doConfigure(configuration);
         LOGGER.debug("{}.configure()", getClass().getName());
@@ -372,9 +373,7 @@ public class JDBCMailRepository extends AbstractMailRepository {
         }
     }
 
-    /**
-     * @see org.apache.james.mailrepository.lib.AbstractMailRepository#internalStore(Mail)
-     */
+    @Override
     protected void internalStore(Mail mc) throws IOException, MessagingException {
         Connection conn = null;
         try {
@@ -591,9 +590,7 @@ public class JDBCMailRepository extends AbstractMailRepository {
         }
     }
 
-    /**
-     * @see org.apache.james.mailrepository.api.MailRepository#retrieve(String)
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public Mail retrieve(String key) throws MessagingException {
         if (DEEP_DEBUG) {
@@ -701,9 +698,7 @@ public class JDBCMailRepository extends AbstractMailRepository {
         }
     }
 
-    /**
-     * @see org.apache.james.mailrepository.lib.AbstractMailRepository#internalRemove(String)
-     */
+    @Override
     protected void internalRemove(String key) throws MessagingException {
         Connection conn = null;
         PreparedStatement removeMessage = null;
@@ -725,9 +720,7 @@ public class JDBCMailRepository extends AbstractMailRepository {
         }
     }
 
-    /**
-     * @see org.apache.james.mailrepository.api.MailRepository#list()
-     */
+    @Override
     public Iterator<String> list() throws MessagingException {
         // System.err.println("listing messages");
         Connection conn = null;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
index 16fbc98..fdba5f1 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
@@ -98,6 +98,7 @@ final class MessageInputStream extends InputStream {
 
                 private PipedOutputStream out;
 
+                @Override
                 public void run() {
                     try {
                         writeStream(mail, out, update);
@@ -198,6 +199,7 @@ final class MessageInputStream extends InputStream {
                     /**
                      * @see java.lang.Throwable#getCause()
                      */
+                    @Override
                     public Throwable getCause() {
                         return caughtException;
                     }
@@ -235,9 +237,7 @@ final class MessageInputStream extends InputStream {
 
     // wrapper methods
 
-    /**
-     * @see java.io.InputStream#available()
-     */
+    @Override
     public int available() throws IOException {
         if (caughtException != null || wrapped == null) {
             throwException();
@@ -245,9 +245,7 @@ final class MessageInputStream extends InputStream {
         return wrapped.available();
     }
 
-    /**
-     * @see java.io.InputStream#close()
-     */
+    @Override
     public void close() throws IOException {
         if (caughtException != null || wrapped == null) {
             throwException();
@@ -256,23 +254,17 @@ final class MessageInputStream extends InputStream {
         wrapped = null;
     }
 
-    /**
-     * @see java.io.InputStream#mark(int)
-     */
+    @Override
     public synchronized void mark(int readLimit) {
         wrapped.mark(readLimit);
     }
 
-    /**
-     * @see java.io.InputStream#markSupported()
-     */
+    @Override
     public boolean markSupported() {
         return wrapped.markSupported();
     }
 
-    /**
-     * @see java.io.InputStream#read(byte[], int, int)
-     */
+    @Override
     public int read(byte[] b, int off, int len) throws IOException {
         if (caughtException != null || wrapped == null) {
             throwException();
@@ -280,9 +272,7 @@ final class MessageInputStream extends InputStream {
         return wrapped.read(b, off, len);
     }
 
-    /**
-     * @see java.io.InputStream#read(byte[])
-     */
+    @Override
     public int read(byte[] b) throws IOException {
         if (caughtException != null || wrapped == null) {
             throwException();
@@ -290,9 +280,7 @@ final class MessageInputStream extends InputStream {
         return wrapped.read(b);
     }
 
-    /**
-     * @see java.io.InputStream#reset()
-     */
+    @Override
     public synchronized void reset() throws IOException {
         if (caughtException != null || wrapped == null) {
             throwException();
@@ -300,9 +288,7 @@ final class MessageInputStream extends InputStream {
         wrapped.reset();
     }
 
-    /**
-     * @see java.io.InputStream#skip(long)
-     */
+    @Override
     public long skip(long n) throws IOException {
         if (caughtException != null || wrapped == null) {
             throwException();
@@ -310,9 +296,7 @@ final class MessageInputStream extends InputStream {
         return wrapped.skip(n);
     }
 
-    /**
-     * @see java.io.InputStream#read()
-     */
+    @Override
     public int read() throws IOException {
         if (caughtException != null || wrapped == null) {
             throwException();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java
index 5f0658e..8f64a80 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java
@@ -107,6 +107,7 @@ public class MimeMessageJDBCSource extends MimeMessageSource {
      * 
      * @return the String ID
      */
+    @Override
     public String getSourceId() {
         return repository.repositoryName + "/" + key;
     }
@@ -119,6 +120,7 @@ public class MimeMessageJDBCSource extends MimeMessageSource {
      * 
      * @see org.apache.james.server.core.MimeMessageSource#getInputStream()
      */
+    @Override
     public synchronized InputStream getInputStream() throws IOException {
         Connection conn = null;
         PreparedStatement retrieveMessageStream = null;
@@ -175,9 +177,8 @@ public class MimeMessageJDBCSource extends MimeMessageSource {
 
     /**
      * Runs a custom SQL statement to check the size of the message body
-     * 
-     * @see org.apache.james.server.core.MimeMessageSource#getMessageSize()
      */
+    @Override
     public synchronized long getMessageSize() throws IOException {
         if (size != -1) {
             return size;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java b/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
index 0335a99..a25d33d 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
@@ -141,6 +141,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
         this.dataSource = dataSource;
     }
 
+    @Override
     protected void doConfigure(HierarchicalConfiguration conf) throws ConfigurationException {
 
         String destination = conf.getString("[@destinationURL]", null);
@@ -194,10 +195,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
         doAddMapping(fixedUser, fixedDomain, mapping.asString());
     }
 
-    /**
-     * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#mapAddressInternal(java.lang.String,
-     *      java.lang.String)
-     */
+    @Override
     protected String mapAddressInternal(String user, String domain) throws RecipientRewriteTableException {
         Connection conn = null;
         PreparedStatement mappingStmt = null;
@@ -227,11 +225,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
         return null;
     }
 
-    /**
-     * @throws RecipientRewriteTableException
-     * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#mapAddress(java.lang.String,
-     *      java.lang.String)
-     */
+    @Override
     protected Mappings getUserDomainMappingsInternal(String user, String domain) throws RecipientRewriteTableException {
         Connection conn = null;
         PreparedStatement mappingStmt = null;
@@ -259,10 +253,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
         return null;
     }
 
-    /**
-     * @throws RecipientRewriteTableException
-     * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#getAllMappingsInternal()
-     */
+    @Override
     protected Map<String, Mappings> getAllMappingsInternal() throws RecipientRewriteTableException {
         Connection conn = null;
         PreparedStatement mappingStmt = null;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
index 2917e39..357d624 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
@@ -128,6 +128,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
      *            the user to be removed
      * @throws UsersRepositoryException
      */
+    @Override
     public void removeUser(String userName) throws UsersRepositoryException {
         User user = getUserByName(userName);
         if (user != null) {
@@ -148,6 +149,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
      * 
      * @since James 1.2.2
      */
+    @Override
     public User getUserByName(String name) throws UsersRepositoryException {
         return getUserByName(name, ignoreCase);
     }
@@ -157,6 +159,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
      * 
      * @return true or false
      */
+    @Override
     public boolean contains(String name) throws UsersRepositoryException {
         User user = getUserByName(name, ignoreCase);
         return (user != null);
@@ -185,6 +188,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
      *         incorrect or the user doesn't exist
      * @since James 1.2.2
      */
+    @Override
     public boolean test(String name, String password) throws UsersRepositoryException {
         User user = getUserByName(name, ignoreCase);
         return user != null && user.verifyPassword(password);
@@ -195,6 +199,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
      * 
      * @return the number of users in the repository
      */
+    @Override
     public int countUsers() throws UsersRepositoryException {
         List<String> usernames = listUserNames();
         return usernames.size();
@@ -206,6 +211,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
      * @return Iterator over a collection of Strings, each being one user in the
      *         repository.
      */
+    @Override
     public Iterator<String> list() throws UsersRepositoryException {
         return listUserNames().iterator();
     }
@@ -344,9 +350,8 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
      *       &lt;sqlParameters table=&quot;JamesUsers&quot;/&gt;
      *   &lt;/repository&gt;
      * </pre>
-     * 
-     * @see org.apache.james.user.lib.AbstractJamesUsersRepository#doConfigure(org.apache.commons.configuration.HierarchicalConfiguration)
      */
+    @Override
     protected void doConfigure(HierarchicalConfiguration configuration) throws ConfigurationException {
         LOGGER.debug("{}.configure()", getClass().getName());
 
@@ -474,6 +479,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
      *            the user to add
      * @throws UsersRepositoryException
      */
+    @Override
     protected void doAddUser(User user) throws UsersRepositoryException {
         Connection conn = null;
         PreparedStatement addUserStatement = null;
@@ -530,6 +536,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
      *            the user to update
      * @throws UsersRepositoryException
      */
+    @Override
     protected void doUpdateUser(User user) throws UsersRepositoryException {
         Connection conn = null;
         PreparedStatement updateUserStatement = null;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java
index b790d95..67697ab 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java
@@ -35,9 +35,7 @@ import org.apache.james.user.lib.model.DefaultUser;
 @Deprecated
 public class JamesUsersJdbcRepository extends AbstractJdbcUsersRepository {
 
-    /**
-     * @see org.apache.james.user.jdbc.AbstractJdbcUsersRepository#readUserFromResultSet(java.sql.ResultSet)
-     */
+    @Override
     protected User readUserFromResultSet(ResultSet rsUsers) throws SQLException {
         // Get the column values
         String username = rsUsers.getString(1);
@@ -68,18 +66,12 @@ public class JamesUsersJdbcRepository extends AbstractJdbcUsersRepository {
         return user;
     }
 
-    /**
-     * @see org.apache.james.user.jdbc.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.user.api.model.User,
-     *      java.sql.PreparedStatement)
-     */
+    @Override
     protected void setUserForInsertStatement(User user, PreparedStatement userInsert) throws SQLException {
         setUserForStatement(user, userInsert, false);
     }
 
-    /**
-     * @see org.apache.james.user.jdbc.AbstractJdbcUsersRepository#setUserForUpdateStatement(org.apache.james.user.api.model.User,
-     *      java.sql.PreparedStatement)
-     */
+    @Override
     protected void setUserForUpdateStatement(User user, PreparedStatement userUpdate) throws SQLException {
         setUserForStatement(user, userUpdate, true);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java b/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java
index b7c0fc3..fcf2132 100644
--- a/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java
+++ b/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java
@@ -33,11 +33,13 @@ import org.junit.Before;
  */
 public class JDBCRecipientRewriteTableTest extends AbstractRecipientRewriteTableTest {
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         super.tearDown();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java b/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java
index 5c868c1..6d4bbb3 100644
--- a/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java
+++ b/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java
@@ -38,11 +38,13 @@ import org.junit.Before;
  */
 public class DefaultUsersJdbcRepositoryTest extends AbstractUsersJdbcRepositoryTest {
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         super.tearDown();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java b/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
index c04a713..a1f8e89 100644
--- a/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
+++ b/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
@@ -38,11 +38,13 @@ import org.junit.Before;
  */
 public class JamesUsersJdbcRepositoryTest extends AbstractUsersJdbcRepositoryTest {
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         super.tearDown();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenRepositoryTest.java b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenRepositoryTest.java
index a465a42..1725390 100644
--- a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenRepositoryTest.java
+++ b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenRepositoryTest.java
@@ -34,6 +34,7 @@ public class CassandraAccessTokenRepositoryTest extends AccessTokenRepositoryTes
     
     private CassandraCluster cassandra;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         cassandra = CassandraCluster.create(new CassandraAccessModule(), cassandraServer.getIp(), cassandraServer.getBindingPort());


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


[20/22] james-project git commit: JAMES-2352 Continue removing useless @see java-doc comments

Posted by ma...@apache.org.
JAMES-2352 Continue removing useless @see java-doc comments


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ddc04847
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ddc04847
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ddc04847

Branch: refs/heads/master
Commit: ddc04847414a72a6d97241b2e0e01a035dc957f7
Parents: 414f3e6
Author: benwa <bt...@linagora.com>
Authored: Thu Mar 15 17:22:52 2018 +0700
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Fri Mar 16 11:13:15 2018 +0100

----------------------------------------------------------------------
 .../apache/james/mailbox/model/SearchQuery.java |  6 ---
 .../mailbox/jcr/mail/JCRMessageMapper.java      | 11 -----
 .../mailbox/jcr/mail/model/JCRProperty.java     |  5 --
 .../mailbox/store/SimpleMailboxMetaData.java    | 12 ++---
 .../store/mail/model/impl/SimpleMailbox.java    |  4 +-
 .../james/protocols/api/AbstractResponse.java   |  6 +--
 .../protocols/api/CombinedInputStream.java      | 10 +---
 .../apache/james/protocols/api/Encryption.java  |  8 ----
 .../api/handler/ProtocolHandlerChainImpl.java   | 40 ----------------
 .../apache/james/imap/api/message/IdRange.java  |  8 +---
 .../imap/api/message/request/DayMonthYear.java  |  8 +---
 .../imap/decode/parser/SearchCommandParser.java |  4 --
 .../james/imap/encode/ACLResponseEncoder.java   |  9 ----
 .../message/request/AbstractImapRequest.java    |  4 --
 .../response/ImmutableStatusResponse.java       |  2 -
 .../imap/message/response/SearchResponse.java   | 11 +----
 .../james/imap/processor/IdleProcessor.java     | 10 ----
 .../fetch/PartialFetchBodyElement.java          | 15 ------
 .../imap/core/IMAPCommandDispatcher.java        |  4 --
 .../james/imap/processor/LSubProcessorTest.java | 10 ----
 .../protocols/lmtp/AbstractLMTPServerTest.java  | 12 +----
 .../smtp/core/AbstractHookableCmdHandler.java   | 12 -----
 .../protocols/smtp/core/DataCmdHandler.java     |  5 --
 .../core/fastfail/MaxUnknownCmdHandlerTest.java |  4 --
 .../fastfail/ResolvableEhloHeloHandlerTest.java |  8 ----
 .../fastfail/ValidSenderDomainHandlerTest.java  |  4 --
 .../apache/james/server/core/MailHeaders.java   |  6 ---
 ...oxConfigurationBeanFactoryPostProcessor.java |  4 --
 .../lifecycle/ConfigurationProviderImpl.java    |  2 -
 .../resource/DefaultJamesResourceLoader.java    |  2 -
 .../util/retry/naming/RetryingContext.java      | 12 -----
 .../naming/directory/RetryingDirContext.java    | 34 --------------
 .../file/SieveFileRepository.java               |  4 +-
 .../user/hbase/HBaseUsersRepositoryTest.java    |  3 --
 .../mailrepository/jdbc/JDBCMailRepository.java | 10 +---
 .../mailrepository/jdbc/MessageInputStream.java |  3 --
 .../jdbc/MimeMessageJDBCSource.java             |  2 -
 .../rrt/jdbc/JDBCRecipientRewriteTableTest.java |  4 --
 .../domainlist/lib/AbstractDomainList.java      |  3 --
 .../lib/AbstractMailRepository.java             |  6 ---
 .../mailetcontainer/impl/JamesMailSpooler.java  |  2 -
 .../james/transport/mailets/ToSenderFolder.java |  2 -
 .../mailets/jsieve/SieveMailAdapter.java        |  4 +-
 .../org/apache/james/fetchmail/FetchMail.java   |  8 +---
 .../james/lmtpserver/netty/LMTPServer.java      | 10 ----
 .../james/smtpserver/SetMimeHeaderHandler.java  |  3 --
 .../james/smtpserver/fastfail/SPFHandler.java   | 48 --------------------
 .../james/smtpserver/netty/SMTPServer.java      | 20 --------
 .../apache/james/queue/file/FileMailQueue.java  |  2 -
 49 files changed, 20 insertions(+), 406 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java
index 6c11b3a..5d6977e 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java
@@ -1073,17 +1073,11 @@ public class SearchQuery implements Serializable {
             return ALL;
         }
 
-        /**
-         * @see java.lang.Object#equals(java.lang.Object)
-         */
         @Override
         public boolean equals(Object obj) {
             return obj instanceof AllCriterion;
         }
 
-        /**
-         * @see java.lang.Object#hashCode()
-         */
         @Override
         public int hashCode() {
             return 1729;

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
index 33cb5d6..f3771a2 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
@@ -237,12 +237,6 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.mailbox.store.mail.MessageMapper#
-     * countUnseenMessagesInMailbox ()
-     */
     @Override
     public long countUnseenMessagesInMailbox(Mailbox mailbox) throws MailboxException {
 
@@ -317,11 +311,6 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
      * 
      * TODO: Maybe we should better use an ItemVisitor and just traverse through
      * the child nodes. This could be a way faster
-     * 
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.mailbox.store.mail.MessageMapper#
-     * findRecentMessageUidsInMailbox ()
      */
     @Override
     public List<MessageUid> findRecentMessageUidsInMailbox(Mailbox mailbox) throws MailboxException {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
index b939b48..0d935af 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
@@ -77,11 +77,6 @@ public class JCRProperty implements JCRImapConstants, Persistent, Property {
         return node;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.mailbox.store.mail.model.Property#getLocalName()
-     */
     @Override
     public String getLocalName() {
         if (isPersistent()) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxMetaData.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxMetaData.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxMetaData.java
index d7aefdc..1c8dca8 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxMetaData.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxMetaData.java
@@ -86,16 +86,12 @@ public class SimpleMailboxMetaData implements MailboxMetaData, Comparable<Mailbo
         return mailboxId;
     }
 
-    /**
-     * @see java.lang.Object#toString()
-     */
+    @Override
     public String toString() {
         return "ListResult: " + path;
     }
 
-    /**
-     * @see java.lang.Object#hashCode()
-     */
+    @Override
     public int hashCode() {
         final int PRIME = 31;
         int result = 1;
@@ -103,9 +99,7 @@ public class SimpleMailboxMetaData implements MailboxMetaData, Comparable<Mailbo
         return result;
     }
 
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java
index 85c243b..d104b2b 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java
@@ -103,9 +103,7 @@ public class SimpleMailbox implements Mailbox {
         return new MailboxPath(getNamespace(), getUser(), getName());
     }
 
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof SimpleMailbox) {
             SimpleMailbox o = (SimpleMailbox)obj;

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java
index a607cad..9135d20 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java
@@ -52,9 +52,7 @@ public abstract class AbstractResponse implements Response {
         this.setRetCode(code);
         this.appendLine(description);
     }
-    
 
-    
     /**
      * Append the responseLine to the SMTPResponse
      * 
@@ -103,9 +101,7 @@ public abstract class AbstractResponse implements Response {
         this.endSession = endSession;
     }
 
-    /**
-     * @see java.lang.Object#toString()
-     */
+    @Override
     public final String toString() {
         return getLines().toString();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/protocols/api/src/main/java/org/apache/james/protocols/api/CombinedInputStream.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/CombinedInputStream.java b/protocols/api/src/main/java/org/apache/james/protocols/api/CombinedInputStream.java
index 31bbc71..a01f291 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/CombinedInputStream.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/CombinedInputStream.java
@@ -44,20 +44,12 @@ public class CombinedInputStream extends SequenceInputStream implements Iterable
     public Iterator<InputStream> iterator() {
         return new Iterator<InputStream>() {
             private int count = 0;
-           
-            /*
-             * (non-Javadoc)
-             * @see java.util.Iterator#hasNext()
-             */
+
             @Override
             public boolean hasNext() {
                 return count < streams.length;
             }
 
-            /*
-             * (non-Javadoc)
-             * @see java.util.Iterator#next()
-             */
             @Override
             public InputStream next() {
                 if (hasNext())  {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/protocols/api/src/main/java/org/apache/james/protocols/api/Encryption.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/Encryption.java b/protocols/api/src/main/java/org/apache/james/protocols/api/Encryption.java
index 588c974..0955670 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/Encryption.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/Encryption.java
@@ -37,10 +37,6 @@ public final class Encryption {
         this.enabledCipherSuites = enabledCipherSuites;
     }
 
-    /**
-     * 
-     * @see #createStartTls(SSLContext, String[])
-     */
     public static Encryption createTls(SSLContext context) {
         return createTls(context, null);
     }
@@ -58,10 +54,6 @@ public final class Encryption {
         return new Encryption(context, false, enabledCipherSuites);
     }
 
-    /**
-     * 
-     * @see #createStartTls(SSLContext, String[])
-     */
     public static Encryption createStartTls(SSLContext context) {
         return createStartTls(context, null);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/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 6b01e5e..6fe802a 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
@@ -66,10 +66,6 @@ public class ProtocolHandlerChainImpl extends AbstractProtocolHandlerChain imple
         return ImmutableList.copyOf(handlers);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.List#size()
-     */
     @Override
     public int size() {
         return handlers.size();
@@ -214,64 +210,36 @@ public class ProtocolHandlerChainImpl extends AbstractProtocolHandlerChain imple
             this.handlers = handlers;
         }
 
-        /*
-         * (non-Javadoc)
-         * @see java.util.ListIterator#hasNext()
-         */
         @Override
         public boolean hasNext() {
             return handlers.hasNext();
         }
 
-        /*
-         * (non-Javadoc)
-         * @see java.util.ListIterator#next()
-         */
         @Override
         public ProtocolHandler next() {
             return (ProtocolHandler) handlers.next();
         }
 
-        /*
-         * (non-Javadoc)
-         * @see java.util.ListIterator#hasPrevious()
-         */
         @Override
         public boolean hasPrevious() {
             return handlers.hasPrevious();
         }
 
-        /*
-         * (non-Javadoc)
-         * @see java.util.ListIterator#previous()
-         */
         @Override
         public ProtocolHandler previous() {
             return handlers.previous();
         }
 
-        /*
-         * (non-Javadoc)
-         * @see java.util.ListIterator#nextIndex()
-         */
         @Override
         public int nextIndex() {
             return handlers.nextIndex();
         }
 
-        /*
-         * (non-Javadoc)
-         * @see java.util.ListIterator#previousIndex()
-         */
         @Override
         public int previousIndex() {
             return handlers.previousIndex();
         }
 
-        /*
-         * (non-Javadoc)
-         * @see java.util.ListIterator#remove()
-         */
         @Override
         public void remove() {
             checkReadOnly();
@@ -279,10 +247,6 @@ public class ProtocolHandlerChainImpl extends AbstractProtocolHandlerChain imple
             handlers.previousIndex();
         }
 
-        /*
-         * (non-Javadoc)
-         * @see java.util.ListIterator#set(java.lang.Object)
-         */
         @Override
         public void set(ProtocolHandler e) {
             checkReadOnly();
@@ -290,10 +254,6 @@ public class ProtocolHandlerChainImpl extends AbstractProtocolHandlerChain imple
             handlers.set(e);
         }
 
-        /*
-         * (non-Javadoc)
-         * @see java.util.ListIterator#add(java.lang.Object)
-         */
         @Override
         public void add(ProtocolHandler e) {
             checkReadOnly();

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/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 0b313f5..69f6d86 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
@@ -88,9 +88,7 @@ public final class IdRange implements Iterable<Long>, Comparable<IdRange> {
         return lowVal <= value && value <= highVal;
     }
 
-    /**
-     * @see java.lang.Object#hashCode()
-     */
+    @Override
     public int hashCode() {
         final int PRIME = 31;
         int result = 1;
@@ -99,9 +97,7 @@ public final class IdRange implements Iterable<Long>, Comparable<IdRange> {
         return result;
     }
 
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/DayMonthYear.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/DayMonthYear.java b/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/DayMonthYear.java
index f53c086..55bbcd3 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/DayMonthYear.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/DayMonthYear.java
@@ -88,9 +88,7 @@ public class DayMonthYear {
         return day + "-" + month + "-" + year;
     }
 
-    /**
-     * @see java.lang.Object#hashCode()
-     */
+    @Override
     public int hashCode() {
         final int PRIME = 31;
         int result = 1;
@@ -100,9 +98,7 @@ public class DayMonthYear {
         return result;
     }
 
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/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 2e4fc37..1724e73 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
@@ -142,10 +142,6 @@ public class SearchCommandParser extends AbstractUidCommandParser {
             // Just consume the [<entry-name> <entry-type-req>] and ignore it
             // See RFC4551 3.4. MODSEQ Search Criterion in SEARCH
             request.consumeQuoted();
-            /*
-             * (non-Javadoc)
-             * @see org.apache.james.imap.decode.ImapRequestLineReader.CharacterValidator#isValid(char)
-             */
             request.consumeWord(chr -> true);
             return SearchKey.buildModSeq(request.number());
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/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 dd5a4f0..09f05a4 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
@@ -41,15 +41,6 @@ public class ACLResponseEncoder extends AbstractChainedImapEncoder {
         super(next);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @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 ACLResponse aclResponse = (ACLResponse) acceptableMessage;

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/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 0198181..da0474a 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
@@ -37,8 +37,6 @@ public abstract class AbstractImapRequest implements ImapRequest {
 
     /**
      * Gets the IMAP command whose execution is requested by the client.
-     * 
-     * @see org.apache.james.imap.api.message.request.ImapRequest#getCommand()
      */
     @Override
     public final ImapCommand getCommand() {
@@ -47,8 +45,6 @@ public abstract class AbstractImapRequest implements ImapRequest {
 
     /**
      * Gets the prefix tag identifying this request.
-     * 
-     * @see org.apache.james.imap.api.message.request.ImapRequest#getTag()
      */
     @Override
     public final String getTag() {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/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 5ab2d7d..fcfbe29 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
@@ -27,8 +27,6 @@ import com.google.common.base.MoreObjects;
 
 /**
  * Immutable status response. Suitable for unpooled usage.
- * 
- * @see StatusResponse
  */
 public class ImmutableStatusResponse implements StatusResponse {
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/protocols/imap/src/main/java/org/apache/james/imap/message/response/SearchResponse.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/response/SearchResponse.java b/protocols/imap/src/main/java/org/apache/james/imap/message/response/SearchResponse.java
index c8c9398..b2443b3 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/response/SearchResponse.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/response/SearchResponse.java
@@ -60,20 +60,13 @@ public class SearchResponse implements ImapResponseMessage {
     public final Long getHighestModSeq() {
         return highestModSeq;
     }
-    
 
-    /**
-     * @see java.lang.Object#hashCode()
-     */
-    // @Override
+    @Override
     public int hashCode() {
         return ids.length;
     }
 
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    // @Override
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/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 f5a4c9d..56e5a06 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
@@ -101,12 +101,6 @@ public class IdleProcessor extends AbstractMailboxProcessor<IdleRequest> impleme
             final AtomicBoolean idleActive = new AtomicBoolean(true);
             
             session.pushLineHandler(new ImapLineHandler() {
-
-                /**
-                 * @see
-                 * 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;
@@ -174,10 +168,6 @@ 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;

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java
index e8ff860..29905c0 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java
@@ -106,9 +106,6 @@ final class PartialFetchBodyElement implements BodyElement {
             }
         }
 
-        /**
-         * @see java.io.FilterInputStream#read()
-         */
         @Override
         public int read() throws IOException {
             checkOffset();
@@ -119,17 +116,11 @@ final class PartialFetchBodyElement implements BodyElement {
             return super.read();
         }
 
-        /**
-         * @see java.io.FilterInputStream#read(byte[])
-         */
         @Override
         public int read(byte[] b) throws IOException {
             return read(b, 0, b.length);
         }
 
-        /**
-         * @see java.io.FilterInputStream#read(byte[], int, int)
-         */
         @Override
         public int read(byte[] b, int off, int len) throws IOException {
             checkOffset();
@@ -150,17 +141,11 @@ final class PartialFetchBodyElement implements BodyElement {
 
         }
 
-        /**
-         * Throws {@link IOException}
-         */
         @Override
         public long skip(long n) throws IOException {
             throw new IOException("Not implemented");
         }
 
-        /**
-         * @see java.io.FilterInputStream#available()
-         */
         @Override
         public int available() throws IOException {
             // Correctly calculate in available bytes.

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java b/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java
index 8093f78..45afc5c 100644
--- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java
+++ b/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java
@@ -57,10 +57,6 @@ public class IMAPCommandDispatcher extends CommandDispatcher<IMAPSession> {
 
                 }
 
-                /*
-                 * (non-Javadoc)
-                 * @see org.apache.james.protocols.api.handler.MultiLineHandler#isReady(org.apache.james.protocols.api.ProtocolSession, java.nio.ByteBuffer)
-                 */
                 @Override
                 protected boolean isReady(IMAPSession session, ByteBuffer line) {
                     long bytesRead = (Long) session.setAttachment(BYTES_READ, null, State.Transaction);

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
index 7a377a3..67d7414 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
@@ -67,26 +67,16 @@ public class LSubProcessorTest {
 
     private static final String TAG = "TAG";
     public static final MailboxSession.User USER = new MailboxSession.User() {
-
-        /**
-         * @see MailboxSession.User#getLocalePreferences()
-         */
         @Override
         public List<Locale> getLocalePreferences() {
             return new ArrayList<>();
         }
 
-        /**
-         * @see MailboxSession.User#getPassword()
-         */
         @Override
         public String getPassword() {
             return "test";
         }
 
-        /**
-         * @see MailboxSession.User#getUserName()
-         */
         @Override
         public String getUserName() {
             return "test";

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java
----------------------------------------------------------------------
diff --git a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java
index ee05ced..2667642 100644
--- a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java
+++ b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java
@@ -317,11 +317,7 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest {
         public MessageHookAdapter(MessageHook hook) {
             this.hook = hook;
         }
-        
-        /*
-         * (non-Javadoc)
-         * @see org.apache.james.protocols.lmtp.hook.DeliverToRecipientHook#deliver(org.apache.james.protocols.smtp.SMTPSession, org.apache.james.protocols.smtp.MailAddress, org.apache.james.protocols.smtp.MailEnvelope)
-         */
+
         @Override
         public HookResult deliver(SMTPSession session, MailAddress recipient, MailEnvelope envelope) {
             if (result == null) {
@@ -344,11 +340,7 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest {
     private final class TestDeliverHook implements DeliverToRecipientHook {
         
         private final List<MailEnvelope> delivered = new ArrayList<>();
-        
-        /*
-         * (non-Javadoc)
-         * @see org.apache.james.protocols.lmtp.hook.DeliverToRecipientHook#deliver(org.apache.james.protocols.smtp.SMTPSession, org.apache.james.protocols.smtp.MailAddress, org.apache.james.protocols.smtp.MailEnvelope)
-         */
+
         @Override
         public HookResult deliver(SMTPSession session, MailAddress recipient, MailEnvelope envelope) {
             if (RCPT1.equals(recipient.toString())) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
index 9e6d96c..e7063f2 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
@@ -129,28 +129,16 @@ public abstract class AbstractHookableCmdHandler<HookT extends org.apache.james.
                     if ((hRes.getResult() & HookReturnCode.DISCONNECT) == HookReturnCode.DISCONNECT) {
                         return new Response() {
 
-                            /*
-                             * (non-Javadoc)
-                             * @see org.apache.james.protocols.api.Response#isEndSession()
-                             */
                             @Override
                             public boolean isEndSession() {
                                 return true;
                             }
 
-                            /*
-                             * (non-Javadoc)
-                             * @see org.apache.james.protocols.api.Response#getRetCode()
-                             */
                             @Override
                             public String getRetCode() {
                                 return response.getRetCode();
                             }
 
-                            /*
-                             * (non-Javadoc)
-                             * @see org.apache.james.protocols.api.Response#getLines()
-                             */
                             @Override
                             public List<CharSequence> getLines() {
                                 return response.getLines();

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
index 081acd2..d16639c 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
@@ -94,12 +94,7 @@ public class DataCmdHandler implements CommandHandler<SMTPSession>, ExtensibleHa
             this.filter = filter;
             this.next = next;
         }
-        
 
-        /*
-         * (non-Javadoc)
-         * @see org.apache.james.protocols.api.handler.LineHandler#onLine(org.apache.james.protocols.api.ProtocolSession, java.nio.ByteBuffer)
-         */
         @Override
         public Response onLine(SMTPSession session, ByteBuffer line) {
             line.rewind();

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java
index 321d65c..81851c1 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java
@@ -57,10 +57,6 @@ public class MaxUnknownCmdHandlerTest {
                 }
             }
 
-            /*
-             * (non-Javadoc)
-             * @see org.apache.james.protocols.api.ProtocolSession#getAttachment(java.lang.String, org.apache.james.protocols.api.ProtocolSession.State)
-             */
             @Override
             public Object getAttachment(String key, State state) {
                 if (state == State.Connection) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
index d633bf8..4e21a21 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
@@ -75,10 +75,6 @@ public class ResolvableEhloHeloHandlerTest {
                 return map;
             }
 
-            /*
-             * (non-Javadoc)
-             * @see org.apache.james.protocols.api.ProtocolSession#setAttachment(java.lang.String, java.lang.Object, org.apache.james.protocols.api.ProtocolSession.State)
-             */
             @Override
             public Object setAttachment(String key, Object value, State state) {
                 if (state == State.Connection) {
@@ -96,10 +92,6 @@ public class ResolvableEhloHeloHandlerTest {
                 }
             }
 
-            /*
-             * (non-Javadoc)
-             * @see org.apache.james.protocols.api.ProtocolSession#getAttachment(java.lang.String, org.apache.james.protocols.api.ProtocolSession.State)
-             */
             @Override
             public Object getAttachment(String key, State state) {
                 if (state == State.Connection) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
index b1dd3b5..bebe107 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
@@ -89,10 +89,6 @@ public class ValidSenderDomainHandlerTest {
                 }
             }
 
-            /*
-             * (non-Javadoc)
-             * @see org.apache.james.protocols.api.ProtocolSession#getAttachment(java.lang.String, org.apache.james.protocols.api.ProtocolSession.State)
-             */
             @Override
             public Object getAttachment(String key, State state) {
                 if (state == State.Connection) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/container/core/src/main/java/org/apache/james/server/core/MailHeaders.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MailHeaders.java b/server/container/core/src/main/java/org/apache/james/server/core/MailHeaders.java
index 296042c..7847bcd 100644
--- a/server/container/core/src/main/java/org/apache/james/server/core/MailHeaders.java
+++ b/server/container/core/src/main/java/org/apache/james/server/core/MailHeaders.java
@@ -105,9 +105,6 @@ public class MailHeaders extends InternetHeaders implements Serializable, Clonea
      * If the new header is a Return-Path we get sure that we add it to the top
      * Javamail, at least until 1.4.0 does the wrong thing if it loaded a stream
      * with a return-path in the middle.
-     * 
-     * @see javax.mail.internet.InternetHeaders#addHeader(java.lang.String,
-     *      java.lang.String)
      */
     @Override
     public synchronized void addHeader(String arg0, String arg1) {
@@ -123,9 +120,6 @@ public class MailHeaders extends InternetHeaders implements Serializable, Clonea
      * If the new header is a Return-Path we get sure that we add it to the top
      * Javamail, at least until 1.4.0 does the wrong thing if it loaded a stream
      * with a return-path in the middle.
-     * 
-     * @see javax.mail.internet.InternetHeaders#setHeader(java.lang.String,
-     *      java.lang.String)
      */
     @Override
     public synchronized void setHeader(String arg0, String arg1) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java
index dd81722..4cbc9ad 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java
@@ -38,10 +38,6 @@ import com.google.common.collect.ImmutableSet;
  * It will register it with the alias mailboxmanager
  */
 public class MailboxConfigurationBeanFactoryPostProcessor implements BeanFactoryPostProcessor {
-    /**
-     * @see org.springframework.beans.factory.config.BeanFactoryPostProcessor#postProcessBeanFactory
-     * (org.springframework.beans.factory.config.ConfigurableListableBeanFactory)
-     */
 
     private static final String JPA_MAILBOXMANAGER = "jpa-mailboxmanager";
     private static final String MEMORY_MAILBOX_MANAGER = "memory-mailboxManager";

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java
index 0e26e36..20b6d65 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java
@@ -72,8 +72,6 @@ public class ConfigurationProviderImpl implements ConfigurationProvider, Resourc
     /**
      * Responsible to register additional configurations for the injected
      * configurationMappings.
-     * 
-     * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
      */
     @Override
     public void afterPropertiesSet() throws Exception {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/container/spring/src/main/java/org/apache/james/container/spring/resource/DefaultJamesResourceLoader.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/resource/DefaultJamesResourceLoader.java b/server/container/spring/src/main/java/org/apache/james/container/spring/resource/DefaultJamesResourceLoader.java
index e86a5fd..cec07a6 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/resource/DefaultJamesResourceLoader.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/resource/DefaultJamesResourceLoader.java
@@ -43,8 +43,6 @@ public class DefaultJamesResourceLoader extends DefaultResourceLoader implements
     /**
      * Return the {@link Resource} for the given url. If the resource can not be
      * found null get returned
-     * 
-     * @see org.springframework.core.io.ResourceLoader#getResource(java.lang.String)
      */
     @Override
     public Resource getResource(String fileURL) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java
index e3e5476..37fc065 100644
--- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java
+++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java
@@ -276,9 +276,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#list(javax.naming.Name)
-     */
     @SuppressWarnings("unchecked")
     @Override
     public NamingEnumeration<NameClassPair> list(final Name name) throws NamingException {
@@ -292,9 +289,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#list(java.lang.String)
-     */
     @SuppressWarnings("unchecked")
     @Override
     public NamingEnumeration<NameClassPair> list(final String name) throws NamingException {
@@ -308,9 +302,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#listBindings(javax.naming.Name)
-     */
     @SuppressWarnings("unchecked")
     @Override
     public NamingEnumeration<Binding> listBindings(final Name name) throws NamingException {
@@ -324,9 +315,6 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy
         }.perform();
     }
 
-    /**
-     * @see javax.naming.Context#listBindings(java.lang.String)
-     */
     @SuppressWarnings("unchecked")
     @Override
     public NamingEnumeration<Binding> listBindings(final String name) throws NamingException {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/container/util/src/main/java/org/apache/james/util/retry/naming/directory/RetryingDirContext.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/directory/RetryingDirContext.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/directory/RetryingDirContext.java
index 32c0004..d630a8c 100644
--- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/directory/RetryingDirContext.java
+++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/directory/RetryingDirContext.java
@@ -284,10 +284,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#search(javax.naming.Name,
-     *      javax.naming.directory.Attributes)
-     */
     @SuppressWarnings("unchecked")
     @Override
     public NamingEnumeration<SearchResult> search(final Name name,
@@ -303,10 +299,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#search(java.lang.String,
-     *      javax.naming.directory.Attributes)
-     */
     @SuppressWarnings("unchecked")
     @Override
     public NamingEnumeration<SearchResult> search(final String name,
@@ -322,10 +314,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#search(javax.naming.Name,
-     *      javax.naming.directory.Attributes, java.lang.String[])
-     */
     @SuppressWarnings("unchecked")
     @Override
     public NamingEnumeration<SearchResult> search(final Name name,
@@ -341,10 +329,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#search(java.lang.String,
-     *      javax.naming.directory.Attributes, java.lang.String[])
-     */
     @SuppressWarnings("unchecked")
     @Override
     public NamingEnumeration<SearchResult> search(final String name,
@@ -361,10 +345,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#search(javax.naming.Name,
-     *      java.lang.String, javax.naming.directory.SearchControls)
-     */
     @SuppressWarnings("unchecked")
     @Override
     public NamingEnumeration<SearchResult> search(final Name name, final String filter,
@@ -380,10 +360,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#search(java.lang.String,
-     *      java.lang.String, javax.naming.directory.SearchControls)
-     */
     @SuppressWarnings("unchecked")
     @Override
     public NamingEnumeration<SearchResult> search(final String name, final String filter,
@@ -399,11 +375,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#search(javax.naming.Name,
-     *      java.lang.String, java.lang.Object[],
-     *      javax.naming.directory.SearchControls)
-     */
     @SuppressWarnings("unchecked")
     @Override
     public NamingEnumeration<SearchResult> search(final Name name, final String filterExpr,
@@ -418,11 +389,6 @@ public abstract class RetryingDirContext extends RetryingContext implements DirC
         }.perform();
     }
 
-    /**
-     * @see javax.naming.directory.DirContext#search(java.lang.String,
-     *      java.lang.String, java.lang.Object[],
-     *      javax.naming.directory.SearchControls)
-     */
     @SuppressWarnings("unchecked")
     @Override
     public NamingEnumeration<SearchResult> search(final String name, final String filterExpr,

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java
index 54984aa..400cad5 100644
--- a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java
+++ b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java
@@ -171,10 +171,8 @@ public class SieveFileRepository implements SieveRepository {
     /**
      * The default quota, if any, is stored in file '.quota' in the sieve root directory. Quotas for
      * specific users are stored in file '.quota' in the user's directory.
-     * <p/>
-     * <p>The '.quota' file contains a single positive integer value representing the quota in octets.
      *
-     * @see SieveRepository#haveSpace(java.lang.String, java.lang.String, long)
+     * The '.quota' file contains a single positive integer value representing the quota in octets.
      */
     @Override
     public void haveSpace(String user, String name, long size) throws QuotaExceededException, StorageException {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/data/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java b/server/data/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java
index 4099a3e..4647a76 100644
--- a/server/data/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java
+++ b/server/data/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java
@@ -47,9 +47,6 @@ public class HBaseUsersRepositoryTest extends AbstractUsersRepositoryTest {
         TablePool.getInstance(cluster.getConf());
     }
 
-    /**
-     * @see org.apache.james.user.lib.AbstractUsersRepositoryTest#setUp()
-     */
     @Before
     @Override
     public void setUp() throws Exception {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
index 9ce7211..dae0b7b 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
@@ -757,9 +757,7 @@ public class JDBCMailRepository extends AbstractMailRepository {
         return datasource.getConnection();
     }
 
-    /**
-     * @see java.lang.Object#equals(Object)
-     */
+    @Override
     public boolean equals(Object obj) {
         if (!(obj instanceof JDBCMailRepository)) {
             return false;
@@ -770,11 +768,7 @@ public class JDBCMailRepository extends AbstractMailRepository {
         return ((repository.tableName.equals(tableName)) || ((repository.tableName != null) && repository.tableName.equals(tableName))) && ((repository.repositoryName.equals(repositoryName)) || ((repository.repositoryName != null) && repository.repositoryName.equals(repositoryName)));
     }
 
-    /**
-     * Provide a hash code that is consistent with equals for this class
-     * 
-     * @return the hash code
-     */
+    @Override
     public int hashCode() {
         int result = 17;
         if (tableName != null) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
index fdba5f1..b4fb725 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
@@ -196,9 +196,6 @@ final class MessageInputStream extends InputStream {
                 throw (IOException) caughtException;
             } else {
                 throw new IOException("Exception caugth in worker thread " + caughtException.getMessage()) {
-                    /**
-                     * @see java.lang.Throwable#getCause()
-                     */
                     @Override
                     public Throwable getCause() {
                         return caughtException;

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java
index 8f64a80..953ebe2 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java
@@ -117,8 +117,6 @@ public class MimeMessageJDBCSource extends MimeMessageSource {
      * This should be smart enough to work even if the file does not exist. This
      * is to support a repository with the entire message in the database, which
      * is how James 1.2 worked.
-     * 
-     * @see org.apache.james.server.core.MimeMessageSource#getInputStream()
      */
     @Override
     public synchronized InputStream getInputStream() throws IOException {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java b/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java
index fcf2132..6549074 100644
--- a/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java
+++ b/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java
@@ -45,10 +45,6 @@ public class JDBCRecipientRewriteTableTest extends AbstractRecipientRewriteTable
         super.tearDown();
     }
 
-
-    /**
-     * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest#getRecipientRewriteTable()
-     */
     @SuppressWarnings("deprecation")
     @Override
     protected AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
index c104024..e448492 100644
--- a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
+++ b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
@@ -210,9 +210,6 @@ public abstract class AbstractDomainList implements DomainList, Configurable {
             .distinct();
     }
 
-    /**
-     * @see #getDomainsIP(List, DNSService, Logger)
-     */
     private static Stream<String> getDomainIpStream(String domain, DNSService dns, Logger log) {
         try {
             return dns.getAllByName(domain).stream()

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java b/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java
index b00bcac..bc9b813 100644
--- a/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java
@@ -120,9 +120,6 @@ public abstract class AbstractMailRepository implements MailRepository, Configur
         }
     }
 
-    /**
-     * @see #store(Mail)
-     */
     protected abstract void internalStore(Mail mc) throws MessagingException, IOException;
 
     @Override
@@ -151,9 +148,6 @@ public abstract class AbstractMailRepository implements MailRepository, Configur
         }
     }
 
-    /**
-     * @see #remove(String)
-     */
     protected abstract void internalRemove(String key) throws MessagingException;
 
     @Override

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
index f9b6a0b..4100533 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
@@ -202,8 +202,6 @@ public class JamesMailSpooler implements Runnable, Disposable, Configurable, Mai
      * <p/>
      * This implementation shuts down the LinearProcessors managed by this
      * JamesSpoolManager
-     *
-     * @see org.apache.james.lifecycle.api.Disposable#dispose()
      */
     @PreDestroy
     @Override

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java
index ffaf1f6..10e52ea 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java
@@ -67,8 +67,6 @@ public class ToSenderFolder extends GenericMailet {
 
     /**
      * Delivers a mail to a local mailbox in a given folder.
-     * 
-     * @see org.apache.mailet.base.GenericMailet#service(org.apache.mailet.Mail)
      */
     @Override
     public void service(Mail mail) throws MessagingException {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
index 6ec17af..82b236d 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
@@ -314,9 +314,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
         fieldMailetContext = mailetContext;
     }
     
-    /**
-     * @see java.lang.Object#toString()
-     */
+    @Override
     public String toString() {
         String messageID = null;
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
index 5cd5279..82d8dd7 100644
--- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
+++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
@@ -112,16 +112,12 @@ public class FetchMail implements Runnable, Configurable {
             setSequenceNumber(sequenceNumber);
         }
 
-        /**
-         * @see java.lang.Object#equals(Object)
-         */
+        @Override
         public boolean equals(Object obj) {
             return null != obj && obj.getClass() == getClass() && (getUserName().equals(((DynamicAccountKey) obj).getUserName()) && getSequenceNumber() == ((DynamicAccountKey) obj).getSequenceNumber());
         }
 
-        /**
-         * @see java.lang.Object#hashCode()
-         */
+        @Override
         public int hashCode() {
             return getUserName().hashCode() ^ getSequenceNumber();
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
index 89f3f1a..68b259d 100644
--- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
+++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
@@ -85,26 +85,16 @@ public class LMTPServer extends AbstractProtocolAsyncServer implements LMTPServe
      */
     public class LMTPConfigurationImpl extends LMTPConfiguration {
 
-        /**
-         * @see org.apache.james.protocols.smtp.SMTPConfiguration#getHelloName()
-         */
         @Override
         public String getHelloName() {
             return LMTPServer.this.getHelloName();
         }
 
-      
-
-        /**
-         * @see org.apache.james.protocols.smtp.SMTPConfiguration#getMaxMessageSize()
-         */
         @Override
         public long getMaxMessageSize() {
             return LMTPServer.this.maxMessageSize;
         }
 
-        /**
-         */
         public String getSMTPGreeting() {
             return LMTPServer.this.lmtpGreeting;
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
index 1fd96a9..1356272 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
@@ -65,9 +65,6 @@ public class SetMimeHeaderHandler implements JamesMessageHook, ProtocolHandler {
 
     /**
      * Adds header to the message
-     * 
-     * @see org.apache.james.smtpserver.JamesMessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession,
-     *      org.apache.mailet.Mail)
      */
     @Override
     public HookResult onMessage(SMTPSession session, Mail mail) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
index e36f562..26eae88 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
@@ -181,129 +181,81 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
             this.serviceLog = FALLBACK_LOG;
         }
 
-        /**
-         * @see org.apache.james.jspf.core.Logger#debug(String)
-         */
         @Override
         public void debug(String message) {
             serviceLog.debug(message);
         }
 
-        /**
-         * @see org.apache.james.jspf.core.Logger#debug(String, Throwable)
-         */
         @Override
         public void debug(String message, Throwable t) {
             serviceLog.debug(message, t);
         }
 
-        /**
-         * @see org.apache.james.jspf.core.Logger#error(String)
-         */
         @Override
         public void error(String message) {
             serviceLog.error(message);
         }
 
-        /**
-         * @see org.apache.james.jspf.core.Logger#error(String, Throwable)
-         */
         @Override
         public void error(String message, Throwable t) {
             serviceLog.error(message, t);
         }
 
-        /**
-         * @see org.apache.james.jspf.core.Logger#fatalError(String)
-         */
         @Override
         public void fatalError(String message) {
             serviceLog.error(message);
         }
 
-        /**
-         * @see org.apache.james.jspf.core.Logger#fatalError(String, Throwable)
-         */
         @Override
         public void fatalError(String message, Throwable t) {
             serviceLog.error(message, t);
         }
 
-        /**
-         * @see org.apache.james.jspf.core.Logger#info(String)
-         */
         @Override
         public void info(String message) {
             serviceLog.info(message);
         }
 
-        /**
-         * @see org.apache.james.jspf.core.Logger#info(String, Throwable)
-         */
         @Override
         public void info(String message, Throwable t) {
             serviceLog.info(message, t);
         }
 
-        /**
-         * @see org.apache.james.jspf.core.Logger#isDebugEnabled()
-         */
         @Override
         public boolean isDebugEnabled() {
             return serviceLog.isDebugEnabled();
         }
 
-        /**
-         * @see org.apache.james.jspf.core.Logger#isErrorEnabled()
-         */
         @Override
         public boolean isErrorEnabled() {
             return serviceLog.isErrorEnabled();
         }
 
-        /**
-         * @see org.apache.james.jspf.core.Logger#isFatalErrorEnabled()
-         */
         @Override
         public boolean isFatalErrorEnabled() {
             return serviceLog.isErrorEnabled();
         }
 
-        /**
-         * @see org.apache.james.jspf.core.Logger#isInfoEnabled()
-         */
         @Override
         public boolean isInfoEnabled() {
             return serviceLog.isInfoEnabled();
         }
 
-        /**
-         * @see org.apache.james.jspf.core.Logger#isWarnEnabled()
-         */
         @Override
         public boolean isWarnEnabled() {
             return serviceLog.isWarnEnabled();
         }
 
-        /**
-         * @see org.apache.james.jspf.core.Logger#warn(String)
-         */
         @Override
         public void warn(String message) {
             serviceLog.warn(message);
         }
 
-        /**
-         * @see org.apache.james.jspf.core.Logger#warn(String, Throwable)
-         */
         @Override
         public void warn(String message, Throwable t) {
             serviceLog.warn(message, t);
         }
 
-        /**
-         * @see org.apache.james.jspf.core.Logger#getChildLogger(String)
-         */
         @Override
         public org.apache.james.jspf.core.Logger getChildLogger(String name) {
             return this;

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
index c35e778..632f574 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
@@ -212,25 +212,16 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe
      */
     public class SMTPHandlerConfigurationDataImpl implements SMTPConfiguration {
 
-        /**
-         * @see org.apache.james.protocols.smtp.SMTPConfiguration#getHelloName()
-         */
         @Override
         public String getHelloName() {
             return SMTPServer.this.getHelloName();
         }
 
-        /**
-         * @see org.apache.james.protocols.smtp.SMTPConfiguration#getMaxMessageSize()
-         */
         @Override
         public long getMaxMessageSize() {
             return SMTPServer.this.maxMessageSize;
         }
 
-        /**
-         * @see org.apache.james.protocols.smtp.SMTPConfiguration#isRelayingAllowed(String)
-         */
         @Override
         public boolean isRelayingAllowed(String remoteIP) {
             boolean relayingAllowed = false;
@@ -240,31 +231,20 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe
             return relayingAllowed;
         }
 
-        /**
-         * @see org.apache.james.protocols.smtp.SMTPConfiguration#useHeloEhloEnforcement()
-         */
         @Override
         public boolean useHeloEhloEnforcement() {
             return SMTPServer.this.heloEhloEnforcement;
         }
 
-        /**
-         */
         public String getSMTPGreeting() {
             return SMTPServer.this.smtpGreeting;
         }
 
-        /**
-         * @see org.apache.james.protocols.smtp.SMTPConfiguration#useAddressBracketsEnforcement()
-         */
         @Override
         public boolean useAddressBracketsEnforcement() {
             return SMTPServer.this.addressBracketsEnforcement;
         }
 
-        /**
-         * @see org.apache.james.protocols.smtp.SMTPConfiguration#isAuthRequired(java.lang.String)
-         */
         @Override
         public boolean isAuthRequired(String remoteIP) {
             if (SMTPServer.this.authRequired == AUTH_ANNOUNCE) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/ddc04847/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java b/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
index 461d450..4b2e462 100644
--- a/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
+++ b/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
@@ -425,8 +425,6 @@ public class FileMailQueue implements ManageableMailQueue {
 
     /**
      * TODO: implement me
-     *
-     * @see ManageableMailQueue#remove(org.apache.james.queue.api.ManageableMailQueue.Type, String)
      */
     @Override
     public long remove(Type type, String value) throws MailQueueException {


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


[19/22] james-project git commit: JAMES-2352 Re-indent NamingExceptionRetryHandlerTest

Posted by ma...@apache.org.
JAMES-2352 Re-indent NamingExceptionRetryHandlerTest


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ff4d0b05
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ff4d0b05
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ff4d0b05

Branch: refs/heads/master
Commit: ff4d0b0534c3a635c4bafa100784c908faae2c19
Parents: f209526
Author: benwa <bt...@linagora.com>
Authored: Thu Mar 15 09:43:47 2018 +0700
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Fri Mar 16 11:12:50 2018 +0100

----------------------------------------------------------------------
 .../naming/NamingExceptionRetryHandlerTest.java | 95 ++++++++++----------
 1 file changed, 46 insertions(+), 49 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/ff4d0b05/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java b/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
index fe1b1e1..4b96735 100644
--- a/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
+++ b/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
@@ -40,39 +40,36 @@ public class NamingExceptionRetryHandlerTest {
     private ExceptionRetryingProxy proxy = null;
     private RetrySchedule schedule = null;
 
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
     @Before
     public void setUp() throws Exception {
-    exceptionClasses = new Class<?>[]{NamingException.class};
-    proxy = new TestRetryingProxy();
-    schedule = new TestRetrySchedule();
+        exceptionClasses = new Class<?>[]{NamingException.class};
+        proxy = new TestRetryingProxy();
+        schedule = new TestRetrySchedule();
     }
 
     private class TestRetryingProxy implements ExceptionRetryingProxy {
 
-    @Override
-    public Context getDelegate() {
-        return null;
-    }
+        @Override
+        public Context getDelegate() {
+            return null;
+        }
 
-    @Override
-    public Context newDelegate() throws NamingException {
-        return null;
-    }
+        @Override
+        public Context newDelegate() {
+            return null;
+        }
 
-    @Override
-    public void resetDelegate() throws NamingException {
-    }
+        @Override
+        public void resetDelegate() {
+        }
     }
 
     private class TestRetrySchedule implements RetrySchedule {
 
-    @Override
-    public long getInterval(int index) {
-        return index;
-    }
+        @Override
+        public long getInterval(int index) {
+            return index;
+        }
     }
 
     /**
@@ -80,44 +77,44 @@ public class NamingExceptionRetryHandlerTest {
      */
     @Test
     public final void testExceptionRetryHandler() {
-    assertTrue(RetryHandler.class.isAssignableFrom(new NamingExceptionRetryHandler(
-        exceptionClasses, proxy, schedule, 0) {
+        assertTrue(RetryHandler.class.isAssignableFrom(new NamingExceptionRetryHandler(
+            exceptionClasses, proxy, schedule, 0) {
 
-        @Override
-        public Object operation() throws Exception {
-        return null;
-        }
-    }.getClass()));
+            @Override
+            public Object operation() {
+                return null;
+            }
+        }.getClass()));
     }
 
     /**
      * Test method for .
-     * @throws Exception 
+     * @throws Exception
      */
     @Test
     public final void testPerform() throws NamingException {
-    Object result = new NamingExceptionRetryHandler(
-        exceptionClasses, proxy, schedule, 0) {
-
-        @Override
-        public Object operation() throws NamingException {
-        return "Hi!";
-        }
-    }.perform();
-    assertEquals("Hi!", result);
-
-    try {
-        new NamingExceptionRetryHandler(
+        Object result = new NamingExceptionRetryHandler(
             exceptionClasses, proxy, schedule, 0) {
 
-        @Override
-        public Object operation() throws Exception {
-            throw new NamingException();
-        }
+            @Override
+            public Object operation() {
+                return "Hi!";
+            }
         }.perform();
-    } catch (NamingException ex) {
-        // no-op
-    }
-    assertEquals("Hi!", result);
+        assertEquals("Hi!", result);
+
+        try {
+            new NamingExceptionRetryHandler(
+                exceptionClasses, proxy, schedule, 0) {
+
+                @Override
+                public Object operation() throws Exception {
+                    throw new NamingException();
+                }
+            }.perform();
+        } catch (NamingException ex) {
+            // no-op
+        }
+        assertEquals("Hi!", result);
     }
 }


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


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

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java
index 02e2ca5..46763a9 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java
@@ -30,10 +30,7 @@ import org.apache.mailet.base.GenericRecipientMatcher;
  */
 public class HostIsLocal extends GenericRecipientMatcher {
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.mailet.base.GenericRecipientMatcher#matchRecipient(org.apache.mailet.MailAddress)
-     */
+    @Override
     public boolean matchRecipient(MailAddress recipient) {
         return getMailetContext().isLocalServer(recipient.getDomain());
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java
index a4ee697..56cdd0c 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java
@@ -33,6 +33,7 @@ import org.apache.mailet.base.GenericMatcher;
  */
 public class IsSingleRecipient extends GenericMatcher {
 
+    @Override
     public Collection<MailAddress> match(Mail mail) {
         if (mail.getRecipients().size() == 1) {
             return mail.getRecipients();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java
index 7290bce..3ecba10 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java
@@ -93,6 +93,7 @@ public class NESSpamCheck extends GenericRegexMatcher {
     {"X-pmrqc", ".*"},
     {"Host-From:envonly", ".*"}};
 
+    @Override
     public void init() throws MessagingException {
         //No condition passed... just compile a bunch of regular expressions
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIs.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIs.java
index db64b76..5d53105 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIs.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIs.java
@@ -45,6 +45,7 @@ public class RecipientIs extends GenericRecipientMatcher {
 
     private Collection<MailAddress> recipients;
 
+    @Override
     public void init() throws javax.mail.MessagingException {
         if (Strings.isNullOrEmpty(getCondition())) {
             throw new MessagingException("RecipientIs should have a condition  composed of a list of mail addresses");
@@ -55,6 +56,7 @@ public class RecipientIs extends GenericRecipientMatcher {
         }
     }
 
+    @Override
     public boolean matchRecipient(MailAddress recipient) {
         return recipients.contains(recipient);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java
index f9f8bc8..e21b056 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java
@@ -31,6 +31,7 @@ import org.apache.mailet.base.GenericRecipientMatcher;
  */
 public class RecipientIsLocal extends GenericRecipientMatcher {
 
+    @Override
     public boolean matchRecipient(MailAddress recipient) {
         MailetContext mailetContext = getMailetContext();
         //This might change after startup

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java
index 900405f..dc31a94 100755
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java
@@ -48,6 +48,7 @@ import com.google.common.base.Strings;
 public class RecipientIsRegex extends GenericRecipientMatcher {
     Pattern pattern   = null;
 
+    @Override
     public void init() throws javax.mail.MessagingException {
         String patternString = getCondition();
         if (Strings.isNullOrEmpty(patternString)) {
@@ -62,6 +63,7 @@ public class RecipientIsRegex extends GenericRecipientMatcher {
         }
     }
 
+    @Override
     public boolean matchRecipient(MailAddress recipient) {
         String myRecipient = recipient.toString();
         return pattern.matcher(myRecipient).matches();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/RelayLimit.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RelayLimit.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RelayLimit.java
index 9bbade4..04a2385 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RelayLimit.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RelayLimit.java
@@ -42,10 +42,12 @@ import org.apache.mailet.base.RFC2822Headers;
 public class RelayLimit extends GenericMatcher {
     int limit = 30;
 
+    @Override
     public void init() throws MessagingException {
         limit = MailetUtil.getInitParameterAsStrictlyPositiveInteger(getCondition());
     }
 
+    @Override
     public Collection<MailAddress> match(Mail mail) throws javax.mail.MessagingException {
         MimeMessage mm = mail.getMessage();
         int count = 0;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java
index 70cb9d4..2ef9a43 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java
@@ -45,6 +45,7 @@ public class SMTPAuthSuccessful extends GenericMatcher {
      * The mail attribute holding the SMTP AUTH user name, if any.
      */
 
+    @Override
     public Collection<MailAddress> match(Mail mail) {
         String authUser = (String) mail.getAttribute(Mail.SMTP_AUTH_USER_ATTRIBUTE_NAME);
         if (authUser != null) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java
index eab66ed..3e2284b 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java
@@ -46,6 +46,7 @@ public class SMTPAuthUserIs extends GenericMatcher {
      */
     private Collection<String> users;
 
+    @Override
     public void init() throws javax.mail.MessagingException {
         StringTokenizer st = new StringTokenizer(getCondition(), ", \t", false);
         users = new java.util.HashSet<>();
@@ -54,6 +55,7 @@ public class SMTPAuthUserIs extends GenericMatcher {
         }
     }
 
+    @Override
     public Collection<MailAddress> match(Mail mail) {
         String authUser = (String) mail.getAttribute(Mail.SMTP_AUTH_USER_ATTRIBUTE_NAME);
         if (authUser != null && users.contains(authUser)) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java
index 9773993..e50b076 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java
@@ -44,6 +44,7 @@ public class SMTPIsAuthNetwork extends GenericMatcher {
      */
     public static final String SMTP_AUTH_NETWORK_NAME = "org.apache.james.SMTPIsAuthNetwork";
 
+    @Override
     public Collection<MailAddress> match(Mail mail) {
         String relayingAllowed = (String) mail
                 .getAttribute(SMTP_AUTH_NETWORK_NAME);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java
index 5eb70e3..3fcfb26 100755
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java
@@ -52,6 +52,7 @@ public class SenderHostIs extends GenericMatcher {
 
     private Collection<String> senderHosts;
     
+    @Override
     public void init()  {
         String condition = getCondition();
         Preconditions.checkNotNull(condition, "'condition' should not be null");
@@ -74,6 +75,7 @@ public class SenderHostIs extends GenericMatcher {
      *
      * @param mail the mail being processed
      */
+    @Override
     public Collection<MailAddress> match(Mail mail) {
         try {
             if (mail.getSender() != null && senderHosts.contains(mail.getSender().getDomain().toLowerCase(Locale.US))) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java
index a3ed557..7102211 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java
@@ -38,6 +38,7 @@ import org.apache.mailet.base.GenericMatcher;
  * <br>
  */
 public class SenderHostIsLocal extends GenericMatcher {
+    @Override
     public Collection<MailAddress> match(Mail mail) {
         if (mail.getSender() != null && isLocalServer(mail)) {
             return mail.getRecipients();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIs.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIs.java
index fef0665..9a70406 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIs.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIs.java
@@ -53,6 +53,7 @@ public class SenderIs extends GenericMatcher {
         return senders;
     }
 
+    @Override
     public void init() throws javax.mail.MessagingException {
         if (Strings.isNullOrEmpty(getCondition())) {
             throw new MessagingException("SenderIs should have at least one address as parameter");
@@ -63,6 +64,7 @@ public class SenderIs extends GenericMatcher {
         }
     }
 
+    @Override
     public Collection<MailAddress> match(Mail mail) {
         if (senders.contains(mail.getSender())) {
             return mail.getRecipients();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsLocal.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsLocal.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsLocal.java
index 105b251..241dd7c 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsLocal.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsLocal.java
@@ -31,6 +31,7 @@ import org.apache.mailet.base.GenericMatcher;
  */
 public class SenderIsLocal extends GenericMatcher {
 
+    @Override
     public final Collection<MailAddress> match(Mail mail) throws MessagingException {
         if (isLocal(mail.getSender())) {
             return mail.getRecipients();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java
index d9c4ae6..9dda490 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java
@@ -36,6 +36,7 @@ import org.apache.mailet.base.GenericMatcher;
  */
 public class SenderIsNull extends GenericMatcher {
 
+    @Override
     public Collection<MailAddress> match(Mail mail) {
         if (mail.getSender() == null) {
             return mail.getRecipients();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java
index cfd39f6..dcb43d9 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java
@@ -57,6 +57,7 @@ public class SenderIsRegex extends GenericMatcher {
 
     private Pattern pattern;
 
+    @Override
     public void init() throws MessagingException {
         String patternString = getCondition();
         if (Strings.isNullOrEmpty(patternString)) {
@@ -71,6 +72,7 @@ public class SenderIsRegex extends GenericMatcher {
         }
     }
 
+    @Override
     public Collection<MailAddress> match(Mail mail) {
         MailAddress mailAddress = mail.getSender();
         if (mailAddress == null) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SentByMailet.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SentByMailet.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SentByMailet.java
index 2699fe2..896a27d 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SentByMailet.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SentByMailet.java
@@ -38,6 +38,7 @@ import com.google.common.collect.ImmutableList;
  */
 public class SentByMailet extends GenericMatcher {
 
+    @Override
     public Collection<MailAddress> match(Mail mail) {
         String authUser = (String) mail.getAttribute(Mail.SENT_BY_MAILET);
         if (authUser != null) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java
index ddfc27c..60189b6 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java
@@ -41,10 +41,7 @@ public class SizeGreaterThan extends GenericMatcher {
 
     int cutoff = 0;
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.mailet.base.GenericMatcher#init()
-     */
+    @Override
     public void init() throws MessagingException {
         String amount = getCondition();
         
@@ -71,10 +68,7 @@ public class SizeGreaterThan extends GenericMatcher {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.mailet.base.GenericMatcher#match(org.apache.mailet.Mail)
-     */
+    @Override
     public Collection<MailAddress> match(Mail mail) throws MessagingException {
         if (mail.getMessageSize() > cutoff) {
             return mail.getRecipients();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectIs.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectIs.java
index 874a6bd..610b7e2 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectIs.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectIs.java
@@ -34,6 +34,7 @@ import org.apache.mailet.base.GenericMatcher;
  * @version 1.0.0, 1/5/2000
  */
 public class SubjectIs extends GenericMatcher {
+    @Override
     public Collection<MailAddress> match(Mail mail) throws javax.mail.MessagingException {
         MimeMessage mm = mail.getMessage();
         String subject = mm.getSubject();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java
index eb760d5..1d756a8 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java
@@ -36,6 +36,7 @@ import org.apache.mailet.base.GenericMatcher;
  */
 public class SubjectStartsWith extends GenericMatcher {
 
+    @Override
     public Collection<MailAddress> match(Mail mail) throws MessagingException {
         MimeMessage mm = mail.getMessage();
         String subject = mm.getSubject();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/UserIs.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/UserIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/UserIs.java
index ece24da..f1143bd 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/UserIs.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/UserIs.java
@@ -38,6 +38,7 @@ public class UserIs extends GenericRecipientMatcher {
 
     Set<String> users;
 
+    @Override
     public void init() throws MessagingException {
         if (Strings.isNullOrEmpty(getCondition())) {
             throw new MessagingException("UserIs should have a condition composed of a list of local parts of mail addresses");
@@ -48,6 +49,7 @@ public class UserIs extends GenericRecipientMatcher {
         }
     }
 
+    @Override
     public boolean matchRecipient(MailAddress recipient) {
         return users.contains(recipient.getLocalPart());
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeTest.java
index 5bd2b6a..5d02173 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeTest.java
@@ -28,14 +28,17 @@ public class HasMailAttributeTest extends AbstractHasMailAttributeTest {
         super();
     }
 
+    @Override
     protected GenericMatcher createMatcher() {
         return new HasMailAttribute();
     }
 
+    @Override
     protected String getHasMailAttribute() {
         return MAIL_ATTRIBUTE_NAME;
     }
 
+    @Override
     protected String getMatcherName() {
         return "HasMailAttribute";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java
index 566627e..cfa7b02 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java
@@ -42,15 +42,18 @@ public class HasMailAttributeWithValueRegexTest extends
         this.regex = regex;
     }
 
+    @Override
     protected String getHasMailAttribute() {
         return MAIL_ATTRIBUTE_NAME + ", " + regex;
     }
 
+    @Override
     protected GenericMatcher createMatcher() {
         return new HasMailAttributeWithValueRegex();
     }
 
     // test if the mail attribute was matched
+    @Override
     public void testAttributeIsMatched() throws MessagingException {
         init();
         setRegex(".*");
@@ -102,6 +105,7 @@ public class HasMailAttributeWithValueRegexTest extends
         }
     }
 
+    @Override
     protected String getMatcherName() {
         return "HasMailAttributeWithValueRegex";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java
index f67cc74..1aa1130 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java
@@ -33,10 +33,12 @@ public class HasMailAttributeWithValueTest extends AbstractHasMailAttributeTest
         super();
     }
 
+    @Override
     protected String getHasMailAttribute() {
         return MAIL_ATTRIBUTE_NAME + ", " + MAIL_ATTRIBUTE_VALUE;
     }
 
+    @Override
     protected GenericMatcher createMatcher() {
         return new HasMailAttributeWithValue();
     }
@@ -52,6 +54,7 @@ public class HasMailAttributeWithValueTest extends AbstractHasMailAttributeTest
         assertNull(matchedRecipients);
     }
 
+    @Override
     protected String getMatcherName() {
         return "HasMailAttributeWithValue";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java
index 09e2b4e..4e1908d 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java
@@ -30,18 +30,22 @@ import org.apache.mailet.base.GenericMatcher;
 
 public class SMTPAuthUserIsTest extends AbstractHasMailAttributeTest {
 
+    @Override
     protected String getHasMailAttribute() {
         return "test@james.apache.org";
     }
 
+    @Override
     protected GenericMatcher createMatcher() {
         return new SMTPAuthUserIs();
     }
 
+    @Override
     protected String getMatcherName() {
         return "SMTPAuthUserIs";
     }
     
+    @Override
     protected void init() {
         super.init();
         setMailAttributeName(Mail.SMTP_AUTH_USER_ATTRIBUTE_NAME);
@@ -50,6 +54,7 @@ public class SMTPAuthUserIsTest extends AbstractHasMailAttributeTest {
     
     
     // test if the mail attribute was not matched
+    @Override
     public void testAttributeIsNotMatched() throws MessagingException {
         setupAll();
         setMailAttributeValue("notmatched@james.apache.org");

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java
----------------------------------------------------------------------
diff --git a/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java b/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java
index 5c01700..04acf3c 100644
--- a/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java
+++ b/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java
@@ -398,6 +398,7 @@ public class MailProtocolTestTask extends Task implements Monitor {
         } 
     }
 
+    @Override
     public void note(String message) {
         if (quiet) {
             log(message, Project.MSG_DEBUG);
@@ -406,10 +407,12 @@ public class MailProtocolTestTask extends Task implements Monitor {
         }
     }
 
+    @Override
     public void debug(char character) {
         log("'" + character + "'", Project.MSG_DEBUG);
     }
 
+    @Override
     public void debug(String message) {
         log(message, Project.MSG_DEBUG);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestAddUser.java
----------------------------------------------------------------------
diff --git a/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestAddUser.java b/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestAddUser.java
index ba4ee14..7eba9e99 100644
--- a/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestAddUser.java
+++ b/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestAddUser.java
@@ -33,6 +33,7 @@ public class TestAddUser extends TestCase {
     
     MailProtocolTestTask subject;
     
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         fakeServer = new DiscardProtocol();
@@ -46,6 +47,7 @@ public class TestAddUser extends TestCase {
         subject.setProject(new Project());
     }
 
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         fakeServer.stop();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestRunScripts.java
----------------------------------------------------------------------
diff --git a/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestRunScripts.java b/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestRunScripts.java
index c48af1e..5c5e92d 100644
--- a/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestRunScripts.java
+++ b/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestRunScripts.java
@@ -43,6 +43,7 @@ public class TestRunScripts extends TestCase {
     
     MailProtocolTestTask subject;
     
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         fakeServer = new DiscardProtocol();
@@ -59,6 +60,7 @@ public class TestRunScripts extends TestCase {
         subject.setProject(new Project());
     }
 
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         fakeServer.stop();
@@ -66,6 +68,7 @@ public class TestRunScripts extends TestCase {
 
     public void testIgnoreUnsupportedResource() throws Exception {
         final Resource unsupportedResource = new StringResource() {
+            @Override
             public InputStream getInputStream() {
                 throw new UnsupportedOperationException();
             }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/Runner.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/Runner.java b/mpt/core/src/main/java/org/apache/james/mpt/Runner.java
index 3af348e..956fab6 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/Runner.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/Runner.java
@@ -86,6 +86,7 @@ public class Runner {
 
             public ProtocolSession session;
 
+            @Override
             public void doContinue() {
                 if (session != null) {
                     session.doContinue();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java b/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java
index 0464da4..70176ff 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java
@@ -52,6 +52,7 @@ public interface HostSystem extends SessionFactory {
      * @return <code>Session</code>, not null
      * @throws Exception
      */
+    @Override
     Session newSession(Continuation continuation) throws Exception;
 
     void beforeTest() throws Exception;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferInputStream.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferInputStream.java b/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferInputStream.java
index 7848c46..9658888 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferInputStream.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferInputStream.java
@@ -34,6 +34,7 @@ public class ByteBufferInputStream extends InputStream {
 
     private boolean readLast = true;
 
+    @Override
     public int read() throws IOException {
         if (!readLast) {
             readLast = true;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferOutputStream.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferOutputStream.java b/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferOutputStream.java
index 9076a35..f080849 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferOutputStream.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferOutputStream.java
@@ -44,6 +44,7 @@ public class ByteBufferOutputStream extends OutputStream {
         ascii.newEncoder().encode(CharBuffer.wrap(message), buffer, true);
     }
 
+    @Override
     public void write(int b) throws IOException {
         buffer.put((byte) b);
         if (b == '\n' && matchPlus && matchCR && matchLF) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/helper/ScriptBuilder.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/helper/ScriptBuilder.java b/mpt/core/src/main/java/org/apache/james/mpt/helper/ScriptBuilder.java
index fb21446..d08678f 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/helper/ScriptBuilder.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/helper/ScriptBuilder.java
@@ -1485,6 +1485,7 @@ public class ScriptBuilder {
             this.delegate = delegate;
         }
 
+        @Override
         public int read() throws IOException {
             final int result;
             final int next = delegate.read();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java b/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java
index 7a67e7d..ffbbafe 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java
@@ -80,6 +80,7 @@ public class ExternalHostSystem extends ExternalSessionFactory implements ImapHo
         this.userAdder = userAdder;
     }
     
+    @Override
     public boolean addUser(String user, String password) throws Exception {
         if (userAdder == null) {
             monitor.note("Please ensure user '" + user + "' with password '" + password + "' exists.");
@@ -90,6 +91,7 @@ public class ExternalHostSystem extends ExternalSessionFactory implements ImapHo
         return true;
     }
 
+    @Override
     public void createMailbox(MailboxPath mailboxPath) throws Exception {
         throw new NotImplementedException();
     }
@@ -100,9 +102,11 @@ public class ExternalHostSystem extends ExternalSessionFactory implements ImapHo
     public void afterTests() throws Exception {
     }
 
+    @Override
     public void beforeTest() throws Exception {
     }
     
+    @Override
     public void afterTest() throws Exception {
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/monitor/NullMonitor.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/monitor/NullMonitor.java b/mpt/core/src/main/java/org/apache/james/mpt/monitor/NullMonitor.java
index e21b0f7..483b896 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/monitor/NullMonitor.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/monitor/NullMonitor.java
@@ -26,12 +26,15 @@ import org.apache.james.mpt.api.Monitor;
  */
 public class NullMonitor implements Monitor {
 
+    @Override
     public void note(String message) {
     }
 
+    @Override
     public void debug(char character) {
     }
 
+    @Override
     public void debug(String messsage) {
     }
 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/monitor/SystemLoggingMonitor.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/monitor/SystemLoggingMonitor.java b/mpt/core/src/main/java/org/apache/james/mpt/monitor/SystemLoggingMonitor.java
index 41cee05..cc0553b 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/monitor/SystemLoggingMonitor.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/monitor/SystemLoggingMonitor.java
@@ -44,16 +44,19 @@ public final class SystemLoggingMonitor implements Monitor {
         this.verbose = verbose;
     }
 
+    @Override
     public void note(String message) {
         System.out.println(message);
     }
 
+    @Override
     public void debug(char character) {
         if (verbose) {
             System.out.print(character);
         }
     }
 
+    @Override
     public void debug(String message) {
         if (verbose) {
             System.out.println(message);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java b/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java
index 666f784..6788e09 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java
@@ -53,6 +53,7 @@ public class FileProtocolSessionBuilder extends ProtocolSessionBuilder {
      *            The name of the protocol session file.
      * @return The ProtocolSession
      */
+    @Override
     public ProtocolSession buildProtocolSession(String fileName) throws Exception {
         ProtocolSession session = new ProtocolSession();
         addTestFile(fileName, session);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
index 4c80dbc..77f9f86 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
@@ -142,6 +142,7 @@ public class ProtocolSession implements ProtocolInteractor {
     /**
      * adds a new Client request line to the test elements
      */
+    @Override
     public void cl(String clientLine) {
         testElements.add(new ClientRequest(clientLine));
     }
@@ -150,6 +151,7 @@ public class ProtocolSession implements ProtocolInteractor {
      * adds a new Server Response line to the test elements, with the specified
      * location.
      */
+    @Override
     public void sl(String serverLine, String location) {
         testElements.add(new ServerResponse(serverLine, location));
     }
@@ -157,6 +159,7 @@ public class ProtocolSession implements ProtocolInteractor {
     /**
      * adds a new Server Unordered Block to the test elements.
      */
+    @Override
     public void sub(List<String> serverLines, String location) {
         testElements.add(new ServerUnorderedBlockResponse(serverLines, location));
     }
@@ -164,6 +167,7 @@ public class ProtocolSession implements ProtocolInteractor {
     /**
      * adds a new Client request line to the test elements
      */
+    @Override
     public void cl(int sessionNumber, String clientLine) {
         this.maxSessionNumber = Math.max(this.maxSessionNumber, sessionNumber);
         testElements.add(new ClientRequest(sessionNumber, clientLine));
@@ -172,6 +176,7 @@ public class ProtocolSession implements ProtocolInteractor {
     /**
      * Adds a continuation. To allow one thread to be used for testing.
      */
+    @Override
     public void cont(int sessionNumber) throws Exception {
         this.maxSessionNumber = Math.max(this.maxSessionNumber, sessionNumber);
         testElements.add(new ContinuationElement(sessionNumber));
@@ -181,6 +186,7 @@ public class ProtocolSession implements ProtocolInteractor {
      * adds a new Server Response line to the test elements, with the specified
      * location.
      */
+    @Override
     public void sl(int sessionNumber, String serverLine, String location, String lastClientMessage) {
         this.maxSessionNumber = Math.max(this.maxSessionNumber, sessionNumber);
         testElements.add(new ServerResponse(sessionNumber, serverLine, location, lastClientMessage));
@@ -189,6 +195,7 @@ public class ProtocolSession implements ProtocolInteractor {
     /**
      * adds a new Server Unordered Block to the test elements.
      */
+    @Override
     public void sub(int sessionNumber, List<String> serverLines, String location, String lastClientMessage) {
         this.maxSessionNumber = Math.max(this.maxSessionNumber, sessionNumber);
         testElements.add(new ServerUnorderedBlockResponse(sessionNumber, serverLines, location, lastClientMessage));
@@ -249,6 +256,7 @@ public class ProtocolSession implements ProtocolInteractor {
          * 
          * @throws Exception
          */
+        @Override
         public void testProtocol(Session[] sessions, boolean continueAfterFailure) throws Exception {
             if (sessionNumber < 0) {
                 for (Session session : sessions) {
@@ -265,6 +273,7 @@ public class ProtocolSession implements ProtocolInteractor {
             session.writeLine(message);
         }
 
+        @Override
         public boolean isClient() {
             return true;
         }
@@ -329,6 +338,7 @@ public class ProtocolSession implements ProtocolInteractor {
          *             If the actual server response didn't match the regular
          *             expression expected.
          */
+        @Override
         public void testProtocol(Session[] sessions, boolean continueAfterFailure) throws Exception {
             if (sessionNumber < 0) {
                 for (Session session : sessions) {
@@ -379,6 +389,7 @@ public class ProtocolSession implements ProtocolInteractor {
             }
         }
 
+        @Override
         public boolean isClient() {
             return false;
         }
@@ -435,6 +446,7 @@ public class ProtocolSession implements ProtocolInteractor {
          *             If a line is encountered which doesn't match one of the
          *             expected lines.
          */
+        @Override
         protected void checkResponse(Session session, boolean continueAfterFailure) throws Exception {
             List<String> testLines = new ArrayList<>(expectedLines);
             while (testLines.size() > 0) {
@@ -473,6 +485,7 @@ public class ProtocolSession implements ProtocolInteractor {
             this.sessionNumber = Math.max(0, sessionNumber);
         }
 
+        @Override
         public void testProtocol(Session[] sessions, boolean continueAfterFailure) throws Exception {
             Session session = sessions[sessionNumber];
             continuationExpected = true;
@@ -490,6 +503,7 @@ public class ProtocolSession implements ProtocolInteractor {
             }
         }
 
+        @Override
         public boolean isClient() {
             return false;
         }
@@ -511,11 +525,13 @@ public class ProtocolSession implements ProtocolInteractor {
             this.sessionNumber = Math.max(0, sessionNumber);
         }
 
+        @Override
         public void testProtocol(Session[] sessions, boolean continueAfterFailure) throws Exception {
             Session session = sessions[sessionNumber];
             session.restart();
         }
 
+        @Override
         public boolean isClient() {
             return false;
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java b/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java
index 33b5eba..93dc6bb 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java
@@ -51,6 +51,7 @@ public class GenericSimpleScriptedTestProtocol<T extends HostSystem, SelfT exten
             this.password = password;
         }
         
+        @Override
         public void prepare(HostSystem system) throws Exception {
             try {
                 system.addUser(user, password);
@@ -151,6 +152,7 @@ public class GenericSimpleScriptedTestProtocol<T extends HostSystem, SelfT exten
 
             public ProtocolSession session;
 
+            @Override
             public void doContinue() {
                 if (session != null) {
                     session.doContinue();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/script/ImapScriptedTestProtocol.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/script/ImapScriptedTestProtocol.java b/mpt/core/src/main/java/org/apache/james/mpt/script/ImapScriptedTestProtocol.java
index cc32d1b..f968a32 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/script/ImapScriptedTestProtocol.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/script/ImapScriptedTestProtocol.java
@@ -51,6 +51,7 @@ public class ImapScriptedTestProtocol extends GenericSimpleScriptedTestProtocol<
             this.rights = rights;
         }
 
+        @Override
         public void prepare(ImapHostSystem system) throws Exception {
             system.grantRights(mailboxPath, userName, rights);
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java b/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java
index 1f39963..1568ba6 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java
@@ -65,6 +65,7 @@ public final class ExternalSession implements Session {
         this.shabang = shabang;
     }
 
+    @Override
     public String readLine() throws Exception {
         StringBuffer buffer = new StringBuffer();
         readlineInto(buffer);
@@ -138,6 +139,7 @@ public final class ExternalSession implements Session {
         return true;
     }
 
+    @Override
     public void start() throws Exception {
         while (!socket.finishConnect()) {
             monitor.note("connecting...");
@@ -145,15 +147,18 @@ public final class ExternalSession implements Session {
         }
     }
 
+    @Override
     public void restart() throws Exception {
         throw new NotImplementedException("Restart is not implemented for ExternalSession");
     }
 
+    @Override
     public void stop() throws Exception {
         monitor.note("closing");
         socket.close();
     }
 
+    @Override
     public void writeLine(String line) throws Exception {
         monitor.note("-> " + line);
         monitor.debug("[Writing line]");

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSessionFactory.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSessionFactory.java b/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSessionFactory.java
index 51d49a5..f1fbaf0 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSessionFactory.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSessionFactory.java
@@ -52,6 +52,7 @@ public class ExternalSessionFactory implements SessionFactory {
         this.address = address;
     }
     
+    @Override
     public Session newSession(Continuation continuation) throws Exception {
         InetSocketAddress address = getAddress();
         monitor.note("Connecting to " + address.getHostName() + ":" + address.getPort());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java b/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java
index 1630160..5f6eeca 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java
@@ -83,6 +83,7 @@ public class ScriptedUserAdder implements UserAdder {
      * @throws Exception upon failure
      * @throws NullPointerException when script has not been set
      */
+    @Override
     public void addUser(String user, String password) throws Exception {
         final StringReader reader = new StringReader(script);
         addUser(user, password, reader);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java b/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java
index 1d4b3f4..53dfd5d 100644
--- a/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java
+++ b/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java
@@ -134,6 +134,7 @@ public class DiscardProtocol {
     }
     
     private final class SocketMonitor implements Runnable {
+        @Override
         public void run() {
             try {
                 long lastConnection = System.currentTimeMillis();
@@ -209,6 +210,7 @@ public class DiscardProtocol {
             this.socketChannel = socketChannel;
         }
 
+        @Override
         public void run() {
             try {
                 if (socketChannel == null) {
@@ -269,6 +271,7 @@ public class DiscardProtocol {
         /**
          * Blocks until connection is complete (closed)
          */
+        @Override
         public synchronized String complete() throws Exception {
             if (aborted) {
                 throw new Exception("Aborted");

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/test/java/org/apache/james/mpt/TestDiscardProtocol.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/test/java/org/apache/james/mpt/TestDiscardProtocol.java b/mpt/core/src/test/java/org/apache/james/mpt/TestDiscardProtocol.java
index 1bde877..787a426 100644
--- a/mpt/core/src/test/java/org/apache/james/mpt/TestDiscardProtocol.java
+++ b/mpt/core/src/test/java/org/apache/james/mpt/TestDiscardProtocol.java
@@ -33,6 +33,7 @@ public class TestDiscardProtocol extends TestCase {
     private final class InputLater implements Runnable {
         private Exception e;
         
+        @Override
         public void run() {
             try  {
                 Thread.sleep(1000);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/test/java/org/apache/james/mpt/TestScriptedUserAdder.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/test/java/org/apache/james/mpt/TestScriptedUserAdder.java b/mpt/core/src/test/java/org/apache/james/mpt/TestScriptedUserAdder.java
index 940bf35..b3d461d 100644
--- a/mpt/core/src/test/java/org/apache/james/mpt/TestScriptedUserAdder.java
+++ b/mpt/core/src/test/java/org/apache/james/mpt/TestScriptedUserAdder.java
@@ -29,6 +29,7 @@ public class TestScriptedUserAdder extends TestCase {
     
     private DiscardProtocol.Record record;
     
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         protocol = new DiscardProtocol();
@@ -36,6 +37,7 @@ public class TestScriptedUserAdder extends TestCase {
         record = protocol.recordNext();
     }
 
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         protocol.stop();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraQuotaTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraQuotaTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraQuotaTest.java
index 00ba775..5c67d44 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraQuotaTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraQuotaTest.java
@@ -40,6 +40,7 @@ public class CassandraQuotaTest extends QuotaTest {
         return cassandraHostSystemRule.getImapHostSystem();
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         cassandraHostSystemRule.clean();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java
index 21386e7..1d6fe94 100644
--- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java
+++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java
@@ -86,6 +86,7 @@ public abstract class JamesImapHostSystem implements ImapHostSystem, GrantRights
         return true;
     }
 
+    @Override
     public Session newSession(Continuation continuation)
             throws Exception {
         return new Session(continuation);
@@ -93,6 +94,7 @@ public abstract class JamesImapHostSystem implements ImapHostSystem, GrantRights
 
     protected abstract MailboxManager getMailboxManager();
     
+    @Override
     public void createMailbox(MailboxPath mailboxPath) throws Exception {
         MailboxManager mailboxManager = getMailboxManager();
         MailboxSession mailboxSession = mailboxManager.createSystemSession(mailboxPath.getUser());
@@ -102,6 +104,7 @@ public abstract class JamesImapHostSystem implements ImapHostSystem, GrantRights
         mailboxManager.endProcessingRequest(mailboxSession);
     }
 
+    @Override
     public void grantRights(MailboxPath mailboxPath, String userName, MailboxACL.Rfc4314Rights rights) throws Exception {
         MailboxManager mailboxManager = getMailboxManager();
         MailboxSession mailboxSession = mailboxManager.createSystemSession(mailboxPath.getUser());
@@ -134,6 +137,7 @@ public abstract class JamesImapHostSystem implements ImapHostSystem, GrantRights
             session = new FakeImapSession();
         }
 
+        @Override
         public String readLine() throws Exception {
             if (!isReadLast) {
                 handler.handleRequest(in, out, session);
@@ -142,19 +146,23 @@ public abstract class JamesImapHostSystem implements ImapHostSystem, GrantRights
             return out.nextLine();
         }
 
+        @Override
         public void start() throws Exception {
             // Welcome message handled in the server
             out.write("* OK IMAP4rev1 Server ready\r\n");
         }
 
+        @Override
         public void restart() throws Exception {
             session = new FakeImapSession();
         }
 
+        @Override
         public void stop() throws Exception {
             session.deselect();
         }
 
+        @Override
         public void writeLine(String line) throws Exception {
             isReadLast = false;
             in.nextLine(line);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusACLCommands.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusACLCommands.java b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusACLCommands.java
index b00dbda..ae04e46 100644
--- a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusACLCommands.java
+++ b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusACLCommands.java
@@ -33,6 +33,7 @@ public class CyrusACLCommands extends ACLCommands {
     private ImapHostSystem system;
     private GrantRightsOnHost grantRightsOnHost;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new CyrusMailboxTestModule());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusACLIntegration.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusACLIntegration.java b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusACLIntegration.java
index 51f5aa6..84f7367 100644
--- a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusACLIntegration.java
+++ b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusACLIntegration.java
@@ -35,6 +35,7 @@ public class CyrusACLIntegration extends ACLIntegration {
     private GrantRightsOnHost grantRightsOnHost;
     private MailboxMessageAppender mailboxMessageAppender;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new CyrusMailboxTestModule());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/CyrusHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/CyrusHostSystem.java b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/CyrusHostSystem.java
index 8ba0956..220972c 100644
--- a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/CyrusHostSystem.java
+++ b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/CyrusHostSystem.java
@@ -74,11 +74,13 @@ public class CyrusHostSystem extends ExternalHostSystem implements Provider<Cont
         return true;
     }
     
+    @Override
     public void beforeTest() throws Exception {
         container = docker.start();
         addressSupplier = () -> new InetSocketAddress(docker.getHost(container), docker.getIMAPPort(container));
     }
 
+    @Override
     public void afterTest() throws Exception {
         docker.stop(container);
         container = null;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/GrantRightsOnCyrusHost.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/GrantRightsOnCyrusHost.java b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/GrantRightsOnCyrusHost.java
index 59a9460..e49a89b 100644
--- a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/GrantRightsOnCyrusHost.java
+++ b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/GrantRightsOnCyrusHost.java
@@ -36,6 +36,7 @@ public class GrantRightsOnCyrusHost implements GrantRightsOnHost {
         this.system = system;
     }
 
+    @Override
     public void grantRights(MailboxPath mailboxPath, String userName, MailboxACL.Rfc4314Rights rights) throws Exception {
         ProtocolSession protocolSession = system.logAndGetAdminProtocolSession(new ProtocolSession());
         protocolSession.cl(String.format("A1 SETACL %s %s %s",

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/MailboxMessageAppenderOnCyrusHost.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/MailboxMessageAppenderOnCyrusHost.java b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/MailboxMessageAppenderOnCyrusHost.java
index 41d42d7..c541f77 100644
--- a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/MailboxMessageAppenderOnCyrusHost.java
+++ b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/MailboxMessageAppenderOnCyrusHost.java
@@ -35,6 +35,7 @@ public class MailboxMessageAppenderOnCyrusHost implements MailboxMessageAppender
         this.hostSystem = hostSystem;
     }
 
+    @Override
     public void fillMailbox(MailboxPath mailboxPath) {
         String mailboxName = hostSystem.createMailboxStringFromMailboxPath(mailboxPath);
         ProtocolSession protocolSession = hostSystem.logAndGetAdminProtocolSession(new ProtocolSession());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchUidSearchOnIndex.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchUidSearchOnIndex.java b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchUidSearchOnIndex.java
index 186ee31..47b4663 100644
--- a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchUidSearchOnIndex.java
+++ b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchUidSearchOnIndex.java
@@ -29,6 +29,7 @@ public class ElasticSearchUidSearchOnIndex extends UidSearchOnIndex {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new ElasticSearchHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidation.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidation.java b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidation.java
index f223ab7..bb055e3 100644
--- a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidation.java
+++ b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidation.java
@@ -31,6 +31,7 @@ public class JamesDeploymentValidation extends DeploymentValidation {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new ExternalJamesModule());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/ExternalJamesHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/ExternalJamesHostSystem.java b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/ExternalJamesHostSystem.java
index 782629a..38ddd84 100644
--- a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/ExternalJamesHostSystem.java
+++ b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/ExternalJamesHostSystem.java
@@ -64,10 +64,12 @@ public class ExternalJamesHostSystem extends ExternalHostSystem {
         return super.addUser(user, password);
     }
     
+    @Override
     public void beforeTest() throws Exception {
 
     }
 
+    @Override
     public void afterTest() throws Exception {
 
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatePlain.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatePlain.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatePlain.java
index 0882dc5..2c2b724 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatePlain.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatePlain.java
@@ -31,6 +31,7 @@ public class HBaseAuthenticatePlain extends AuthenticatePlain {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatedState.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatedState.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatedState.java
index f8e63fa..d6aed77 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatedState.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatedState.java
@@ -31,6 +31,7 @@ public class HBaseAuthenticatedState extends AuthenticatedState {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseConcurrentSessions.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseConcurrentSessions.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseConcurrentSessions.java
index 206ff86..789e365 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseConcurrentSessions.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseConcurrentSessions.java
@@ -31,6 +31,7 @@ public class HBaseConcurrentSessions extends ConcurrentSessions {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java
index 2d9e2e7..b252eb1 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java
@@ -31,6 +31,7 @@ public class HBaseCondstore extends Condstore {
 
     private JamesImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCopy.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCopy.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCopy.java
index f19afc4..58ea413 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCopy.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCopy.java
@@ -31,6 +31,7 @@ public class HBaseCopy extends Copy {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseEvents.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseEvents.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseEvents.java
index 7e3d113..393459b 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseEvents.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseEvents.java
@@ -31,6 +31,7 @@ public class HBaseEvents extends Events {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseExpunge.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseExpunge.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseExpunge.java
index 46769ca..7bbb394 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseExpunge.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseExpunge.java
@@ -31,6 +31,7 @@ public class HBaseExpunge extends Expunge {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetch.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetch.java
index 02b6b11..74a9984 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetch.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetch.java
@@ -31,6 +31,7 @@ public class HBaseFetch extends Fetch {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodySection.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodySection.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodySection.java
index da4b486..c2669e2 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodySection.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodySection.java
@@ -31,6 +31,7 @@ public class HBaseFetchBodySection extends FetchBodySection {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodyStructure.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodyStructure.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodyStructure.java
index 8385a06..69bc086 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodyStructure.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodyStructure.java
@@ -31,6 +31,7 @@ public class HBaseFetchBodyStructure extends FetchBodyStructure {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchHeaders.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchHeaders.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchHeaders.java
index ba852ff..1945c6a 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchHeaders.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchHeaders.java
@@ -31,6 +31,7 @@ public class HBaseFetchHeaders extends FetchHeaders {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseListing.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseListing.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseListing.java
index 13318d8..f62804c 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseListing.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseListing.java
@@ -31,6 +31,7 @@ public class HBaseListing extends Listing {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxAnnotation.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxAnnotation.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxAnnotation.java
index f6f28e2..02cf0f9 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxAnnotation.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxAnnotation.java
@@ -31,6 +31,7 @@ public class HBaseMailboxAnnotation extends MailboxAnnotation {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxWithLongNameError.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxWithLongNameError.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxWithLongNameError.java
index ddc806e..cf298e4 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxWithLongNameError.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxWithLongNameError.java
@@ -31,6 +31,7 @@ public class HBaseMailboxWithLongNameError extends MailboxWithLongNameError {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMove.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMove.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMove.java
index eee86dc..ed57f4b 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMove.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMove.java
@@ -31,6 +31,7 @@ public class HBaseMove extends Move {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseNonAuthenticatedState.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseNonAuthenticatedState.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseNonAuthenticatedState.java
index ca9e768..04c0bc6 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseNonAuthenticatedState.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseNonAuthenticatedState.java
@@ -31,6 +31,7 @@ public class HBaseNonAuthenticatedState extends NonAuthenticatedState {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBasePartialFetch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBasePartialFetch.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBasePartialFetch.java
index a58a88b..b7138ba 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBasePartialFetch.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBasePartialFetch.java
@@ -31,6 +31,7 @@ public class HBasePartialFetch extends PartialFetch {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseQuotaTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseQuotaTest.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseQuotaTest.java
index ae1b1e7..053fd62 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseQuotaTest.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseQuotaTest.java
@@ -31,6 +31,7 @@ public class HBaseQuotaTest extends QuotaTest {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();
@@ -43,6 +44,7 @@ public class HBaseQuotaTest extends QuotaTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseRename.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseRename.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseRename.java
index 9b58f5a..958a9a1 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseRename.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseRename.java
@@ -31,6 +31,7 @@ public class HBaseRename extends Rename {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSearch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSearch.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSearch.java
index fdec8ca..020e690 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSearch.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSearch.java
@@ -31,6 +31,7 @@ public class HBaseSearch extends Search {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSecurity.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSecurity.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSecurity.java
index d4b3165..5bbb3d8 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSecurity.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSecurity.java
@@ -31,6 +31,7 @@ public class HBaseSecurity extends Security {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelect.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelect.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelect.java
index d747cdc..933da88 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelect.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelect.java
@@ -31,6 +31,7 @@ public class HBaseSelect extends Select {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedInbox.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedInbox.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedInbox.java
index 0ccfff9..15f5035 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedInbox.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedInbox.java
@@ -31,6 +31,7 @@ public class HBaseSelectedInbox extends SelectedInbox {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = HBaseHostSystem.build();


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


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

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerStorageTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerStorageTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerStorageTest.java
index d9d6ddf..976d648 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerStorageTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerStorageTest.java
@@ -25,6 +25,7 @@ import org.junit.Before;
 
 public class InMemoryMessageIdManagerStorageTest extends AbstractMessageIdManagerStorageTest {
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTest.java
index 2422cff..ea5a84e 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTest.java
@@ -25,6 +25,7 @@ import org.junit.Before;
 
 public class InMemoryMessageManagerTest extends AbstractMessageManagerTest {
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerStressTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerStressTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerStressTest.java
index 9212e89..bc0f1e3 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerStressTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerStressTest.java
@@ -26,6 +26,7 @@ import org.junit.Before;
 
 public class MemoryMailboxManagerStressTest extends MailboxManagerStressTest {
     
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerTest.java
index 023c117..cfdfb4a 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerTest.java
@@ -26,6 +26,7 @@ import org.junit.Before;
 
 public class MemoryMailboxManagerTest extends MailboxManagerTest {
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java
index eb981ab..3927b95 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java
@@ -52,6 +52,7 @@ public class InMemoryMailboxManagerAttachmentTest extends AbstractMailboxManager
     private InMemoryMailboxManager parseFailingMailboxManager;
 
 
+    @Override
     @Before
     public void setUp() throws Exception {
         mailboxSessionMapperFactory = new InMemoryMailboxSessionMapperFactory();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageIdMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageIdMapperTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageIdMapperTest.java
index 43a90a0..da85ccc 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageIdMapperTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageIdMapperTest.java
@@ -26,6 +26,7 @@ import org.junit.Before;
 
 public class InMemoryMessageIdMapperTest extends MessageIdMapperTest {
 
+    @Override
     @Before
     public void setUp() throws MailboxException {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAnnotationMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAnnotationMapperTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAnnotationMapperTest.java
index 1ed19c4..1e3c04e 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAnnotationMapperTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAnnotationMapperTest.java
@@ -25,6 +25,7 @@ import org.junit.Before;
 
 public class MemoryAnnotationMapperTest extends AnnotationMapperTest {
     
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAttachmentMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAttachmentMapperTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAttachmentMapperTest.java
index 00e6ae1..650d758 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAttachmentMapperTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAttachmentMapperTest.java
@@ -28,6 +28,7 @@ import org.junit.Before;
 
 public class MemoryAttachmentMapperTest extends AttachmentMapperTest {
     
+    @Override
     @Before
     public void setUp() throws MailboxException {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMailboxMapperAclTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMailboxMapperAclTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMailboxMapperAclTest.java
index fcce880..10b037a 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMailboxMapperAclTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMailboxMapperAclTest.java
@@ -25,6 +25,7 @@ import org.junit.Before;
 
 public class MemoryMailboxMapperAclTest extends MailboxMapperACLTest {
     
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMailboxMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMailboxMapperTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMailboxMapperTest.java
index 188b927..32dc85a 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMailboxMapperTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMailboxMapperTest.java
@@ -25,6 +25,7 @@ import org.junit.Before;
 
 public class MemoryMailboxMapperTest extends MailboxMapperTest {
     
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageMapperTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageMapperTest.java
index fef061d..b259fd3 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageMapperTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageMapperTest.java
@@ -25,6 +25,7 @@ import org.junit.Before;
 
 public class MemoryMessageMapperTest extends MessageMapperTest {
     
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageMoveTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageMoveTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageMoveTest.java
index 4d848c3..a906c22 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageMoveTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageMoveTest.java
@@ -25,6 +25,7 @@ import org.junit.Before;
 
 public class MemoryMessageMoveTest extends MessageMoveTest {
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageWithAttachmentMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageWithAttachmentMapperTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageWithAttachmentMapperTest.java
index 525aa75..32f77f3 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageWithAttachmentMapperTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageWithAttachmentMapperTest.java
@@ -25,6 +25,7 @@ import org.junit.Before;
 
 public class MemoryMessageWithAttachmentMapperTest extends MessageWithAttachmentMapperTest {
     
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/quota/InMemoryPerUserMaxQuotaManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/quota/InMemoryPerUserMaxQuotaManagerTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/quota/InMemoryPerUserMaxQuotaManagerTest.java
index 071171d..51edc31 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/quota/InMemoryPerUserMaxQuotaManagerTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/quota/InMemoryPerUserMaxQuotaManagerTest.java
@@ -24,6 +24,7 @@ import org.apache.james.mailbox.store.quota.GenericMaxQuotaManagerTest;
 
 public class InMemoryPerUserMaxQuotaManagerTest extends GenericMaxQuotaManagerTest {
 
+    @Override
     protected MaxQuotaManager provideMaxQuotaManager() {
         return new InMemoryPerUserMaxQuotaManager();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java
index 33120c8..d58fdfc 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java
@@ -25,6 +25,7 @@ public class FakeAuthenticator implements Authenticator {
 
     private final Map<String, String> users = new HashMap<>();
 
+    @Override
     public boolean isAuthentic(String userid, CharSequence passwd) {
         String pass = users.get(userid);
         if (pass != null) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/ImmutableMailboxMessage.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ImmutableMailboxMessage.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ImmutableMailboxMessage.java
index 7b1dc51..957ce3b 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ImmutableMailboxMessage.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ImmutableMailboxMessage.java
@@ -155,30 +155,37 @@ public class ImmutableMailboxMessage implements MailboxMessage {
             .build();
     }
 
+    @Override
     public MessageId getMessageId() {
         return messageId;
     }
 
+    @Override
     public Date getInternalDate() {
         return internalDate;
     }
 
+    @Override
     public InputStream getBodyContent() {
         return bodyContent;
     }
 
+    @Override
     public String getMediaType() {
         return mediaType;
     }
 
+    @Override
     public String getSubType() {
         return subType;
     }
 
+    @Override
     public long getBodyOctets() {
         return bodyOctets;
     }
 
+    @Override
     public long getFullContentOctets() {
         return fullContentOctets;
     }
@@ -188,58 +195,72 @@ public class ImmutableMailboxMessage implements MailboxMessage {
         return headerOctets;
     }
 
+    @Override
     public Long getTextualLineCount() {
         return textualLineCount;
     }
 
+    @Override
     public InputStream getHeaderContent() {
         return headerContent;
     }
 
+    @Override
     public InputStream getFullContent() {
         return fullContent;
     }
 
+    @Override
     public List<Property> getProperties() {
         return properties;
     }
 
+    @Override
     public List<MessageAttachment> getAttachments() {
         return attachments;
     }
 
+    @Override
     public MailboxId getMailboxId() {
         return mailboxId;
     }
 
+    @Override
     public MessageUid getUid() {
         return uid;
     }
 
+    @Override
     public long getModSeq() {
         return modSeq;
     }
 
+    @Override
     public boolean isAnswered() {
         return answered;
     }
 
+    @Override
     public boolean isDeleted() {
         return deleted;
     }
 
+    @Override
     public boolean isDraft() {
         return draft;
     }
 
+    @Override
     public boolean isFlagged() {
         return flagged;
     }
 
+    @Override
     public boolean isRecent() {
         return recent;
     }
 
+    @Override
     public boolean isSeen() {
         return seen;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/LazyMimeDescriptor.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/LazyMimeDescriptor.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/LazyMimeDescriptor.java
index 6305c9b..2eaea0a 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/LazyMimeDescriptor.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/LazyMimeDescriptor.java
@@ -142,9 +142,6 @@ public class LazyMimeDescriptor implements MimeDescriptor {
         return Collections.EMPTY_LIST.iterator();
     }
 
-    /**
-     * Return null
-     */
     @Override
     public MimeDescriptor embeddedMessage() {
         return null;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java
index bfdc15f..f8ef502 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java
@@ -47,9 +47,7 @@ public abstract class MailboxSessionMapperFactory implements RequestAware, Mailb
     protected static final String ANNOTATIONMAPPER = "ANNOTATIONMAPPER";
     
     
-    /**
-     * @see org.apache.james.mailbox.store.mail.MessageMapperFactory#getMessageMapper(MailboxSession)
-     */
+    @Override
     public MessageMapper getMessageMapper(MailboxSession session) throws MailboxException {
         MessageMapper mapper = (MessageMapper) session.getAttributes().get(MESSAGEMAPPER);
         if (mapper == null) {
@@ -91,9 +89,7 @@ public abstract class MailboxSessionMapperFactory implements RequestAware, Mailb
 
     public abstract MessageIdMapper createMessageIdMapper(MailboxSession session) throws MailboxException;
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MailboxMapperFactory#getMailboxMapper(MailboxSession)
-     */
+    @Override
     public MailboxMapper getMailboxMapper(MailboxSession session) throws MailboxException {
         MailboxMapper mapper = (MailboxMapper) session.getAttributes().get(MAILBOXMAPPER);
         if (mapper == null) {
@@ -118,6 +114,7 @@ public abstract class MailboxSessionMapperFactory implements RequestAware, Mailb
      * @param session
      * @return mapper
      */
+    @Override
     public SubscriptionMapper getSubscriptionMapper(MailboxSession session) throws SubscriptionException {
         SubscriptionMapper mapper = (SubscriptionMapper) session.getAttributes().get(SUBSCRIPTIONMAPPER);
         if (mapper == null) {
@@ -144,6 +141,7 @@ public abstract class MailboxSessionMapperFactory implements RequestAware, Mailb
      * 
      * @param session
      */
+    @Override
     public void endProcessingRequest(MailboxSession session) {
         if (session == null) {
             return;
@@ -162,10 +160,7 @@ public abstract class MailboxSessionMapperFactory implements RequestAware, Mailb
         }
     }
 
-    /**
-     * Do nothing
-     * 
-     */
+    @Override
     public void startProcessingRequest(MailboxSession session) {
         // Do nothing
         

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
index 2f6c8c8..05b910a 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
@@ -87,16 +87,12 @@ public class MessageResultImpl implements MessageResult {
         return message.getInternalDate();
     }
 
-    /**
-     * @see org.apache.james.mailbox.model.MessageResult#getFlags()
-     */
+    @Override
     public Flags getFlags() {
         return message.createFlags();
     }
 
-    /**
-     * @see org.apache.james.mailbox.model.MessageResult#getSize()
-     */
+    @Override
     public long getSize() {
         return message.getFullContentOctets();
     }
@@ -123,9 +119,7 @@ public class MessageResultImpl implements MessageResult {
         return false;
     }
 
-    /**
-     * @see org.apache.james.mailbox.model.MessageResult#getFullContent()
-     */
+    @Override
     public final Content getFullContent() throws IOException {
         if (fullContent == null) {
             fullContent = new InputStreamContent(message, Type.Full);
@@ -133,9 +127,7 @@ public class MessageResultImpl implements MessageResult {
         return fullContent;
     }
 
-    /**
-     * @see org.apache.james.mailbox.model.MessageResult#getBody()
-     */
+    @Override
     public final Content getBody() throws IOException {
         if (bodyContent == null) {
             bodyContent = new InputStreamContent(message, Type.Body);
@@ -155,10 +147,7 @@ public class MessageResultImpl implements MessageResult {
         return "MessageResultImpl ( " + "uid = " + getUid() + TAB + "flags = " + getFlags() + TAB + "size = " + getSize() + TAB + "internalDate = " + getInternalDate() + ")";
     }
 
-    /**
-     * @see
-     * org.apache.james.mailbox.model.MessageResult#getBody(org.apache.james.mailbox.model.MessageResult.MimePath)
-     */
+    @Override
     public Content getBody(MimePath path) throws MailboxException {
         final Content result;
         final PartContent partContent = getPartContent(path);
@@ -170,10 +159,7 @@ public class MessageResultImpl implements MessageResult {
         return result;
     }
 
-    /**
-     * @see
-     * org.apache.james.mailbox.model.MessageResult#getMimeBody(org.apache.james.mailbox.model.MessageResult.MimePath)
-     */
+    @Override
     public Content getMimeBody(MimePath path) throws MailboxException {
         final Content result;
         final PartContent partContent = getPartContent(path);
@@ -185,10 +171,7 @@ public class MessageResultImpl implements MessageResult {
         return result;
     }
 
-    /**
-     * @see
-     * org.apache.james.mailbox.model.MessageResult#getFullContent(org.apache.james.mailbox.model.MessageResult.MimePath)
-     */
+    @Override
     public Content getFullContent(MimePath path) throws MailboxException {
         final Content result;
         final PartContent partContent = getPartContent(path);
@@ -200,10 +183,7 @@ public class MessageResultImpl implements MessageResult {
         return result;
     }
 
-    /**
-     * @see
-     * org.apache.james.mailbox.model.MessageResult#iterateHeaders(org.apache.james.mailbox.model.MessageResult.MimePath)
-     */
+    @Override
     public Iterator<Header> iterateHeaders(MimePath path) throws MailboxException {
         final Iterator<Header> result;
         final PartContent partContent = getPartContent(path);
@@ -215,10 +195,7 @@ public class MessageResultImpl implements MessageResult {
         return result;
     }
 
-    /**
-     * @see
-     * org.apache.james.mailbox.model.MessageResult#iterateMimeHeaders(org.apache.james.mailbox.model.MessageResult.MimePath)
-     */
+    @Override
     public Iterator<Header> iterateMimeHeaders(MimePath path) throws MailboxException {
         final Iterator<Header> result;
         final PartContent partContent = getPartContent(path);
@@ -323,9 +300,7 @@ public class MessageResultImpl implements MessageResult {
         }
     }
 
-    /**
-     * @see org.apache.james.mailbox.model.MessageResult#getMimeDescriptor()
-     */
+    @Override
     public MimeDescriptor getMimeDescriptor() throws MailboxException {
         
         // check if we need to create the MimeDescriptor which is done in a lazy fashion because
@@ -344,9 +319,7 @@ public class MessageResultImpl implements MessageResult {
         return mimeDescriptor;
     }
 
-    /**
-     * @see org.apache.james.mailbox.model.MessageMetaData#getModSeq()
-     */
+    @Override
     public long getModSeq() {
         return message.getModSeq();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
index 7c643c0..e0a1969 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
@@ -249,46 +249,57 @@ public class MimeDescriptorImpl implements MimeDescriptor {
         this.md5 = md5;
     }
 
+    @Override
     public Map<String, String> contentTypeParameters() {
         return contentTypeParameters;
     }
 
+    @Override
     public MimeDescriptor embeddedMessage() {
         return embeddedMessage;
     }
 
+    @Override
     public long getBodyOctets() {
         return bodyOctets;
     }
 
+    @Override
     public String getContentDescription() {
         return contentDescription;
     }
 
+    @Override
     public String getContentID() {
         return contentId;
     }
 
+    @Override
     public long getLines() {
         return lines;
     }
 
+    @Override
     public String getMimeSubType() {
         return subType;
     }
 
+    @Override
     public String getMimeType() {
         return type;
     }
 
+    @Override
     public String getTransferContentEncoding() {
         return transferEncoding;
     }
 
+    @Override
     public Iterator<MessageResult.Header> headers() {
         return headers.iterator();
     }
 
+    @Override
     public Iterator<MimeDescriptor> parts() {
         return parts.iterator();
     }
@@ -297,22 +308,27 @@ public class MimeDescriptorImpl implements MimeDescriptor {
         parts.add(descriptor);
     }
 
+    @Override
     public List<String> getLanguages() {
         return languages;
     }
 
+    @Override
     public String getDisposition() {
         return disposition;
     }
 
+    @Override
     public Map<String,String> getDispositionParams() {
         return dispositionParams;
     }
 
+    @Override
     public String getContentLocation() {
         return location;
     }
 
+    @Override
     public String getContentMD5() {
         return md5;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
index 1ee1a86..eb0ed8a 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
@@ -43,23 +43,17 @@ public final class ResultHeader implements MessageResult.Header {
         size = name.length() + value.length() + 2;
     }
 
-    /**
-     * @see org.apache.james.mailbox.model.MessageResult.Header#getName()
-     */
+    @Override
     public String getName() {
         return name;
     }
 
-    /**
-     * @see org.apache.james.mailbox.model.MessageResult.Header#getValue()
-     */
+    @Override
     public String getValue() {
         return value;
     }
 
-    /**
-     * @see org.apache.james.mailbox.model.Content#size()
-     */
+    @Override
     public long size() {
         return size;
     }
@@ -68,9 +62,7 @@ public final class ResultHeader implements MessageResult.Header {
         return "[HEADER " + name + ": " + value + "]";
     }
 
-    /**
-     * @see org.apache.james.mailbox.model.InputStreamContent#getInputStream()
-     */
+    @Override
     public InputStream getInputStream() throws IOException {
         return new ByteArrayInputStream((name + ": " + value).getBytes(US_ASCII));
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxMetaData.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxMetaData.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxMetaData.java
index d513b77..d7aefdc 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxMetaData.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxMetaData.java
@@ -58,6 +58,7 @@ public class SimpleMailboxMetaData implements MailboxMetaData, Comparable<Mailbo
      * 
      * @return true if marked, false otherwise
      */
+    @Override
     public final Children inferiors() {
         return inferiors;
     }
@@ -65,20 +66,17 @@ public class SimpleMailboxMetaData implements MailboxMetaData, Comparable<Mailbo
     /**
      * Gets the RFC3501 Selectability flag.
      */
+    @Override
     public final Selectability getSelectability() {
         return selectability;
     }
 
-    /**
-     * @see org.apache.james.mailbox.model.MailboxMetaData#getHierarchyDelimiter()
-     */
+    @Override
     public char getHierarchyDelimiter() {
         return delimiter;
     }
 
-    /**
-     * @see org.apache.james.mailbox.model.MailboxMetaData#getPath()
-     */
+    @Override
     public MailboxPath getPath() {
         return path;
     }
@@ -129,9 +127,7 @@ public class SimpleMailboxMetaData implements MailboxMetaData, Comparable<Mailbo
         return true;
     }
 
-    /**
-     * @see java.lang.Comparable#compareTo(java.lang.Object)
-     */
+    @Override
     public int compareTo(MailboxMetaData o) {
         return StandardMailboxMetaDataComparator.order(this, o);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java
index 4db10ce..e24f6ac 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java
@@ -82,23 +82,17 @@ public class SimpleMailboxSession implements MailboxSession, MailboxSession.User
     }
 
 
-    /**
-     * @see org.apache.james.mailbox.MailboxSession#close()
-     */
+    @Override
     public void close() {
         open = false;
     }
 
-    /**
-     * @see org.apache.james.mailbox.MailboxSession#getSessionId()
-     */
+    @Override
     public long getSessionId() {
         return sessionId;
     }
 
-    /**
-     * @see org.apache.james.mailbox.MailboxSession#isOpen()
-     */
+    @Override
     public boolean isOpen() {
         return open;
     }
@@ -119,6 +113,7 @@ public class SimpleMailboxSession implements MailboxSession, MailboxSession.User
      * Gets the user executing this session.
      * @return not null
      */
+    @Override
     public User getUser() {
         return this;
     }
@@ -128,34 +123,27 @@ public class SimpleMailboxSession implements MailboxSession, MailboxSession.User
      * 
      * @return not null
      */
+    @Override
     public String getUserName() {
         return userName;
     }
 
-    /**
-     * @see org.apache.james.mailbox.MailboxSession#getOtherUsersSpace()
-     */
+    @Override
     public String getOtherUsersSpace() {
         return otherUsersSpace;
     }
 
-    /**
-     * @see org.apache.james.mailbox.MailboxSession#getPersonalSpace()
-     */
+    @Override
     public String getPersonalSpace() {
         return personalSpace;
     }
 
-    /**
-     * @see org.apache.james.mailbox.MailboxSession#getSharedSpaces()
-     */
+    @Override
     public Collection<String> getSharedSpaces() {
         return sharedSpaces;
     }
 
-    /**
-     * @see org.apache.james.mailbox.MailboxSession.User#getLocalePreferences()
-     */
+    @Override
     public List<Locale> getLocalePreferences() {
         return localePreferences;
     }
@@ -163,27 +151,22 @@ public class SimpleMailboxSession implements MailboxSession, MailboxSession.User
     /**
      * @see org.apache.james.mailbox.MailboxSession#getAttributes()
      */
+    @Override
     public Map<Object, Object> getAttributes() {
         return attributes;
     }
 
-    /**
-     * @see org.apache.james.mailbox.MailboxSession.User#getPassword()
-     */
+    @Override
     public String getPassword() {
         return password;
     }
 
-    /**
-     * @see org.apache.james.mailbox.MailboxSession#getPathDelimiter()
-     */
+    @Override
     public char getPathDelimiter() {
         return pathSeparator;
     }
 
-    /**
-     * @see org.apache.james.mailbox.MailboxSession#getType()
-     */
+    @Override
     public SessionType getType() {
         return type;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
index 2e633d6..e49a13a 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
@@ -399,6 +399,7 @@ public class StoreMailboxManager implements MailboxManager {
     /**
      * Close the {@link MailboxSession} if not null
      */
+    @Override
     public void logout(MailboxSession session, boolean force) throws MailboxException {
         if (session != null) {
             session.close();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
index b0fbc18..763f0d5 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
@@ -260,6 +260,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
      * 
      * @return true
      */
+    @Override
     public boolean isModSeqPermanent(MailboxSession session) {
         return true;
     }
@@ -453,11 +454,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
         return new SimpleMailboxMessage(messageIdFactory.generate(), internalDate, size, bodyStartOctet, content, flags, propertyBuilder, getMailboxEntity().getMailboxId(), attachments);
     }
 
-    /**
-     * This mailbox is writable
-     *
-     * @throws MailboxException
-     */
+    @Override
     public boolean isWriteable(MailboxSession session) throws MailboxException {
         return storeRightManager.isReadWrite(session, mailbox, getSharedPermanentFlags(session));
     }
@@ -550,11 +547,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
 
     }
 
-    /**
-     * @see org.apache.james.mailbox.MessageManager#setFlags(javax.mail.Flags,
-     *      boolean, boolean, org.apache.james.mailbox.model.MessageRange,
-     *      org.apache.james.mailbox.MailboxSession)
-     */
+    @Override
     public Map<MessageUid, Flags> setFlags(final Flags flags, final FlagsUpdateMode flagsUpdateMode, final MessageRange set, MailboxSession mailboxSession) throws MailboxException {
 
         if (!isWriteable(mailboxSession)) {
@@ -636,18 +629,12 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
 
     }
 
-    /**
-     * @see org.apache.james.mailbox.MessageManager#getMessageCount(org.apache.james.mailbox.MailboxSession)
-     */
+    @Override
     public long getMessageCount(MailboxSession mailboxSession) throws MailboxException {
         return mapperFactory.getMessageMapper(mailboxSession).countMessagesInMailbox(getMailboxEntity());
     }
 
-    /**
-     * @see org.apache.james.mailbox.MessageManager#getMessages(org.apache.james.mailbox.model.MessageRange,
-     *      org.apache.james.mailbox.model.MessageResult.FetchGroup,
-     *      org.apache.james.mailbox.MailboxSession)
-     */
+    @Override
     public MessageResultIterator getMessages(MessageRange set, FetchGroup fetchGroup, MailboxSession mailboxSession) throws MailboxException {
         final MessageMapper messageMapper = mapperFactory.getMessageMapper(mailboxSession);
         return new StoreMessageResultIterator(messageMapper, mailbox, set, batchSizes, fetchGroup);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageResultIterator.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageResultIterator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageResultIterator.java
index 4af4960..4a6965b 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageResultIterator.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageResultIterator.java
@@ -240,26 +240,32 @@ public class StoreMessageResultIterator implements MessageResultIterator {
             return mailboxId;
         }
 
+        @Override
         public Flags getFlags() {
             return flags;
         }
 
+        @Override
         public Content getFullContent() throws MailboxException {
             throw exception;
         }
 
+        @Override
         public Date getInternalDate() {
             return internalDate;
         }
 
+        @Override
         public Content getBody() throws MailboxException {
             throw exception;
         }
 
+        @Override
         public long getSize() {
             return size;
         }
 
+        @Override
         public MessageUid getUid() {
             return uid;
         }
@@ -269,6 +275,7 @@ public class StoreMessageResultIterator implements MessageResultIterator {
             return messageId;
         }
         
+        @Override
         public int compareTo(MessageResult that) {
             return uid.compareTo(that.getUid());
         }
@@ -291,30 +298,37 @@ public class StoreMessageResultIterator implements MessageResultIterator {
             return false;
         }
 
+        @Override
         public Content getFullContent(MimePath path) throws MailboxException {
             throw exception;
         }
 
+        @Override
         public Iterator<Header> iterateHeaders(MimePath path) throws MailboxException {
             throw exception;
         }
 
+        @Override
         public Iterator<Header> iterateMimeHeaders(MimePath path) throws MailboxException {
             throw exception;
         }
 
+        @Override
         public Content getBody(MimePath path) throws MailboxException {
             throw exception;
         }
 
+        @Override
         public Content getMimeBody(MimePath path) throws MailboxException {
             throw exception;
         }
 
+        @Override
         public MimeDescriptor getMimeDescriptor() throws MailboxException {
             throw exception;
         }
 
+        @Override
         public long getModSeq() {
             return modSeq;
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java
index b804ee3..60afcca 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java
@@ -49,9 +49,7 @@ public class StoreSubscriptionManager implements SubscriptionManager {
         this.mapperFactory = mapperFactory;
     }
 
-    /**
-     * @see org.apache.james.mailbox.SubscriptionManager#subscribe(org.apache.james.mailbox.MailboxSession, java.lang.String)
-     */
+    @Override
     public void subscribe(final MailboxSession session, final String mailbox) throws SubscriptionException {
         final SubscriptionMapper mapper = mapperFactory.getSubscriptionMapper(session);
         try {
@@ -80,9 +78,7 @@ public class StoreSubscriptionManager implements SubscriptionManager {
         return new SimpleSubscription(session.getUser().getUserName(), mailbox);
     }
 
-    /**
-     * @see org.apache.james.mailbox.SubscriptionManager#subscriptions(org.apache.james.mailbox.MailboxSession)
-     */
+    @Override
     public Collection<String> subscriptions(MailboxSession session) throws SubscriptionException {
         return mapperFactory.getSubscriptionMapper(session)
             .findSubscriptionsForUser(session.getUser().getUserName())
@@ -91,9 +87,7 @@ public class StoreSubscriptionManager implements SubscriptionManager {
             .collect(Collectors.toCollection(() -> new HashSet<>(INITIAL_SIZE)));
     }
 
-    /**
-     * @see org.apache.james.mailbox.SubscriptionManager#unsubscribe(org.apache.james.mailbox.MailboxSession, java.lang.String)
-     */
+    @Override
     public void unsubscribe(final MailboxSession session, final String mailbox) throws SubscriptionException {
         final SubscriptionMapper mapper = mapperFactory.getSubscriptionMapper(session);
         try {
@@ -108,18 +102,14 @@ public class StoreSubscriptionManager implements SubscriptionManager {
         }
     }
 
-    /**
-     * @see org.apache.james.mailbox.SubscriptionManager#endProcessingRequest(org.apache.james.mailbox.MailboxSession)
-     */
+    @Override
     public void endProcessingRequest(MailboxSession session) {
         if (mapperFactory instanceof RequestAware) {
             ((RequestAware)mapperFactory).endProcessingRequest(session);
         }
     }
 
-    /**
-     * Do nothing, Sub classes should override this if needed
-     */
+    @Override
     public void startProcessingRequest(MailboxSession session) {
         // Do nothing        
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventFactory.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventFactory.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventFactory.java
index 040219a..aa38509 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventFactory.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventFactory.java
@@ -56,14 +56,17 @@ public class EventFactory {
             this.availableMessages = ImmutableMap.copyOf(availableMessages);
         }
 
+        @Override
         public List<MessageUid> getUids() {
             return ImmutableList.copyOf(added.keySet());
         }
 
+        @Override
         public MessageMetaData getMetaData(MessageUid uid) {
             return added.get(uid);
         }
 
+        @Override
         public Mailbox getMailbox() {
             return mailbox;
         }
@@ -83,14 +86,17 @@ public class EventFactory {
             this.mailbox = mailbox;
         }
 
+        @Override
         public List<MessageUid> getUids() {
             return ImmutableList.copyOf(uids.keySet());
         }
 
+        @Override
         public MessageMetaData getMetaData(MessageUid uid) {
             return uids.get(uid);
         }
 
+        @Override
         public Mailbox getMailbox() {
             return mailbox;
         }
@@ -110,14 +116,17 @@ public class EventFactory {
             this.mailbox = mailbox;
         }
 
+        @Override
         public List<MessageUid> getUids() {
             return uids;
         }
 
+        @Override
         public List<UpdatedFlags> getUpdatedFlags() {
             return uFlags;
         }
 
+        @Override
         public Mailbox getMailbox() {
             return mailbox;
         }
@@ -133,6 +142,7 @@ public class EventFactory {
         }
 
 
+        @Override
         public Mailbox getMailbox() {
             return mailbox;
         }
@@ -149,6 +159,7 @@ public class EventFactory {
         }
 
 
+        @Override
         public Mailbox getMailbox() {
             return mailbox;
         }
@@ -166,6 +177,7 @@ public class EventFactory {
             this.newMailbox = newMailbox;
         }
 
+        @Override
         public MailboxPath getNewPath() {
             return newPath;
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java
index cb2ecb3..375c3c5 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java
@@ -114,6 +114,7 @@ public class BroadcastDelegatingMailboxListener implements DistributedDelegating
         }
     }
 
+    @Override
     public void receiveSerializedEvent(byte[] serializedEvent) {
         try {
             MailboxEvent event = eventSerializer.deSerializeEvent(serializedEvent);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java
index ef3fca6..b129c5a 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java
@@ -117,6 +117,7 @@ public class RegisteredDelegatingMailboxListener implements DistributedDelegatin
         }
     }
 
+    @Override
     public void receiveSerializedEvent(byte[] serializedEvent) {
         try {
             MailboxEvent event = eventSerializer.deSerializeEvent(serializedEvent);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/JacksonEventSerializer.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/JacksonEventSerializer.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/JacksonEventSerializer.java
index 83161b7..82fc394 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/JacksonEventSerializer.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/JacksonEventSerializer.java
@@ -50,10 +50,12 @@ public class JacksonEventSerializer implements EventSerializer {
         this.objectMapper = objectMapper;
     }
 
+    @Override
     public byte[] serializeEvent(MailboxListener.MailboxEvent event) throws Exception {
         return objectMapper.writeValueAsBytes(eventConverter.convertToDataTransferObject(event));
     }
 
+    @Override
     public MailboxListener.MailboxEvent deSerializeEvent(byte[] serializedEvent) throws Exception {
         EventDataTransferObject eventDataTransferObject = objectMapper.readValue(serializedEvent, EventDataTransferObject.class);
         return eventConverter.retrieveEvent(eventDataTransferObject);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java
index 3650f97..85c243b 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java
@@ -58,60 +58,42 @@ public class SimpleMailbox implements Mailbox {
         this.acl = new MailboxACL(mailbox.getACL().getEntries());
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getMailboxId()
-     */
+    @Override
     public MailboxId getMailboxId() {
         return id;
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getNamespace()
-     */
+    @Override
     public String getNamespace() {
         return namespace;
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#setNamespace(java.lang.String)
-     */
+    @Override
     public void setNamespace(String namespace) {
         this.namespace = namespace;
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getUser()
-     */
+    @Override
     public String getUser() {
         return user;
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#setUser(java.lang.String)
-     */
+    @Override
     public void setUser(String user) {
         this.user = user;
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getName()
-     */
+    @Override
     public String getName() {
         return name;
     }
 
-    /**
-     * @see
-     * org.apache.james.mailbox.store.mail.model.Mailbox#setName(java.lang.String
-     * )
-     */
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getUidValidity()
-     */
+    @Override
     public long getUidValidity() {
         return uidValidity;
     }
@@ -132,17 +114,11 @@ public class SimpleMailbox implements Mailbox {
         return false;
     }
 
-    /**
-     * @see java.lang.Object#hashCode()
-     */
     @Override
     public int hashCode() {
         return Objects.hashCode(namespace, user, name);
     }
 
-    /**
-     * @see java.lang.Object#toString()
-     */
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java
index a0311ae..479053d 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java
@@ -235,50 +235,62 @@ public class SimpleMailboxMessage extends DelegatingMailboxMessage {
         return userFlags.clone();
     }
 
+    @Override
     public MailboxId getMailboxId() {
         return mailboxId;
     }
 
+    @Override
     public MessageUid getUid() {
         return uid;
     }
 
+    @Override
     public boolean isAnswered() {
         return answered;
     }
 
+    @Override
     public boolean isDeleted() {
         return deleted;
     }
 
+    @Override
     public boolean isDraft() {
         return draft;
     }
 
+    @Override
     public boolean isFlagged() {
         return flagged;
     }
 
+    @Override
     public boolean isRecent() {
         return recent;
     }
 
+    @Override
     public boolean isSeen() {
         return seen;
     }
 
+    @Override
     public long getModSeq() {
         return modSeq;
     }
 
+    @Override
     public void setModSeq(long modSeq) {
         this.modSeq = modSeq;
     }
 
+    @Override
     public void setUid(MessageUid uid) {
         this.uid = uid;
     }
 
+    @Override
     public synchronized void setFlags(Flags flags) {
         answered = flags.contains(Flags.Flag.ANSWERED);
         deleted = flags.contains(Flags.Flag.DELETED);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java
index f5252f8..c21d5b5 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java
@@ -42,23 +42,17 @@ public final class SimpleProperty implements Property {
         this(property.getNamespace(), property.getLocalName(), property.getValue());
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Property#getLocalName()
-     */
+    @Override
     public String getLocalName() {
         return localName;
     }
     
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Property#getNamespace()
-     */
+    @Override
     public String getNamespace() {
         return namespace;
     }
     
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Property#getValue()
-     */
+    @Override
     public String getValue() {
         return value;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/StoreQuotaManager.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/StoreQuotaManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/StoreQuotaManager.java
index 0799433..b3cf4f0 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/StoreQuotaManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/StoreQuotaManager.java
@@ -45,6 +45,7 @@ public class StoreQuotaManager implements QuotaManager {
         this.maxQuotaManager = maxQuotaManager;
     }
 
+    @Override
     public Quota<QuotaCount> getMessageQuota(QuotaRoot quotaRoot) throws MailboxException {
         return Quota.<QuotaCount>builder()
             .used(currentQuotaManager.getCurrentMessageCount(quotaRoot))
@@ -54,6 +55,7 @@ public class StoreQuotaManager implements QuotaManager {
     }
 
 
+    @Override
     public Quota<QuotaSize> getStorageQuota(QuotaRoot quotaRoot) throws MailboxException {
         return Quota.<QuotaSize>builder()
             .used(currentQuotaManager.getCurrentStorage(quotaRoot))

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/ByteContent.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/ByteContent.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/ByteContent.java
index c00b644..c53c90d 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/ByteContent.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/ByteContent.java
@@ -39,9 +39,7 @@ public final class ByteContent implements Content {
         size = contents.length;
     }
 
-    /**
-     * @see org.apache.james.mailbox.model.Content#size()
-     */
+    @Override
     public long size() {
         return size;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java
index dddd420..9894ae6 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java
@@ -43,9 +43,7 @@ public final class CountingInputStream extends InputStream {
         this.in = in;
     }
 
-    /**
-     * @see java.io.InputStream#read()
-     */
+    @Override
     public int read() throws IOException {
         int next = in.read();
         if (next > 0) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java
index 525f2cd..f286536 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java
@@ -43,9 +43,7 @@ public final class InputStreamContent implements Content {
         this.type = type;
     }
     
-    /**
-     * @see org.apache.james.mailbox.model.Content#size()
-     */
+    @Override
     public long size() {
         switch (type) {
         case Full:
@@ -56,9 +54,7 @@ public final class InputStreamContent implements Content {
         }
     }
 
-    /**
-     * @see org.apache.james.mailbox.model.InputStreamContent#getInputStream()
-     */
+    @Override
     public InputStream getInputStream() throws IOException {
         // wrap the streams in a BoundedInputStream to make sure it really match with the stored size.
         switch (type) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/transaction/NonTransactionalMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/transaction/NonTransactionalMapper.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/transaction/NonTransactionalMapper.java
index 3eb7149..7417ce5 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/transaction/NonTransactionalMapper.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/transaction/NonTransactionalMapper.java
@@ -28,9 +28,7 @@ import org.apache.james.mailbox.exception.MailboxException;
  */
 public abstract class NonTransactionalMapper implements Mapper {
 
-    /**
-     * @see org.apache.james.mailbox.store.transaction.Mapper#execute(org.apache.james.mailbox.store.transaction.Mapper.Transaction)
-     */
+    @Override
     public final <T> T execute(Transaction<T> transaction) throws MailboxException {
         return transaction.run();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java
index a159673..4a01c62 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java
@@ -28,9 +28,7 @@ import org.apache.james.mailbox.exception.MailboxException;
  */
 public abstract class TransactionalMapper implements Mapper {
 
-    /**
-     * @see org.apache.james.mailbox.store.transaction.Mapper#execute(org.apache.james.mailbox.store.transaction.Mapper.Transaction)
-     */
+    @Override
     public final <T> T execute(Transaction<T> transaction) throws MailboxException {
         begin();
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/main/java/org/apache/james/mailbox/store/user/model/impl/SimpleSubscription.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/user/model/impl/SimpleSubscription.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/user/model/impl/SimpleSubscription.java
index 39bf245..7b34615 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/user/model/impl/SimpleSubscription.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/user/model/impl/SimpleSubscription.java
@@ -32,10 +32,12 @@ public class SimpleSubscription implements Subscription {
         this.mailbox = mailbox;
     }
 
+    @Override
     public String getMailbox() {
         return mailbox;
     }
 
+    @Override
     public String getUser() {
         return user;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java
index 3ed5a53..ce5788f 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java
@@ -91,38 +91,47 @@ public class SimpleMailboxMembership implements MailboxMessage {
             .build();
     }
 
+    @Override
     public Date getInternalDate() {
         return internalDate;
     }
 
+    @Override
     public TestId getMailboxId() {
         return mailboxId;
     }
     
+    @Override
     public MessageUid getUid() {
         return uid;
     }
 
+    @Override
     public boolean isAnswered() {
         return answered;
     }
 
+    @Override
     public boolean isDeleted() {
         return deleted;
     }
 
+    @Override
     public boolean isDraft() {
         return draft;
     }
 
+    @Override
     public boolean isFlagged() {
         return flagged;
     }
 
+    @Override
     public boolean isRecent() {
         return recent;
     }
 
+    @Override
     public boolean isSeen() {
         return seen;
     }
@@ -136,6 +145,7 @@ public class SimpleMailboxMembership implements MailboxMessage {
         return size - body.length;
     }
 
+    @Override
     public void setFlags(Flags flags) {
         answered = flags.contains(Flags.Flag.ANSWERED);
         deleted = flags.contains(Flags.Flag.DELETED);
@@ -145,6 +155,7 @@ public class SimpleMailboxMembership implements MailboxMessage {
         seen = flags.contains(Flags.Flag.SEEN);
     }
 
+    @Override
     public Flags createFlags() {
         final Flags flags = new Flags();
 
@@ -214,10 +225,12 @@ public class SimpleMailboxMembership implements MailboxMessage {
     private long modSeq;
     
 
+    @Override
     public InputStream getBodyContent() throws IOException {
         return new ByteArrayInputStream(body);
     }
 
+    @Override
     public InputStream getHeaderContent() throws IOException {
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
         final Writer writer = new OutputStreamWriter(baos, "us-ascii");
@@ -236,18 +249,22 @@ public class SimpleMailboxMembership implements MailboxMessage {
 
     }
 
+    @Override
     public long getBodyOctets() {
         return body.length;
     }
 
+    @Override
     public String getSubType() {
         return subType;
     }
 
+    @Override
     public String getMediaType() {
         return mediaType;
     }
 
+    @Override
     public List<Property> getProperties() {
         if (properties != null) {
             return ImmutableList.<Property>copyOf(properties);
@@ -256,22 +273,27 @@ public class SimpleMailboxMembership implements MailboxMessage {
         }
     }
 
+    @Override
     public Long getTextualLineCount() {
         return textualLineCount;
     }
 
+    @Override
     public long getFullContentOctets() {
         return size;
     }
 
+    @Override
     public int compareTo(MailboxMessage other) {
         return getUid().compareTo(other.getUid());
     }
 
+    @Override
     public long getModSeq() {
         return modSeq;
     }
 
+    @Override
     public void setModSeq(long modSeq) {
         this.modSeq = modSeq;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleProperty.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleProperty.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleProperty.java
index 04b438f..4958d43 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleProperty.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleProperty.java
@@ -36,14 +36,17 @@ public class SimpleProperty implements Property {
         this.value = value;
     }
 
+    @Override
     public String getLocalName() {
         return localName;
     }
 
+    @Override
     public String getNamespace() {
         return namespace;
     }
 
+    @Override
     public String getValue() {
         return value;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerSideEffectTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerSideEffectTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerSideEffectTest.java
index c4d3b9a..1006292 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerSideEffectTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerSideEffectTest.java
@@ -37,6 +37,7 @@ import org.junit.Before;
 
 public class StoreMessageIdManagerSideEffectTest extends AbstractMessageIdManagerSideEffectTest {
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/store/src/test/java/org/apache/james/mailbox/store/StringBuilderChannel.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StringBuilderChannel.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StringBuilderChannel.java
index 3324823..218c00c 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StringBuilderChannel.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StringBuilderChannel.java
@@ -31,16 +31,19 @@ public class StringBuilderChannel implements WritableByteChannel {
     
     public boolean isClosed = false;
     
+    @Override
     public int write(ByteBuffer src) throws IOException {
         final int result = src.limit() - src.position();
         builder.append(ASCII.decode(src));
         return result;
     }
 
+    @Override
     public void close() throws IOException {
         isClosed = true;
     }
 
+    @Override
     public boolean isOpen() {
         return !isClosed;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
index a90e1e1..b49e01b 100644
--- a/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
+++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
@@ -61,9 +61,7 @@ public class MailboxCopierImpl implements MailboxCopier {
         
     };
 
-    /**
-     * @see org.apache.james.mailbox.copier.MailboxCopier#copyMailboxes(org.apache.james.mailbox.MailboxManager, org.apache.james.mailbox.MailboxManager)
-     */
+    @Override
     public void copyMailboxes(MailboxManager srcMailboxManager, MailboxManager dstMailboxManager) throws MailboxException, IOException {
         
         Calendar start = Calendar.getInstance();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java
index 6e03ba7..376a956 100644
--- a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java
+++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java
@@ -75,12 +75,14 @@ public class ReIndexerImpl implements ReIndexer {
         this.mailboxSessionMapperFactory = mailboxSessionMapperFactory;
     }
 
+    @Override
     public void reIndex(MailboxPath path) throws MailboxException {
         MailboxSession mailboxSession = mailboxManager.createSystemSession(path.getUser());
         reIndex(path, mailboxSession);
     }
 
 
+    @Override
     public void reIndex() throws MailboxException {
         MailboxSession mailboxSession = mailboxManager.createSystemSession("re-indexing");
         LOGGER.info("Starting a full reindex");

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP165JpaMigrateCommand.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP165JpaMigrateCommand.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP165JpaMigrateCommand.java
index 02b9588..c17c7ed 100644
--- a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP165JpaMigrateCommand.java
+++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP165JpaMigrateCommand.java
@@ -32,9 +32,7 @@ import org.apache.james.mailbox.jpa.migrator.exception.JpaMigrateException;
  */
 public class IMAP165JpaMigrateCommand implements JpaMigrateCommand {
 
-    /**
-     * @see org.apache.james.mailbox.jpa.migrator.command#migrate(javax.persistence.EntityManager)
-     */
+    @Override
     public void migrate(EntityManager em) throws JpaMigrateException {
         JpaMigrateQuery.executeUpdate(em, "CREATE INDEX I_MMBRSHP_SEEN ON MEMBERSHIP (SEEN)");
         JpaMigrateQuery.executeUpdate(em, "CREATE INDEX I_MMBRSHP_RECENT ON MEMBERSHIP (RECENT)");

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP168JpaMigrateCommand.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP168JpaMigrateCommand.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP168JpaMigrateCommand.java
index 09ef13f..cadfc83 100644
--- a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP168JpaMigrateCommand.java
+++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP168JpaMigrateCommand.java
@@ -47,9 +47,7 @@ import org.apache.james.mailbox.jpa.migrator.exception.JpaMigrateException;
  */
 public class IMAP168JpaMigrateCommand implements JpaMigrateCommand {
 
-    /**
-     * @see org.apache.james.mailbox.jpa.migrator.command#migrate(javax.persistence.EntityManager)
-     */
+    @Override
     public void migrate(EntityManager em) throws JpaMigrateException {
 
         JpaMigrateQuery.executeUpdate(em, "ALTER TABLE MAILBOX ADD COLUMN NAMESPACE VARCHAR(255)");

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP172JpaMigrateCommand.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP172JpaMigrateCommand.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP172JpaMigrateCommand.java
index 60c9e58..f74df60 100644
--- a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP172JpaMigrateCommand.java
+++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP172JpaMigrateCommand.java
@@ -32,9 +32,7 @@ import org.apache.james.mailbox.jpa.migrator.exception.JpaMigrateException;
  */
 public class IMAP172JpaMigrateCommand implements JpaMigrateCommand {
 
-    /**
-     * @see org.apache.james.mailbox.jpa.migrator.command#migrate(javax.persistence.EntityManager)
-     */
+    @Override
     public void migrate(EntityManager em) throws JpaMigrateException {
         JpaMigrateQuery.executeUpdate(em, "ALTER TABLE MAILBOX DROP COLUMN MESSAGECOUNT");
         JpaMigrateQuery.executeUpdate(em, "ALTER TABLE MAILBOX DROP COLUMN SIZE");

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP176JpaMigrateCommand.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP176JpaMigrateCommand.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP176JpaMigrateCommand.java
index d3967de..d919c8f 100644
--- a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP176JpaMigrateCommand.java
+++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP176JpaMigrateCommand.java
@@ -32,9 +32,7 @@ import org.apache.james.mailbox.jpa.migrator.exception.JpaMigrateException;
  */
 public class IMAP176JpaMigrateCommand implements JpaMigrateCommand {
 
-    /**
-     * @see org.apache.james.mailbox.jpa.migrator.command#migrate(javax.persistence.EntityManager)
-     */
+    @Override
     public void migrate(EntityManager em) throws JpaMigrateException {
         JpaMigrateQuery.executeUpdate(em, "UPDATE MAILBOX SET NAMESPACE = '#private'");
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP180JpaMigrateCommand.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP180JpaMigrateCommand.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP180JpaMigrateCommand.java
index b4c5ddd..71d2bb4 100644
--- a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP180JpaMigrateCommand.java
+++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP180JpaMigrateCommand.java
@@ -50,9 +50,7 @@ import org.apache.openjpa.lib.rop.ResultList;
  */
 public class IMAP180JpaMigrateCommand implements JpaMigrateCommand {
 
-    /**
-     * @see org.apache.james.mailbox.jpa.migrator.command#migrate(javax.persistence.EntityManager)
-     */
+    @Override
     public void migrate(EntityManager em) throws JpaMigrateException {
         em.getTransaction().commit();
         migrateHeaders(em);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP184JpaMigrateCommand.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP184JpaMigrateCommand.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP184JpaMigrateCommand.java
index e1e7edd..9904736 100644
--- a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP184JpaMigrateCommand.java
+++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP184JpaMigrateCommand.java
@@ -32,9 +32,7 @@ import org.apache.james.mailbox.jpa.migrator.exception.JpaMigrateException;
  */
 public class IMAP184JpaMigrateCommand implements JpaMigrateCommand {
 
-    /**
-     * @see org.apache.james.mailbox.jpa.migrator.command#migrate(javax.persistence.EntityManager)
-     */
+    @Override
     public void migrate(EntityManager em) throws JpaMigrateException {
         JpaMigrateQuery.executeUpdate(em, "ALTER TABLE MAILBOXMEMBERSHIP DROP COLUMN SIZE");
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java
----------------------------------------------------------------------
diff --git a/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java b/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java
index 085d3cc..c4be663 100644
--- a/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java
+++ b/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java
@@ -149,6 +149,7 @@ public class BayesianAnalysis extends GenericMailet {
      * 
      * @return a string describing this mailet
      */
+    @Override
     public String getMailetInfo() {
         return "BayesianAnalysis Mailet";
     }
@@ -220,6 +221,7 @@ public class BayesianAnalysis extends GenericMailet {
      * @throws MessagingException
      *             if a problem arises
      */
+    @Override
     public void init() throws MessagingException {
         String repositoryPath = getInitParameter("repositoryPath");
 
@@ -279,6 +281,7 @@ public class BayesianAnalysis extends GenericMailet {
      * @throws MessagingException
      *             if a problem arises
      */
+    @Override
     public void service(Mail mail) throws MessagingException {
 
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java
----------------------------------------------------------------------
diff --git a/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java b/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java
index 6cb386b..4ae2539 100644
--- a/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java
+++ b/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java
@@ -149,6 +149,7 @@ public class BayesianAnalysisFeeder extends GenericMailet {
      * 
      * @return a string describing this mailet
      */
+    @Override
     public String getMailetInfo() {
         return "BayesianAnalysisFeeder Mailet";
     }
@@ -197,6 +198,7 @@ public class BayesianAnalysisFeeder extends GenericMailet {
      * @throws MessagingException
      *             if a problem arises
      */
+    @Override
     public void init() throws MessagingException {
         String repositoryPath = getInitParameter("repositoryPath");
 
@@ -238,6 +240,7 @@ public class BayesianAnalysisFeeder extends GenericMailet {
      * @param mail
      *            The Mail message to be scanned.
      */
+    @Override
     public void service(Mail mail) {
         boolean dbUpdated = false;
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/ai/src/main/java/org/apache/james/ai/classic/CorpusLoaderThread.java
----------------------------------------------------------------------
diff --git a/mailet/ai/src/main/java/org/apache/james/ai/classic/CorpusLoaderThread.java b/mailet/ai/src/main/java/org/apache/james/ai/classic/CorpusLoaderThread.java
index 46bcba4..bd332e8 100644
--- a/mailet/ai/src/main/java/org/apache/james/ai/classic/CorpusLoaderThread.java
+++ b/mailet/ai/src/main/java/org/apache/james/ai/classic/CorpusLoaderThread.java
@@ -38,6 +38,7 @@ class CorpusLoaderThread extends Thread {
     /**
      * Thread entry point.
      */
+    @Override
     public void run() {
         LOGGER.info("CorpusLoader thread started: will wake up every " + BayesianAnalysis.CORPUS_RELOAD_INTERVAL + " ms");
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/ai/src/main/java/org/apache/james/ai/classic/TokenProbabilityStrength.java
----------------------------------------------------------------------
diff --git a/mailet/ai/src/main/java/org/apache/james/ai/classic/TokenProbabilityStrength.java b/mailet/ai/src/main/java/org/apache/james/ai/classic/TokenProbabilityStrength.java
index 3256e57..c63fa38 100644
--- a/mailet/ai/src/main/java/org/apache/james/ai/classic/TokenProbabilityStrength.java
+++ b/mailet/ai/src/main/java/org/apache/james/ai/classic/TokenProbabilityStrength.java
@@ -48,6 +48,7 @@ class TokenProbabilityStrength implements Comparable<TokenProbabilityStrength> {
      * 
      * @return The result of the comparison (before, equal, after).
      */
+    @Override
     public final int compareTo(TokenProbabilityStrength anotherTokenProbabilityStrength) {
         int result = (int) ((anotherTokenProbabilityStrength.strength - strength) * 1000000);
         if (result == 0) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/base/src/main/java/org/apache/mailet/base/AutomaticallySentMailDetectorImpl.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/main/java/org/apache/mailet/base/AutomaticallySentMailDetectorImpl.java b/mailet/base/src/main/java/org/apache/mailet/base/AutomaticallySentMailDetectorImpl.java
index 02c2443..eb19122 100644
--- a/mailet/base/src/main/java/org/apache/mailet/base/AutomaticallySentMailDetectorImpl.java
+++ b/mailet/base/src/main/java/org/apache/mailet/base/AutomaticallySentMailDetectorImpl.java
@@ -46,6 +46,7 @@ public class AutomaticallySentMailDetectorImpl implements AutomaticallySentMailD
             "List-Id",
             "List-Archive" };
 
+    @Override
     public boolean isAutomaticallySent(Mail mail) throws MessagingException {
         return mail.getSender() == null ||
             isMailingList(mail) ||
@@ -53,6 +54,7 @@ public class AutomaticallySentMailDetectorImpl implements AutomaticallySentMailD
             isMdnSentAutomatically(mail);
     }
 
+    @Override
     public boolean isMailingList(Mail mail) throws MessagingException {
         return senderIsMailingList(mail)
             || headerIsMailingList(mail);
@@ -78,6 +80,7 @@ public class AutomaticallySentMailDetectorImpl implements AutomaticallySentMailD
             .hasMoreElements();
     }
 
+    @Override
     public boolean isAutoSubmitted(Mail mail) throws MessagingException {
         String[] headers = mail.getMessage().getHeader(AUTO_SUBMITTED_HEADER);
         if (headers != null) {
@@ -87,6 +90,7 @@ public class AutomaticallySentMailDetectorImpl implements AutomaticallySentMailD
         return false;
     }
 
+    @Override
     public boolean isMdnSentAutomatically(Mail mail) throws MessagingException {
         ResultCollector resultCollector = new ResultCollector(false);
         MimeStreamParser parser = new MimeStreamParser(MimeConfig.PERMISSIVE);


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


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

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java
index a9fc452..76e8518 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java
@@ -63,17 +63,12 @@ public final class MailetManagement extends StandardMBean implements MailetManag
         lastProcessing.set(processTime);
     }
 
-    /**
-     * @see
-     * org.apache.james.mailetcontainer.api.jmx.MailetManagementMBean#getMailetName()
-     */
+    @Override
     public String getMailetName() {
         return config.getMailetName();
     }
 
-    /**
-     * @see org.apache.james.mailetcontainer.api.jmx.MailetManagementMBean#getMailetParameters()
-     */
+    @Override
     public String[] getMailetParameters() {
         List<String> parameterList = new ArrayList<>();
         Iterator<String> iterator = config.getInitParameterNames();
@@ -85,46 +80,32 @@ public final class MailetManagement extends StandardMBean implements MailetManag
         return parameterList.toArray(new String[parameterList.size()]);
     }
 
-    /**
-     * @see
-     * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getErrorCount()
-     */
+    @Override
     public long getErrorCount() {
         return errorCount.get();
     }
 
-    /**
-     * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getFastestProcessing()
-     */
+    @Override
     public long getFastestProcessing() {
         return fastestProcessing.get();
     }
 
-    /**
-     * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getHandledMailCount()
-     */
+    @Override
     public long getHandledMailCount() {
         return getErrorCount() + getSuccessCount();
     }
 
-    /**
-     * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getSlowestProcessing()
-     */
+    @Override
     public long getSlowestProcessing() {
         return slowestProcessing.get();
     }
 
-    /**
-     * @see
-     * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getSuccessCount()
-     */
+    @Override
     public long getSuccessCount() {
         return successCount.get();
     }
 
-    /**
-     * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getLastProcessing()
-     */
+    @Override
     public long getLastProcessing() {
         return lastProcessing.get();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java
index ccc572a..27a3779 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java
@@ -67,79 +67,53 @@ public final class MatcherManagement extends StandardMBean implements MatcherMan
 
     }
 
-    /**
-     * @see
-     * org.apache.james.mailetcontainer.api.jmx.MatcherManagementMBean#getMatcherName()
-     */
+    @Override
     public String getMatcherName() {
         return matcherConfig.getMatcherName();
     }
 
-    /**
-     * @see
-     * org.apache.james.mailetcontainer.api.jmx.MatcherManagementMBean#getMatcherCondition()
-     */
+    @Override
     public String getMatcherCondition() {
         return matcherConfig.getCondition();
     }
 
-    /**
-     * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getErrorCount()
-     */
+    @Override
     public long getErrorCount() {
         return errorCount.get();
     }
 
-    /**
-     * @see
-     * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getFastestProcessing()
-     */
+    @Override
     public long getFastestProcessing() {
         return fastestProcessing.get();
     }
 
-    /**
-     * @see
-     * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getHandledMailCount()
-     */
+    @Override
     public long getHandledMailCount() {
         return getSuccessCount() + getErrorCount();
 
     }
 
-    /**
-     * @see
-     * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getSlowestProcessing()
-     */
+    @Override
     public long getSlowestProcessing() {
         return slowestProcessing.get();
     }
 
-    /**
-     * @see
-     * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getSuccessCount()
-     */
+    @Override
     public long getSuccessCount() {
         return successCount.get();
     }
 
-    /**
-     * @see org.apache.james.mailetcontainer.api.jmx.MatcherManagementMBean#getMatchedCount()
-     */
+    @Override
     public long getMatchedCount() {
         return matchedCount.get();
     }
 
-    /**
-     * @see org.apache.james.mailetcontainer.api.jmx.MatcherManagementMBean#getNotMatchedCount()
-     */
+    @Override
     public long getNotMatchedCount() {
         return notMatchedCount.get();
     }
 
-    /**
-     * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getLastProcessing()
-     */
+    @Override
     public long getLastProcessing() {
         return lastProcessing.get();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java
index d2c5000..0423bf3 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java
@@ -45,6 +45,7 @@ public class And extends GenericCompositeMatcher {
      * @return Collection of Recipient from the And composition results of the
      *         child Matchers.
      */
+    @Override
     public Collection<MailAddress> match(final Mail mail) throws MessagingException {
         ImmutableList<Set<MailAddress>> individualMatchedResults = performMatchOnMatchers(mail);
         return computeIntersection(individualMatchedResults);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java
index 4fe2acf..a8cf2d5 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java
@@ -40,6 +40,7 @@ public abstract class GenericCompositeMatcher extends GenericMatcher implements
      * @param matcher
      *            Matcher child of the CompositeMatcher.
      */
+    @Override
     public void add(Matcher matcher) {
         matchers.add(matcher);
     }
@@ -47,6 +48,7 @@ public abstract class GenericCompositeMatcher extends GenericMatcher implements
     /**
      * @return Immutable collection for the child matchers
      */
+    @Override
     public List<Matcher> getMatchers() {
         return ImmutableList.copyOf(matchers);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java
index 35fde7e..d39be52 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java
@@ -42,6 +42,7 @@ import com.google.common.collect.Lists;
  */
 public class Not extends GenericCompositeMatcher {
 
+    @Override
     public Collection<MailAddress> match(Mail mail) throws MessagingException {
         Collection<MailAddress> finalResult = Optional.ofNullable(Lists.newArrayList(mail.getRecipients())).orElse(new ArrayList<>());
         for (Matcher matcher : getMatchers()) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java
index 0eeb1f9..8321dc8 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java
@@ -37,6 +37,7 @@ import org.apache.mailet.Matcher;
  */
 public class Or extends GenericCompositeMatcher {
 
+    @Override
     public Collection<MailAddress> match(Mail mail) throws MessagingException {
         HashSet<MailAddress> result = new HashSet<>();
         for (Matcher matcher : getMatchers()) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java
index 49ba0cc..3170b43 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java
@@ -42,6 +42,7 @@ import com.google.common.collect.Sets;
  */
 public class Xor extends GenericCompositeMatcher {
 
+    @Override
     public Collection<MailAddress> match(Mail mail) throws MessagingException {
         Collection<MailAddress> finalResult = null;
         boolean first = true;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
index 1a716e5..8c28422 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
@@ -65,21 +65,14 @@ public abstract class AbstractStateCompositeProcessor implements MailProcessor,
         listeners.remove(listener);
     }
 
-    /**
-     * @see
-     * org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
-     */
+    @Override
     public void configure(HierarchicalConfiguration config) throws ConfigurationException {
         this.config = config;
         this.enableJmx = config.getBoolean("[@enableJmx]", true);
 
     }
 
-    /**
-     * Service the given {@link Mail} by hand the {@link Mail} over the
-     * {@link MailProcessor} which is responsible for the
-     * {@link Mail#getState()}
-     */
+    @Override
     public void service(Mail mail) throws MessagingException {
         long start = System.currentTimeMillis();
         MessagingException ex = null;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
index ce78eaa..4666e98 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
@@ -93,10 +93,7 @@ public abstract class AbstractStateMailetProcessor implements MailProcessor, Con
     }
 
 
-    /**
-     * @see
-     * org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
-     */
+    @Override
     public void configure(HierarchicalConfiguration config) throws ConfigurationException {
         this.state = config.getString("[@state]", null);
         if (state == null) {
@@ -395,10 +392,7 @@ public abstract class AbstractStateMailetProcessor implements MailProcessor, Con
          */
         private static final String TERMINATING_MAILET_NAME = "Terminating%Mailet%Name";
 
-        /**
-         * @see
-         * org.apache.mailet.base.GenericMailet#service(org.apache.mailet.Mail)
-         */
+        @Override
         public void service(Mail mail) {
             if (!(Mail.ERROR.equals(mail.getState()))) {
                 // Don't complain if we fall off the end of the

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java
index 410ee62..a66f25f 100755
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java
@@ -77,6 +77,7 @@ public abstract class AbstractRecipientRewriteTable extends GenericMailet {
      * @param mail
      *            the mail to process
      */
+    @Override
     public void service(Mail mail) throws MessagingException {
         if (mail.getAttribute(MARKER) != null) {
             mail.removeAttribute(MARKER);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
index 5f2fb45..7e9c29a 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
@@ -154,6 +154,7 @@ public class BayesianAnalysis extends GenericMailet {
      * 
      * @return a string describing this mailet
      */
+    @Override
     public String getMailetInfo() {
         return "BayesianAnalysis Mailet";
     }
@@ -225,6 +226,7 @@ public class BayesianAnalysis extends GenericMailet {
      * @throws MessagingException
      *             if a problem arises
      */
+    @Override
     public void init() throws MessagingException {
         String repositoryPath = getInitParameter("repositoryPath");
 
@@ -284,6 +286,7 @@ public class BayesianAnalysis extends GenericMailet {
      * @throws MessagingException
      *             if a problem arises
      */
+    @Override
     public void service(Mail mail) throws MessagingException {
 
         try {
@@ -417,6 +420,7 @@ public class BayesianAnalysis extends GenericMailet {
         /**
          * Thread entry point.
          */
+        @Override
         public void run() {
             LOGGER.info("CorpusLoader thread started: will wake up every " + CORPUS_RELOAD_INTERVAL + " ms");
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
index 0447333..2769732 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
@@ -148,11 +148,7 @@ public class BayesianAnalysisFeeder extends GenericMailet {
 
     private String feedType;
 
-    /**
-     * Return a string describing this mailet.
-     * 
-     * @return a string describing this mailet
-     */
+    @Override
     public String getMailetInfo() {
         return "BayesianAnalysisFeeder Mailet";
     }
@@ -195,12 +191,7 @@ public class BayesianAnalysisFeeder extends GenericMailet {
         this.fs = fs;
     }
 
-    /**
-     * Mailet initialization routine.
-     * 
-     * @throws MessagingException
-     *             if a problem arises
-     */
+    @Override
     public void init() throws MessagingException {
         String repositoryPath = getInitParameter("repositoryPath");
 
@@ -242,6 +233,7 @@ public class BayesianAnalysisFeeder extends GenericMailet {
      * @param mail
      *            The Mail message to be scanned.
      */
+    @Override
     public void service(Mail mail) {
         boolean dbUpdated = false;
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
index c4869ef..b8ef707 100755
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
@@ -70,9 +70,7 @@ public class FromRepository extends GenericMailet {
         this.mailStore = mailStore;
     }
 
-    /**
-     * Initialize the mailet, loading configuration information.
-     */
+    @Override
     public void init() throws MessagingException {
         repositoryPath = getInitParameter("repositoryPath");
         processor = (getInitParameter("processor") == null) ? Mail.DEFAULT : getInitParameter("processor");
@@ -97,6 +95,7 @@ public class FromRepository extends GenericMailet {
      *            triggering e-mail (eventually parameterize via the trigger
      *            message)
      */
+    @Override
     public void service(Mail trigger) throws MessagingException {
         trigger.setState(Mail.GHOST);
         Collection<String> processed = new ArrayList<>();
@@ -128,11 +127,7 @@ public class FromRepository extends GenericMailet {
         }
     }
 
-    /**
-     * Return a string describing this mailet.
-     * 
-     * @return a string describing this mailet
-     */
+    @Override
     public String getMailetInfo() {
         return "FromRepository Mailet";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
index ef8bf1c..1b7e46c 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
@@ -70,9 +70,7 @@ public class JDBCAlias extends GenericMailet {
     // The JDBCUtil helper class
     private final JDBCUtil theJDBCUtil = new JDBCUtil();
 
-    /**
-     * Initialize the mailet
-     */
+    @Override
     public void init() throws MessagingException {
         String mappingsURL = getInitParameter("mappings");
 
@@ -113,6 +111,7 @@ public class JDBCAlias extends GenericMailet {
         }
     }
 
+    @Override
     public void service(Mail mail) throws MessagingException {
         // Then loop through each address in the recipient list and try to map
         // it according to the alias table
@@ -168,11 +167,7 @@ public class JDBCAlias extends GenericMailet {
         recipients.addAll(recipientsToAdd);
     }
 
-    /**
-     * Return a string describing this mailet.
-     * 
-     * @return a string describing this mailet
-     */
+    @Override
     public String getMailetInfo() {
         return "JDBC aliasing mailet";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java
index 34111e6..4da4680 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java
@@ -128,9 +128,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
         this.datasource = datasource;
     }
 
-    /**
-     * Initialize the mailet
-     */
+    @Override
     public void init() throws MessagingException {
         if (getInitParameter("table") == null) {
             throw new MailetException("Table location not specified for JDBCRecipientRewriteTable");
@@ -175,6 +173,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
      * @param recipientsMap
      *            the mapping of virtual to real recipients
      */
+    @Override
     protected void mapRecipients(Map<MailAddress, String> recipientsMap) throws MessagingException {
         Connection conn = null;
         PreparedStatement mappingStmt = null;
@@ -208,6 +207,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
         }
     }
 
+    @Override
     public String getMailetInfo() {
         return "JDBC Virtual User Table mailet";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
index a9e7fc9..168f918 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
@@ -57,14 +57,17 @@ public class LocalDelivery extends GenericMailet {
         this.mailboxManager = mailboxManager;
     }
 
+    @Override
     public void service(Mail mail) throws MessagingException {
         mailDispatcher.dispatch(mail);
     }
 
+    @Override
     public String getMailetInfo() {
         return "Local Delivery Mailet";
     }
 
+    @Override
     public void init() throws MessagingException {
         mailDispatcher = MailDispatcher.builder()
             .mailStore(SimpleMailStore.builder()

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
index da2f6a5..cdf1b57 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
@@ -154,6 +154,7 @@ public class RemoteDelivery extends GenericMailet {
         this.startThreads = startThreads;
     }
 
+    @Override
     public void init() throws MessagingException {
         configuration = new RemoteDeliveryConfiguration(getMailetConfig(), domainList);
         queue = queueFactory.createQueue(configuration.getOutGoingQueueName());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java
index b466f55..277cee3 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java
@@ -61,9 +61,7 @@ public class SPF extends GenericMailet {
     public static final String EXPLANATION_ATTRIBUTE = "org.apache.james.transport.mailets.spf.explanation";
     public static final String RESULT_ATTRIBUTE = "org.apache.james.transport.mailets.spf.result";
 
-    /**
-     * @see org.apache.mailet.base.GenericMailet#init()
-     */
+    @Override
     public void init() {
         addHeader = Boolean.valueOf(getInitParameter("addHeader", "false"));
         SPFLoggerAdapter logger = new SPFLoggerAdapter(Boolean.valueOf(getInitParameter("debug", "false")));
@@ -71,9 +69,7 @@ public class SPF extends GenericMailet {
         spf = new DefaultSPF(logger);
     }
 
-    /**
-     * @see org.apache.mailet.base.GenericMailet#service(org.apache.mailet.Mail)
-     */
+    @Override
     public void service(Mail mail) throws MessagingException {
         String sender;
         MailAddress senderAddr = mail.getSender();
@@ -116,70 +112,86 @@ public class SPF extends GenericMailet {
             this.debug = debug;
         }
 
+        @Override
         public void debug(String arg0) {
             if (debug) {
                 LOGGER.debug(arg0);
             }
         }
 
+        @Override
         public void debug(String arg0, Throwable arg1) {
             if (debug) {
                 LOGGER.debug(arg0, arg1);
             }
         }
 
+        @Override
         public void error(String arg0) {
             LOGGER.error(arg0);
         }
 
+        @Override
         public void error(String arg0, Throwable arg1) {
             LOGGER.error(arg0, arg1);
         }
 
+        @Override
         public void fatalError(String arg0) {
             LOGGER.error(arg0);
         }
 
+        @Override
         public void fatalError(String arg0, Throwable arg1) {
             LOGGER.error(arg0, arg1);
         }
 
+        @Override
         public Logger getChildLogger(String childName) {
             return new SPFLoggerAdapter(name + "." + childName, debug);
         }
 
+        @Override
         public void info(String arg0) {
             LOGGER.info(arg0);
         }
 
+        @Override
         public void info(String arg0, Throwable arg1) {
             LOGGER.info(arg0, arg1);
         }
 
+        @Override
         public boolean isDebugEnabled() {
             return LOGGER.isDebugEnabled();
         }
 
+        @Override
         public boolean isErrorEnabled() {
             return LOGGER.isErrorEnabled();
         }
 
+        @Override
         public boolean isFatalErrorEnabled() {
             return LOGGER.isErrorEnabled();
         }
 
+        @Override
         public boolean isInfoEnabled() {
             return LOGGER.isInfoEnabled();
         }
 
+        @Override
         public boolean isWarnEnabled() {
             return LOGGER.isWarnEnabled();
         }
 
+        @Override
         public void warn(String arg0) {
             LOGGER.warn(arg0);
         }
 
+        @Override
         public void warn(String arg0, Throwable arg1) {
             LOGGER.warn(arg0, arg1);
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java
index 400977d..bb8189c 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java
@@ -79,9 +79,7 @@ public class SpamAssassin extends GenericMailet {
         this.usersRepository = usersRepository;
     }
 
-    /**
-     * @see org.apache.mailet.base.GenericMailet#init()
-     */
+    @Override
     public void init() throws MessagingException {
         spamdHost = Optional.ofNullable(getInitParameter(SPAMD_HOST))
             .filter(s -> !Strings.isNullOrEmpty(s))
@@ -91,9 +89,7 @@ public class SpamAssassin extends GenericMailet {
         Port.assertValid(spamdPort);
     }
 
-    /**
-     * @see org.apache.mailet.base.GenericMailet#service(Mail)
-     */
+    @Override
     public void service(Mail mail) throws MessagingException {
         MimeMessage message = mail.getMessage();
 
@@ -114,9 +110,7 @@ public class SpamAssassin extends GenericMailet {
         }
     }
 
-    /**
-     * @see org.apache.mailet.base.GenericMailet#getMailetInfo()
-     */
+    @Override
     public String getMailetInfo() {
         return "Checks message against SpamAssassin";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
index 0dafb5d..bdcbf18 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
@@ -83,6 +83,7 @@ public class UsersRepositoryAliasingForwarding extends GenericMailet {
         processor.processMail(mail);
     }
 
+    @Override
     public String getMailetInfo() {
         return "Local User Aliasing and Forwarding Mailet";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
index 35e1eef..2a4889a 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
@@ -179,9 +179,7 @@ public class WhiteListManager extends GenericMailet {
         return this.sqlParameters;
     }
 
-    /**
-     * Initializes the mailet.
-     */
+    @Override
     public void init() throws MessagingException {
         automaticInsert = Boolean.valueOf(getInitParameter("automaticInsert"));
         LOGGER.debug("automaticInsert: {}", automaticInsert);
@@ -241,9 +239,7 @@ public class WhiteListManager extends GenericMailet {
         deleteByPK = sqlQueries.getSqlString("deleteByPK", true);
     }
 
-    /**
-     * Services the mailet.
-     */
+    @Override
     public void service(Mail mail) throws MessagingException {
 
         // check if it's a local sender
@@ -285,11 +281,7 @@ public class WhiteListManager extends GenericMailet {
 
     }
 
-    /**
-     * Returns a string describing this mailet.
-     * 
-     * @return a string describing this mailet
-     */
+    @Override
     public String getMailetInfo() {
         return "White List Manager mailet";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java
index 084acd5..736bed8 100755
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java
@@ -81,9 +81,7 @@ public class XMLRecipientRewriteTable extends AbstractRecipientRewriteTable {
      */
     private Map<String, String> mappings = new HashMap<>();
 
-    /**
-     * Initialize the mailet
-     */
+    @Override
     public void init() throws MessagingException {
         String mapping = getInitParameter("mapping");
 
@@ -99,6 +97,7 @@ public class XMLRecipientRewriteTable extends AbstractRecipientRewriteTable {
      * @param recipientsMap
      *            the mapping of virtual to real recipients
      */
+    @Override
     protected void mapRecipients(Map<MailAddress, String> recipientsMap) throws MessagingException {
         Collection<MailAddress> recipients = recipientsMap.keySet();
 
@@ -114,6 +113,7 @@ public class XMLRecipientRewriteTable extends AbstractRecipientRewriteTable {
         }
     }
 
+    @Override
     public String getMailetInfo() {
         return "XML Virtual User Table mailet";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/DiscardAction.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/DiscardAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/DiscardAction.java
index 15d97f9..ec207da 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/DiscardAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/DiscardAction.java
@@ -29,6 +29,7 @@ import com.github.steveash.guavate.Guavate;
 
 public class DiscardAction extends FileIntoAction implements MailAction {
 
+    @Override
     public void execute(Action action, Mail mail, final ActionContext context)
             throws MessagingException {
         if (action instanceof ActionDiscard) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java
index 299ab01..f9fcd90 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java
@@ -37,6 +37,7 @@ public class FileIntoAction implements MailAction {
 
     private static final char HIERARCHY_DELIMITER = '.';
 
+    @Override
     public void execute(Action action, Mail mail, ActionContext context) throws MessagingException {
         if (action instanceof ActionFileInto) {
             final ActionFileInto fileIntoAction = (ActionFileInto) action;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/KeepAction.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/KeepAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/KeepAction.java
index cdba9ca..f5665b4 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/KeepAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/KeepAction.java
@@ -34,6 +34,7 @@ public class KeepAction extends FileIntoAction implements MailAction {
     
     private static final String INBOX = "INBOX";
 
+    @Override
     public void execute(Action action, Mail mail, ActionContext context)
             throws MessagingException {
         if (action instanceof ActionKeep) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java
index f22af50..4fff11e 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java
@@ -39,6 +39,7 @@ import org.slf4j.LoggerFactory;
 public class RedirectAction implements MailAction {
     private static final Logger LOGGER = LoggerFactory.getLogger(RedirectAction.class.getName());
 
+    @Override
     public void execute(Action action, Mail mail, ActionContext context)
             throws MessagingException {
         if (action instanceof ActionRedirect) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
index 473221b..25f2b61 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
@@ -51,6 +51,7 @@ import org.slf4j.LoggerFactory;
 public class RejectAction implements MailAction {
     private static final Logger LOGGER = LoggerFactory.getLogger(RejectAction.class);
 
+    @Override
     public void execute(Action action, Mail mail, ActionContext context)
             throws MessagingException {
         if (action instanceof ActionReject) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
index 0d082a8..6ec17af 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
@@ -103,14 +103,17 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
         setMailetContext(aMailetContext);
     }
 
+    @Override
     public DateTime getScriptActivationDate() {
         return scriptActivationDate;
     }
 
+    @Override
     public DateTime getScriptInterpretationDate() {
         return scriptInterpretationDate;
     }
 
+    @Override
     public MailAddress getRecipient() {
         return recipient;
     }
@@ -124,6 +127,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
         return getMail().getMessage();
     }
 
+    @Override
     public List<Action> getActions() {
         List<Action> actions = null;
         if (null == (actions = getActionsBasic())) {
@@ -141,10 +145,12 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
         return fieldActions;
     }
 
+    @Override
     public void addAction(Action action) {
         getActions().add(action);
     }
 
+    @Override
     public void executeActions() throws SieveException {
         final List<Action> actions = getActions();
         for (final Action action: actions) {
@@ -168,9 +174,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
         setActions(computeActions());
     }
 
-    /**
-     * @see org.apache.jsieve.mail.MailAdapter#getHeader(String)
-     */
+    @Override
     public List<String> getHeader(String name) throws SieveMailException {
         try {
             String[] headers = getMessage().getHeader(name);
@@ -180,9 +184,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
         }
     }
     
-    /**
-     * @see org.apache.jsieve.mail.MailAdapter#getHeaderNames()
-     */
+    @Override
     public List<String> getHeaderNames() throws SieveMailException {
         Set<String> headerNames = new HashSet<>();
         try {
@@ -196,16 +198,12 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
         }
     }
     
-    /**
-     * @see org.apache.jsieve.mail.MailAdapter#getMatchingHeader(String)
-     */
+    @Override
     public List<String> getMatchingHeader(String name) throws SieveMailException {
         return MailUtils.getMatchingHeader(this, name);
     }
     
-    /**
-     * @see org.apache.jsieve.mail.MailAdapter#getSize()
-     */
+    @Override
     public int getSize() throws SieveMailException {
         try {
             return (int) getMail().getMessageSize();
@@ -230,6 +228,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
         return envelopes;
     }
     
+    @Override
     public List<String> getEnvelope(String name) throws SieveMailException {
         List<String> values = new ArrayList<>(1);
         String value = getEnvelopes().get(name);
@@ -239,16 +238,12 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
         return values;
     }
     
-    /**
-     * @see org.apache.jsieve.mail.optional.EnvelopeAccessors#getEnvelopeNames()
-     */
+    @Override
     public List<String> getEnvelopeNames() throws SieveMailException {
         return new ArrayList<>(getEnvelopes().keySet());
     }
     
-    /**
-     * @see org.apache.jsieve.mail.optional.EnvelopeAccessors#getMatchingEnvelope(String)
-     */
+    @Override
     public List<String> getMatchingEnvelope(String name) throws SieveMailException {
         final List<String> matchedEnvelopeValues = new ArrayList<>(32);
         for (String envelopeName: getEnvelopeNames()) {
@@ -336,6 +331,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
                 + " Message ID: " + (null == messageID ? "null" : messageID);
     }
     
+    @Override
     public String getContentType() throws SieveMailException {
         try {
             return getMessage().getContentType();
@@ -344,6 +340,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
         }
     }
     
+    @Override
     public Address[] parseAddresses(String arg) throws SieveMailException, InternetAddressException {
         try {
             List<String> headerValues = getHeader(arg);
@@ -368,18 +365,22 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
         }
     }
 
+    @Override
     public String getServerInfo() {
         return getMailetContext().getServerInfo();
     }
 
+    @Override
     public void post(String uri, Mail mail) throws MessagingException {
         poster.post(uri, mail);
     }
     
+    @Override
     public void post(MailAddress sender, Collection<MailAddress> recipients, MimeMessage mail) throws MessagingException {
         getMailetContext().sendMail(sender, recipients, mail);
     }
 
+    @Override
     public boolean isInBodyText(List<String> phrasesCaseInsensitive) throws SieveMailException {
         try {
             return MessageMatcher.builder()
@@ -393,6 +394,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
         }
     }
 
+    @Override
     public boolean isInBodyRaw(List<String> phrasesCaseInsensitive) throws SieveMailException {
         try {
             return MessageMatcher.builder()
@@ -406,6 +408,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
         }
     }
 
+    @Override
     public boolean isInBodyContent(List<String> contentTypes, List<String> phrasesCaseInsensitive) throws SieveMailException {
         try {
             return MessageMatcher.builder()
@@ -419,5 +422,6 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
         }
     }
 
+    @Override
     public void setContext(SieveContext context) {}
 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailet.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailet.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailet.java
index 1b8bd74..c07201f 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailet.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailet.java
@@ -181,6 +181,7 @@ public class ManageSieveMailet extends GenericMailet implements MessageToCoreToM
         }
     }
 
+    @Override
     @VisibleForTesting
     public String getHelp() throws MessagingException {
         if (null == help) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java
index 12d8b79..0a585aa 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java
@@ -141,6 +141,7 @@ public class ProcessRedirectNotify {
             super(originalMessage);
         }
 
+        @Override
         protected void updateHeaders() throws MessagingException {
             if (getMessageID() == null) {
                 super.updateHeaders();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliverySocketFactory.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliverySocketFactory.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliverySocketFactory.java
index 60722a2..cd22059 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliverySocketFactory.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliverySocketFactory.java
@@ -88,6 +88,7 @@ public class RemoteDeliverySocketFactory extends SocketFactory {
      * to be safe, it is not used by JavaMail 1.3. This is the only method used
      * by JavaMail 1.4.
      */
+    @Override
     public Socket createSocket() throws IOException {
         Socket s = new Socket();
         s.bind(new InetSocketAddress(bindAddress, 0));
@@ -99,6 +100,7 @@ public class RemoteDeliverySocketFactory extends SocketFactory {
      * is the one which is used by JavaMail 1.3. This is not used by JavaMail
      * 1.4.
      */
+    @Override
     public Socket createSocket(String host, int port) throws IOException {
         return new Socket(host, port, bindAddress, 0);
     }
@@ -108,6 +110,7 @@ public class RemoteDeliverySocketFactory extends SocketFactory {
      * to be safe, it is not used by JavaMail 1.3. This is not used by JavaMail
      * 1.4.
      */
+    @Override
     public Socket createSocket(String host, int port, InetAddress clientHost, int clientPort) throws IOException {
         return new Socket(host, port, clientHost == null ? bindAddress : clientHost, clientPort);
     }
@@ -117,6 +120,7 @@ public class RemoteDeliverySocketFactory extends SocketFactory {
      * to be safe, it is not used by JavaMail 1.3. This is not used by JavaMail
      * 1.4.
      */
+    @Override
     public Socket createSocket(InetAddress host, int port) throws IOException {
         return new Socket(host, port, bindAddress, 0);
     }
@@ -126,6 +130,7 @@ public class RemoteDeliverySocketFactory extends SocketFactory {
      * to be safe, it is not used by JavaMail 1.3. This is not used by JavaMail
      * 1.4.
      */
+    @Override
     public Socket createSocket(InetAddress address, int port, InetAddress clientAddress, int clientPort) throws IOException {
         return new Socket(address, port, clientAddress == null ? bindAddress : clientAddress, clientPort);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
index 338cf06..acbbad5 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
@@ -131,6 +131,7 @@ public abstract class AbstractSQLWhitelistMatcher extends GenericMatcher {
         super.init();
     }
 
+    @Override
     public Collection<MailAddress> match(Mail mail) throws MessagingException {
         // check if it's a local sender
         MailAddress senderMailAddress = mail.getSender();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
index 6adc888..a384396 100755
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
@@ -94,6 +94,7 @@ public abstract class AbstractStorageQuota extends AbstractQuotaMatcher {
      * @param recipient
      *            the recipient to check
      */
+    @Override
     protected boolean isRecipientChecked(MailAddress recipient) throws MessagingException {
         MailetContext mailetContext = getMailetContext();
         return super.isRecipientChecked(recipient) && (mailetContext.isLocalEmail(recipient));

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
index 75e6756..043bfb0 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
@@ -63,6 +63,7 @@ public class InSpammerBlacklist extends GenericMatcher {
         this.dnsServer = dnsService;
     }
 
+    @Override
     public void init() throws MessagingException {
         network = getCondition();
 
@@ -73,6 +74,7 @@ public class InSpammerBlacklist extends GenericMatcher {
 
     }
 
+    @Override
     public Collection<MailAddress> match(Mail mail) {
         String host = mail.getRemoteAddr();
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java
index dca0547..5022879 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java
@@ -71,17 +71,12 @@ public class IsInWhiteList extends AbstractSQLWhitelistMatcher {
         selectByPK = sqlQueries.getSqlString("selectByPK", true);
     }
 
-    /**
-     * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#getSQLSectionName()
-     */
+    @Override
     protected String getSQLSectionName() {
         return "WhiteList";
     }
 
-    /**
-     * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher
-     * #matchedWhitelist(org.apache.mailet.MailAddress, org.apache.mailet.Mail)
-     */
+    @Override
     protected boolean matchedWhitelist(MailAddress recipientMailAddress, Mail mail) throws MessagingException {
         MailAddress senderMailAddress = mail.getSender();
         String senderUser = senderMailAddress.getLocalPart().toLowerCase(Locale.US);
@@ -178,18 +173,12 @@ public class IsInWhiteList extends AbstractSQLWhitelistMatcher {
         return false;
     }
 
-    /**
-     * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher
-     * #getTableCreateQueryName()
-     */
+    @Override
     protected String getTableCreateQueryName() {
         return "createWhiteListTable";
     }
 
-    /**
-     * @see
-     * org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#getTableName()
-     */
+    @Override
     protected String getTableName() {
         return "whiteListTableName";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java
index ff60d47..c4415fe 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java
@@ -33,10 +33,7 @@ import org.apache.mailet.Matcher;
 @Experimental
 public class MailboxQuotaFixed extends AbstractStorageQuota {
 
-    /**
-     * @see org.apache.james.mailet.standard.matchers.AbstractQuotaMatcher
-     *      #getQuota(org.apache.mailet.MailAddress, org.apache.mailet.Mail)
-     */
+    @Override
     protected long getQuota(MailAddress arg0, Mail arg1) throws MessagingException {
         return parseQuota(this.getCondition());
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
index 2978859..8b0f20c 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
@@ -66,9 +66,7 @@ public class NetworkIsInWhitelist extends AbstractSQLWhitelistMatcher {
         this.dns = dns;
     }
 
-    /**
-     * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#getSQLSectionName()
-     */
+    @Override
     protected String getSQLSectionName() {
         return "NetworkWhiteList";
     }
@@ -80,10 +78,7 @@ public class NetworkIsInWhitelist extends AbstractSQLWhitelistMatcher {
 
     }
 
-    /**
-     * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher
-     * #matchedWhitelist(org.apache.mailet.MailAddress, org.apache.mailet.Mail)
-     */
+    @Override
     protected boolean matchedWhitelist(MailAddress recipientMailAddress, Mail mail) throws MessagingException {
         Connection conn = null;
         PreparedStatement selectStmt = null;
@@ -140,17 +135,12 @@ public class NetworkIsInWhitelist extends AbstractSQLWhitelistMatcher {
         }
     }
 
-    /**
-     * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#getTableCreateQueryName()
-     */
+    @Override
     protected String getTableCreateQueryName() {
         return "createNetworkWhiteListTable";
     }
 
-    /**
-     * @see
-     * org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#getTableName()
-     */
+    @Override
     protected String getTableName() {
         return "networkWhiteListTableName";
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java
index a6ce9ea..2ad4291 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java
@@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory;
 public class SenderInFakeDomain extends AbstractNetworkMatcher {
     private static final Logger LOGGER = LoggerFactory.getLogger(SenderInFakeDomain.class);
 
+    @Override
     public Collection<MailAddress> match(Mail mail) {
         if (mail.getSender() == null) {
             return null;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java
index 19f5fa0..8d015c4 100644
--- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java
+++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java
@@ -252,20 +252,11 @@ class Account implements Comparable<Account> {
         fieldSequenceNumber = sequenceNumber;
     }
 
-    /**
-     * Compares this object with the specified object for order. Returns a
-     * negative integer, zero, or a positive integer if this object is less
-     * than, equal to, or greater than the specified object.
-     * 
-     * @see java.lang.Comparable#compareTo(Object)
-     */
+    @Override
     public int compareTo(Account account) {
         return getSequenceNumber() - account.getSequenceNumber();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
@@ -281,9 +272,6 @@ class Account implements Comparable<Account> {
         return getSequenceNumber() == other.getSequenceNumber();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public int hashCode() {
         return 31 * 17 + getSequenceNumber();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
index 76c9898..5cd5279 100644
--- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
+++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
@@ -402,9 +402,8 @@ public class FetchMail implements Runnable, Configurable {
      * a new <code>ParsedConfiguration</code>, an <code>Account</code> for each
      * configured static account and a
      * <code>ParsedDynamicAccountParameters</code> for each dynamic account.
-     *
-     * @see org.apache.james.lifecycle.api.Configurable#configure(HierarchicalConfiguration)
      */
+    @Override
     public void configure(HierarchicalConfiguration configuration) throws ConfigurationException {
         // Set any Session parameters passed in the Configuration
         setSessionParameters(configuration);
@@ -459,6 +458,7 @@ public class FetchMail implements Runnable, Configurable {
     /**
      * Method target triggered fetches mail for each configured account.
      */
+    @Override
     public void run() {
         // if we are already fetching then just return
         if (isFetching()) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
index 4a650f3..d571b9d 100644
--- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
+++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
@@ -87,10 +87,7 @@ public class FetchScheduler implements FetchSchedulerMBean, Configurable {
         this.domainList = domainList;
     }
 
-    /**
-     * @see
-     * org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
-     */
+    @Override
     public final void configure(HierarchicalConfiguration config) throws ConfigurationException {
         this.conf = config;
     }
@@ -149,6 +146,7 @@ public class FetchScheduler implements FetchSchedulerMBean, Configurable {
      *
      * @return is the service enabled.
      */
+    @Override
     public final boolean isEnabled() {
         return enabled;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java
index 3d2e11d..2f446b7 100644
--- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java
+++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java
@@ -64,9 +64,8 @@ public class FolderProcessor extends ProcessorAbstract {
      * Method process opens a Folder, fetches the Envelopes for all of its
      * Messages, creates a <code>MessageProcessor</code> and runs it to process
      * each message.
-     * 
-     * @see org.apache.james.fetchmail.ProcessorAbstract#process()
      */
+    @Override
     public void process() throws MessagingException {
         int messagesProcessed = 0;
         int messageCount = 0;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
index 1e33fc1..313b9d6 100644
--- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
+++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
@@ -292,9 +292,8 @@ public class MessageProcessor extends ProcessorAbstract {
 
     /**
      * Method process attempts to deliver a fetched message.
-     *
-     * @see org.apache.james.fetchmail.ProcessorAbstract#process()
      */
+    @Override
     public void process() throws MessagingException {
         // Log delivery attempt
         LOGGER.debug("Attempting delivery of message with id. {}", getMessageIn().getMessageID());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java
index a41460f..773aa85 100644
--- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java
+++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java
@@ -46,9 +46,8 @@ public class StoreProcessor extends ProcessorAbstract {
      * Method process connects to a Folder in a Message Store, creates a
      * <code>FolderProcessor</code> and runs it to process the messages in the
      * Folder.
-     * 
-     * @see org.apache.james.fetchmail.ProcessorAbstract#process()
      */
+    @Override
     public void process() throws MessagingException {
         Store store = null;
         Folder folder;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/SentByJmap.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/SentByJmap.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/SentByJmap.java
index 51100aa..be5ba42 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/SentByJmap.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/SentByJmap.java
@@ -31,6 +31,7 @@ import org.apache.mailet.base.GenericMatcher;
 import com.google.common.collect.ImmutableList;
 
 public class SentByJmap extends GenericMatcher {
+    @Override
     public Collection<MailAddress> match(Mail mail) {
         String authUser = (String) mail.getAttribute(MailMetadata.MAIL_METADATA_USERNAME_ATTRIBUTE);
         if (authUser != null) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMailboxesMethod.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMailboxesMethod.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMailboxesMethod.java
index 556adec..9b281bf 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMailboxesMethod.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMailboxesMethod.java
@@ -77,6 +77,7 @@ public class GetMailboxesMethod implements Method {
         return GetMailboxesRequest.class;
     }
 
+    @Override
     public Stream<JmapResponse> process(JmapRequest request, ClientId clientId, MailboxSession mailboxSession) {
         Preconditions.checkArgument(request instanceof GetMailboxesRequest);
         GetMailboxesRequest mailboxesRequest = (GetMailboxesRequest) request;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesCreationProcessor.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesCreationProcessor.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesCreationProcessor.java
index 4dfa901..22f9579 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesCreationProcessor.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesCreationProcessor.java
@@ -84,6 +84,7 @@ public class SetMailboxesCreationProcessor implements SetMailboxesProcessor {
         this.mailboxIdFactory = mailboxIdFactory;
     }
 
+    @Override
     public SetMailboxesResponse process(SetMailboxesRequest request, MailboxSession mailboxSession) {
         TimeMetric timeMetric = metricFactory.timer(JMAP_PREFIX + "SetMailboxesCreationProcessor");
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesDestructionProcessor.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesDestructionProcessor.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesDestructionProcessor.java
index c81a2a1..2030c08 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesDestructionProcessor.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesDestructionProcessor.java
@@ -78,6 +78,7 @@ public class SetMailboxesDestructionProcessor implements SetMailboxesProcessor {
         this.mailboxFactory = mailboxFactory;
     }
 
+    @Override
     public SetMailboxesResponse process(SetMailboxesRequest request, MailboxSession mailboxSession) {
         TimeMetric timeMetric = metricFactory.timer(JMAP_PREFIX + "SetMailboxesDestructionProcessor");
         ImmutableMap<MailboxId, Mailbox> idToMailbox = mapDestroyRequests(request, mailboxSession);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesMethod.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesMethod.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesMethod.java
index eaad72a..49e191e 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesMethod.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesMethod.java
@@ -58,6 +58,7 @@ public class SetMessagesMethod implements Method {
         return SetMessagesRequest.class;
     }
 
+    @Override
     public Stream<JmapResponse> process(JmapRequest request, ClientId clientId, MailboxSession mailboxSession) {
         Preconditions.checkArgument(request instanceof SetMessagesRequest);
         SetMessagesRequest setMessagesRequest = (SetMessagesRequest) request;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxProperty.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxProperty.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxProperty.java
index 5508073..5ba1763 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxProperty.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxProperty.java
@@ -48,6 +48,7 @@ public enum MailboxProperty implements Property {
         this.fieldName = fieldName;
     }
 
+    @Override
     public String asFieldName() {
         return fieldName;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java
index 47c2e5e..60a5f38 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java
@@ -35,10 +35,7 @@ public abstract class AbstractNettyImapRequestLineReader extends ImapRequestLine
 
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.decode.ImapRequestLineReader#commandContinuationRequest()
-     */
+    @Override
     protected void commandContinuationRequest() throws DecodingException {
         // only write the request out if this is not a retry to process the
         // request..

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
index 38917da..e778509 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
@@ -54,18 +54,14 @@ public class ChannelImapResponseWriter implements ImapResponseWriter {
         this.zeroCopy = zeroCopy;
     }
 
-    /**
-     * @see org.apache.james.imap.encode.ImapResponseWriter#write(byte[])
-     */
+    @Override
     public void write(byte[] buffer) throws IOException {
         if (channel.isConnected()) {
             channel.write(ChannelBuffers.wrappedBuffer(buffer));
         }
     }
 
-    /**
-     * @see org.apache.james.imap.encode.ImapResponseWriter#write(org.apache.james.imap.message.response.Literal)
-     */
+    @Override
     public void write(Literal literal) throws IOException {
         if (channel.isConnected()) {
             InputStream in = literal.getInputStream();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
index d834e0b..b44df8d 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
@@ -133,17 +133,12 @@ public class IMAPServer extends AbstractConfigurableAsyncServer implements ImapC
         }
     }
 
-    /**
-     * @see AbstractConfigurableAsyncServer#getDefaultPort()
-     */
     @Override
     public int getDefaultPort() {
         return 143;
     }
 
-    /**
-     * @see AbstractConfigurableAsyncServer#getServiceType()
-     */
+    @Override
     public String getServiceType() {
         return "IMAP Service";
     }
@@ -158,6 +153,7 @@ public class IMAPServer extends AbstractConfigurableAsyncServer implements ImapC
             
             private final TimeUnit timeoutUnit = TimeUnit.SECONDS;
 
+            @Override
             public ChannelPipeline getPipeline() throws Exception {
                 ChannelPipeline pipeline = pipeline();
                 pipeline.addLast(GROUP_HANDLER, groupHandler);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
index 6e99515..ec6c2d8 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
@@ -68,11 +68,7 @@ public class ImapRequestFrameDecoder extends FrameDecoder implements NettyConsta
         super.channelOpen(ctx, e);
     }
 
-    /**
-     * @see
-     * org.jboss.netty.handler.codec.frame.FrameDecoder#decode(org.jboss.netty.channel.ChannelHandlerContext,
-     * org.jboss.netty.channel.Channel, org.jboss.netty.buffer.ChannelBuffer)
-     */
+    @Override
     @SuppressWarnings("unchecked")
     protected Object decode(ChannelHandlerContext ctx, Channel channel, ChannelBuffer buffer) throws Exception {
         buffer.markReaderIndex();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java
index 4f796bf..c090da0 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java
@@ -57,6 +57,7 @@ public class NettyImapRequestLineReader extends AbstractNettyImapRequestLineRead
      * wrapped {@link ChannelBuffer} contains not enough data to read the next
      * char
      */
+    @Override
     public char nextChar() throws DecodingException {
         if (!nextSeen) {
             int next;
@@ -78,6 +79,7 @@ public class NettyImapRequestLineReader extends AbstractNettyImapRequestLineRead
      * {@link ChannelBuffer} contains enough data. If not it will throw a
      * {@link NotEnoughDataException}
      */
+    @Override
     public InputStream read(int size, boolean extraCRLF) throws DecodingException {
         int crlf = 0;
         if (extraCRLF) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java
index f3da750..f10fa1a 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java
@@ -62,49 +62,36 @@ public class NettyImapSession implements ImapSession, NettyConstants {
         return channel;
     }
 
-    /**
-     * @see org.apache.james.imap.api.process.ImapSession#logout()
-     */
+    @Override
     public void logout() {
         closeMailbox();
         state = ImapSessionState.LOGOUT;
     }
 
-    /**
-     * @see org.apache.james.imap.api.process.ImapSession#authenticated()
-     */
+    @Override
     public void authenticated() {
         this.state = ImapSessionState.AUTHENTICATED;
     }
 
-    /**
-     * @see org.apache.james.imap.api.process.ImapSession#deselect()
-     */
+    @Override
     public void deselect() {
         this.state = ImapSessionState.AUTHENTICATED;
         closeMailbox();
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.api.process.ImapSession#selected(org.apache.james.imap.api.process.SelectedMailbox)
-     */
+    @Override
     public void selected(SelectedMailbox mailbox) {
         this.state = ImapSessionState.SELECTED;
         closeMailbox();
         this.selectedMailbox = mailbox;
     }
 
-    /**
-     * @see org.apache.james.imap.api.process.ImapSession#getSelected()
-     */
+    @Override
     public SelectedMailbox getSelected() {
         return this.selectedMailbox;
     }
 
-    /**
-     * @see org.apache.james.imap.api.process.ImapSession#getState()
-     */
+    @Override
     public ImapSessionState getState() {
         return this.state;
     }
@@ -116,18 +103,12 @@ public class NettyImapSession implements ImapSession, NettyConstants {
         }
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.api.process.ImapSession#getAttribute(java.lang.String)
-     */
+    @Override
     public Object getAttribute(String key) {
         return attributesByKey.get(key);
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.api.process.ImapSession#setAttribute(java.lang.String, java.lang.Object)
-     */
+    @Override
     public void setAttribute(String key, Object value) {
         if (value == null) {
             attributesByKey.remove(key);
@@ -136,9 +117,7 @@ public class NettyImapSession implements ImapSession, NettyConstants {
         }
     }
 
-    /**
-     * @see org.apache.james.imap.api.process.ImapSession#startTLS()
-     */
+    @Override
     public boolean startTLS() {
         if (!supportStartTLS()) {
             return false;
@@ -157,24 +136,17 @@ public class NettyImapSession implements ImapSession, NettyConstants {
         return true;
     }
 
-    /**
-     * @see org.apache.james.imap.api.process.ImapSession#supportStartTLS()
-     */
+    @Override
     public boolean supportStartTLS() {
         return sslContext != null;
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.api.process.ImapSession#isCompressionSupported()
-     */
+    @Override
     public boolean isCompressionSupported() {
         return compress;
     }
 
-    /**
-     * @see org.apache.james.imap.api.process.ImapSession#startCompression()
-     */
+    @Override
     public boolean startCompression() {
         if (!isCompressionSupported()) {
             return false;
@@ -201,49 +173,36 @@ public class NettyImapSession implements ImapSession, NettyConstants {
         return true;
     }
 
-    /**
-     * @see
-     * org.apache.james.imap.api.process.ImapSession#pushLineHandler(org.apache.james.imap.api.process.ImapLineHandler)
-     */
+    @Override
     public void pushLineHandler(ImapLineHandler lineHandler) {
         channel.setReadable(false);
         channel.getPipeline().addBefore(REQUEST_DECODER, "lineHandler" + handlerCount++, new ImapLineHandlerAdapter(this, lineHandler));
         channel.setReadable(true);
     }
 
-    /**
-     * @see org.apache.james.imap.api.process.ImapSession#popLineHandler()
-     */
+    @Override
     public void popLineHandler() {
         channel.setReadable(false);
         channel.getPipeline().remove("lineHandler" + --handlerCount);
         channel.setReadable(true);
     }
 
-    /**
-     * @see org.apache.james.imap.api.process.ImapSession#isPlainAuthDisallowed()
-     */
+    @Override
     public boolean isPlainAuthDisallowed() {
         return plainAuthDisallowed;
     }
 
-    /**
-     * @see org.apache.james.imap.api.process.ImapSession#isTLSActive()
-     */
+    @Override
     public boolean isTLSActive() {
         return channel.getPipeline().get(SSL_HANDLER) != null;
     }
 
-    /**
-     * @see org.apache.james.imap.api.process.ImapSession#supportMultipleNamespaces()
-     */
+    @Override
     public boolean supportMultipleNamespaces() {
         return false;
     }
 
-    /**
-     * @see org.apache.james.imap.api.process.ImapSession#isCompressionActive()
-     */
+    @Override
     public boolean isCompressionActive() {
         return channel.getPipeline().get(ZLIB_DECODER) != null;
     }


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


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

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/io/ChunkOutputStream.java
----------------------------------------------------------------------
diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/io/ChunkOutputStream.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/io/ChunkOutputStream.java
index f236dab..f66fa5b 100644
--- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/io/ChunkOutputStream.java
+++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/io/ChunkOutputStream.java
@@ -62,11 +62,6 @@ public class ChunkOutputStream extends OutputStream {
         this.chunk = new byte[chunkSize];
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.io.OutputStream#write(int)
-     */
     @Override
     public void write(int b) throws IOException {
         if (chunk.length - 1 == pos) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java
index 1da15b6..e4f7c7a 100644
--- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java
+++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java
@@ -516,10 +516,6 @@ public class HBaseMessageMapper extends NonTransactionalMapper implements Messag
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.mail.MessageMapper#add(org.apache.james.mailbox.store.mail.model.Mailbox, org.apache.james.mailbox.store.mail.model.MailboxMessage)
-     */
     @Override
     public MessageMetaData add(Mailbox mailbox, MailboxMessage message) throws MailboxException {
         message.setUid(uidProvider.nextUid(mailboxSession, mailbox));
@@ -533,10 +529,6 @@ public class HBaseMessageMapper extends NonTransactionalMapper implements Messag
         return data;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.mail.MessageMapper#updateFlags(org.apache.james.mailbox.store.mail.model.Mailbox, javax.mail.Flags, boolean, boolean, org.apache.james.mailbox.MessageRange)
-     */
     @Override
     public Iterator<UpdatedFlags> updateFlags(Mailbox mailbox, FlagsUpdateCalculator flagsUpdateCalculator, MessageRange set) throws MailboxException {
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseUidProvider.java
----------------------------------------------------------------------
diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseUidProvider.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseUidProvider.java
index ab37b28..e547524 100644
--- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseUidProvider.java
+++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseUidProvider.java
@@ -51,12 +51,6 @@ public class HBaseUidProvider implements UidProvider {
         this.conf = conf;
     }
 
-    /**
-     * Returns the last message uid used in a mailbox.
-     * @param session the session
-     * @param mailbox the mailbox for which to get the last uid
-     * @return the last uid used
-     */
     @Override
     public Optional<MessageUid> lastUid(MailboxSession session, Mailbox mailbox) throws MailboxException {
         HTable mailboxes = null;
@@ -89,14 +83,6 @@ public class HBaseUidProvider implements UidProvider {
         }
     }
 
-    /**
-     * Returns the next uid. Implemented using HTable.incrementColumnValue(row, family, qualifier, amount).
-     * 
-     * @param session the mailbox session
-     * @param mailbox the mailbox for which we are getting the next uid.
-     * @return the next uid to be used.
-     * @throws MailboxException 
-     */
     @Override
     public MessageUid nextUid(MailboxSession session, Mailbox mailbox) throws MailboxException {
         return nextUid(session, mailbox.getMailboxId());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/model/HBaseMailbox.java
----------------------------------------------------------------------
diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/model/HBaseMailbox.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/model/HBaseMailbox.java
index fc4a814..42f160d 100644
--- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/model/HBaseMailbox.java
+++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/model/HBaseMailbox.java
@@ -63,9 +63,6 @@ public class HBaseMailbox implements Mailbox {
         return new MailboxPath(getNamespace(), getUser(), getName());
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getMailboxId()
-     */
     @Override
     public HBaseId getMailboxId() {
         return mailboxId;
@@ -85,52 +82,31 @@ public class HBaseMailbox implements Mailbox {
         return namespace;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#setNamespace(java.lang.String)
-     */
     @Override
     public void setNamespace(String namespace) {
         this.namespace = namespace;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getUser()
-     */
     @Override
     public String getUser() {
         return user;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#setUser(java.lang.String)
-     */
     @Override
     public void setUser(String user) {
         this.user = user;
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getName()
-     */
     @Override
     public String getName() {
         return name;
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#setName(java.lang.String)
-     */
     @Override
     public void setName(String name) {
         this.name = name;
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getUidValidity()
-     */
     @Override
     public long getUidValidity() {
         return uidValidity;
@@ -203,18 +179,12 @@ public class HBaseMailbox implements Mailbox {
         this.messageCount = messageCount;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getACL()
-     */
     @Override
     public MailboxACL getACL() {
         // TODO ACL support
         return MailboxACL.OWNER_FULL_ACL;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#setACL(org.apache.james.mailbox.MailboxACL)
-     */
     @Override
     public void setACL(MailboxACL acl) {
         // TODO ACL support

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapper.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapper.java
index 3d11085..e0b9a19 100644
--- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapper.java
+++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapper.java
@@ -54,10 +54,6 @@ public class HBaseSubscriptionMapper extends HBaseNonTransactionalMapper impleme
         this.conf = conf;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#findMailboxSubscriptionForUser(java.lang.String, java.lang.String)
-     */
     @Override
     public Subscription findMailboxSubscriptionForUser(String user, String mailbox) throws SubscriptionException {
         HTable subscriptions = null;
@@ -88,10 +84,6 @@ public class HBaseSubscriptionMapper extends HBaseNonTransactionalMapper impleme
         }
     }
 
-    /**
-     * @throws SubscriptionException 
-     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#save(Subscription)
-     */
     @Override
     public void save(Subscription subscription) throws SubscriptionException {
         //TODO: maybe switch to checkAndPut
@@ -113,10 +105,6 @@ public class HBaseSubscriptionMapper extends HBaseNonTransactionalMapper impleme
         }
     }
 
-    /**
-     * @throws SubscriptionException 
-     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#findSubscriptionsForUser(java.lang.String)
-     */
     @Override
     public List<Subscription> findSubscriptionsForUser(String user) throws SubscriptionException {
         HTable subscriptions = null;
@@ -146,10 +134,6 @@ public class HBaseSubscriptionMapper extends HBaseNonTransactionalMapper impleme
         }
     }
 
-    /**
-     * @throws SubscriptionException 
-     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#delete(Subscription)
-     */
     @Override
     public void delete(Subscription subscription) throws SubscriptionException {
         //TODO: maybe switch to checkAndDelete

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseMailboxManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseMailboxManagerTest.java b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseMailboxManagerTest.java
index 748e50e..36735f6 100644
--- a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseMailboxManagerTest.java
+++ b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseMailboxManagerTest.java
@@ -93,6 +93,7 @@ public class HBaseMailboxManagerTest extends MailboxManagerTest {
         return manager;
     }
 
+    @Override
     @After
     public void tearDown() {
         CLUSTER.clearTable(MAILBOXES);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java
index 31bc7da..f8dedc3 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java
@@ -61,7 +61,8 @@ public abstract class AbstractJCRScalingMapper extends TransactionalMapper imple
     /**
      * Begin is not supported by level 1 JCR implementations, however we refresh the session
      */
-    protected void begin() throws MailboxException {  
+    @Override
+    protected void begin() throws MailboxException {
         try {
             getSession().refresh(true);
         } catch (RepositoryException e) {
@@ -73,6 +74,7 @@ public abstract class AbstractJCRScalingMapper extends TransactionalMapper imple
     /**
      * Just call save on the underlying JCR Session, because level 1 JCR implementation does not offer Transactions
      */
+    @Override
     protected void commit() throws MailboxException {
         try {
             if (getSession().hasPendingChanges()) {
@@ -86,6 +88,7 @@ public abstract class AbstractJCRScalingMapper extends TransactionalMapper imple
     /**
      * Rollback is not supported by level 1 JCR implementations, so just do nothing
      */
+    @Override
     protected void rollback() throws MailboxException {
         try {
             // just refresh session and discard all pending changes
@@ -98,6 +101,7 @@ public abstract class AbstractJCRScalingMapper extends TransactionalMapper imple
     /**
      * Logout from open JCR Session
      */
+    @Override
     public void endRequest() {
        repository.logout(mSession);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRRepositoryAuthenticator.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRRepositoryAuthenticator.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRRepositoryAuthenticator.java
index 83c3786..8784cd3 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRRepositoryAuthenticator.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRRepositoryAuthenticator.java
@@ -41,10 +41,7 @@ public class JCRRepositoryAuthenticator implements Authenticator {
         this.repository = repository;
     }
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.Authenticator#isAuthentic(java.lang.String, java.lang.CharSequence)
-     */
+    @Override
     public boolean isAuthentic(String userid, CharSequence passwd) {
         Repository repos = repository.getRepository();
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java
index 9aac65d..458b714 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java
@@ -63,13 +63,7 @@ public class JCRMailboxMapper extends AbstractJCRScalingMapper implements Mailbo
         super(repos, session, scaling);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.james.mailbox.store.mail.MailboxMapper#delete(org.apache.james
-     * .imap.store.mail.model.Mailbox)
-     */
+    @Override
     public void delete(Mailbox mailbox) throws MailboxException {
         try {
             Node node = getSession().getNodeByIdentifier(((JCRMailbox) mailbox).getMailboxId().serialize());
@@ -83,10 +77,7 @@ public class JCRMailboxMapper extends AbstractJCRScalingMapper implements Mailbo
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxByPath(org.apache.james.imap.api.MailboxPath)
-     */
+    @Override
     public Mailbox findMailboxByPath(MailboxPath path) throws MailboxException, MailboxNotFoundException {
         try {
             String name = Text.escapeIllegalXpathSearchChars(path.getName());
@@ -126,10 +117,7 @@ public class JCRMailboxMapper extends AbstractJCRScalingMapper implements Mailbo
     }
 
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxWithPathLike(org.apache.james.imap.api.MailboxPath)
-     */
+    @Override
     public List<Mailbox> findMailboxWithPathLike(MailboxPath path) throws MailboxException {
         List<Mailbox> mailboxList = new ArrayList<>();
         try {
@@ -156,13 +144,7 @@ public class JCRMailboxMapper extends AbstractJCRScalingMapper implements Mailbo
         return mailboxList;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.james.mailbox.store.mail.MailboxMapper#save(org.apache.james.
-     * imap.store.mail.model.Mailbox)
-     */
+    @Override
     public MailboxId save(Mailbox mailbox) throws MailboxException {
         
         try {
@@ -202,12 +184,7 @@ public class JCRMailboxMapper extends AbstractJCRScalingMapper implements Mailbo
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#hasChildren(org.apache.james.
-     * imap.store.mail.model.Mailbox)
-     */
+    @Override
     public boolean hasChildren(Mailbox mailbox, char delimiter)
             throws MailboxException, MailboxNotFoundException {
         try {
@@ -233,10 +210,7 @@ public class JCRMailboxMapper extends AbstractJCRScalingMapper implements Mailbo
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#list()
-     */
+    @Override
     public List<Mailbox> list() throws MailboxException {
         try {
             List<Mailbox> mList = new ArrayList<>();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
index f617723..33cb5d6 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
@@ -165,6 +165,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
      * Begin is not supported by level 1 JCR implementations, however we refresh
      * the session
      */
+    @Override
     protected void begin() throws MailboxException {
         try {
             getSession().refresh(true);
@@ -178,6 +179,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
      * Just call save on the underlying JCR Session, because level 1 JCR
      * implementation does not offer Transactions
      */
+    @Override
     protected void commit() throws MailboxException {
         try {
             if (getSession().hasPendingChanges()) {
@@ -192,6 +194,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
      * Rollback is not supported by level 1 JCR implementations, so just do
      * nothing
      */
+    @Override
     protected void rollback() throws MailboxException {
         try {
             // just refresh session and discard all pending changes
@@ -204,17 +207,12 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
     /**
      * Logout from open JCR Session
      */
+    @Override
     public void endRequest() {
         repository.logout(mailboxSession);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.james.mailbox.store.mail.MessageMapper#countMessagesInMailbox
-     * ()
-     */
+    @Override
     public long countMessagesInMailbox(Mailbox mailbox) throws MailboxException {
         try {
             // we use order by because without it count will always be 0 in
@@ -245,6 +243,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
      * @see org.apache.james.mailbox.store.mail.MessageMapper#
      * countUnseenMessagesInMailbox ()
      */
+    @Override
     public long countUnseenMessagesInMailbox(Mailbox mailbox) throws MailboxException {
 
         try {
@@ -271,14 +270,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.james.mailbox.store.mail.MessageMapper#delete(org.apache.james
-     * .mailbox.store.mail.model.Mailbox,
-     * org.apache.james.mailbox.store.mail.model.MailboxMessage)
-     */
+    @Override
     public void delete(Mailbox mailbox, MailboxMessage message) throws MailboxException {
         JCRMailboxMessage membership = (JCRMailboxMessage) message;
         if (membership.isPersistent()) {
@@ -291,15 +283,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.james.mailbox.store.mail.MessageMapper#findInMailbox(org.apache
-     * .james.mailbox.store.mail.model.Mailbox,
-     * org.apache.james.mailbox.MessageRange,
-     * org.apache.james.mailbox.store.mail.MessageMapper.FetchType, int)
-     */
+    @Override
     public Iterator<MailboxMessage> findInMailbox(Mailbox mailbox, MessageRange set, FetchType fType, int max)
             throws MailboxException {
         try {
@@ -339,6 +323,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
      * @see org.apache.james.mailbox.store.mail.MessageMapper#
      * findRecentMessageUidsInMailbox ()
      */
+    @Override
     public List<MessageUid> findRecentMessageUidsInMailbox(Mailbox mailbox) throws MailboxException {
 
         try {
@@ -420,12 +405,6 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
         }
     }
 
-    /**
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.mailbox.store.mail.MessageMapper#move(org.apache.james.mailbox.store.mail.model.Mailbox,
-     *      MailboxMessage)
-     */
     @Override
     public MessageMetaData move(Mailbox mailbox, MailboxMessage original) throws MailboxException {
         throw new UnsupportedOperationException("Not implemented - see https://issues.apache.org/jira/browse/IMAP-370");

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java
index 00a0b79..85feb13 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java
@@ -80,10 +80,7 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent {
         return new MailboxPath(getNamespace(), getUser(), getName());
     }
    
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getName()
-     */
+    @Override
     public String getName() {
         if (isPersistent()) {
             try {
@@ -95,10 +92,7 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent {
         return name;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getUidValidity()
-     */
+    @Override
     public long getUidValidity() {
         if (isPersistent()) {
             try {
@@ -110,11 +104,8 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent {
         return uidValidity;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#setName(java.lang.String)
-     */
-    public void setName(String name) {  
+    @Override
+    public void setName(String name) {
         if (isPersistent()) {
             try {
                 node.setProperty(NAME_PROPERTY, name);
@@ -130,26 +121,17 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent {
     }
 
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.jcr.Persistent#getNode()
-     */
+    @Override
     public Node getNode() {
         return node;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.jcr.Persistent#isPersistent()
-     */
+    @Override
     public boolean isPersistent() {
         return node != null;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.jcr.Persistent#merge(javax.jcr.Node)
-     */
+    @Override
     public void  merge(Node node) throws RepositoryException {
         node.setProperty(NAME_PROPERTY, getName());
         node.setProperty(UIDVALIDITY_PROPERTY, getUidValidity());
@@ -222,6 +204,7 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent {
         
     }
 
+    @Override
     public String getNamespace() {
         if (isPersistent()) {
             try {
@@ -233,10 +216,7 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent {
         return namespace;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getUser()
-     */
+    @Override
     public String getUser() {
         if (isPersistent()) {
             try {
@@ -253,10 +233,7 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent {
         return user;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#setNamespace(java.lang.String)
-     */
+    @Override
     public void setNamespace(String namespace) {
         if (isPersistent()) {
             try {
@@ -270,10 +247,7 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent {
     }
 
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#setUser(java.lang.String)
-     */
+    @Override
     public void setUser(String user) {
         if (isPersistent()) {
             try {
@@ -311,18 +285,12 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent {
         return highestKnownModSeq;
     }
     
-    /* (non-Javadoc)
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getACL()
-     */
     @Override
     public MailboxACL getACL() {
         // TODO ACL support
         return MailboxACL.OWNER_FULL_ACL;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#setACL(org.apache.james.mailbox.MailboxACL)
-     */
     @Override
     public void setACL(MailboxACL acl) {
         // TODO ACL support

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
index db44898..b939b48 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
@@ -72,11 +72,7 @@ public class JCRProperty implements JCRImapConstants, Persistent, Property {
         return order;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.mailbox.jcr.IsPersistent#getNode()
-     */
+    @Override
     public Node getNode() {
         return node;
     }
@@ -86,6 +82,7 @@ public class JCRProperty implements JCRImapConstants, Persistent, Property {
      * 
      * @see org.apache.james.mailbox.store.mail.model.Property#getLocalName()
      */
+    @Override
     public String getLocalName() {
         if (isPersistent()) {
             try {
@@ -98,11 +95,7 @@ public class JCRProperty implements JCRImapConstants, Persistent, Property {
         return localName;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.mailbox.store.mail.model.Property#getNamespace()
-     */
+    @Override
     public String getNamespace() {
         if (isPersistent()) {
             try {
@@ -115,11 +108,7 @@ public class JCRProperty implements JCRImapConstants, Persistent, Property {
         return namespace;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.mailbox.store.mail.model.Property#getValue()
-     */
+    @Override
     public String getValue() {
         if (isPersistent()) {
             try {
@@ -132,20 +121,12 @@ public class JCRProperty implements JCRImapConstants, Persistent, Property {
         return value;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.mailbox.jcr.IsPersistent#isPersistent()
-     */
+    @Override
     public boolean isPersistent() {
         return node != null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.mailbox.jcr.IsPersistent#merge(javax.jcr.Node)
-     */
+    @Override
     public void merge(Node node) throws RepositoryException {
         node.setProperty(NAMESPACE_PROPERTY, getNamespace());
         node.setProperty(ORDER_PROPERTY, getOrder());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java
index dfe7857..ed0c1f0 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java
@@ -55,13 +55,7 @@ public class JCRSubscriptionMapper extends AbstractJCRScalingMapper implements S
         super(repos,session, scaling);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.james.mailbox.store.user.SubscriptionMapper#delete(org.apache
-     * .james.imap.store.user.model.Subscription)
-     */
+    @Override
     public void delete(Subscription subscription) throws SubscriptionException {
 
         JCRSubscription sub = (JCRSubscription) subscription;
@@ -92,12 +86,7 @@ public class JCRSubscriptionMapper extends AbstractJCRScalingMapper implements S
 
     }
 
-
-
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#findMailboxSubscriptionForUser(java.lang.String, java.lang.String)
-     */
+    @Override
     public Subscription findMailboxSubscriptionForUser(String user, String mailbox) throws SubscriptionException {
         try {
             String queryString = "/jcr:root/" + MAILBOXES_PATH + "//element(*,jamesMailbox:user)[@" + JCRSubscription.USERNAME_PROPERTY + "='" + user + "'] AND [@" + JCRSubscription.MAILBOXES_PROPERTY + "='" + mailbox + "']";
@@ -119,13 +108,7 @@ public class JCRSubscriptionMapper extends AbstractJCRScalingMapper implements S
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.james.mailbox.store.user.SubscriptionMapper#findSubscriptionsForUser
-     * (java.lang.String)
-     */
+    @Override
     public List<Subscription> findSubscriptionsForUser(String user) throws SubscriptionException {
         List<Subscription> subList = new ArrayList<>();
         try {
@@ -155,13 +138,7 @@ public class JCRSubscriptionMapper extends AbstractJCRScalingMapper implements S
 
 
     
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.james.mailbox.store.user.SubscriptionMapper#save(org.apache.james
-     * .imap.store.user.model.Subscription)
-     */
+    @Override
     public void save(Subscription subscription) throws SubscriptionException {
         String username = subscription.getUser();
         String mailbox = subscription.getMailbox();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java
index b7807b1..1053349 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java
@@ -58,20 +58,12 @@ public class JCRSubscription implements Subscription, Persistent, JCRImapConstan
         this.mailbox = mailbox;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.mailbox.store.user.model.Subscription#getMailboxPath()
-     */
+    @Override
     public String getMailbox() {
         return mailbox;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.mailbox.store.user.model.Subscription#getUser()
-     */
+    @Override
     public String getUser() {
         if (isPersistent()) {
             try {
@@ -84,28 +76,18 @@ public class JCRSubscription implements Subscription, Persistent, JCRImapConstan
         return username;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.mailbox.jcr.NodeAware#getNode()
-     */
+    @Override
     public Node getNode() {
         return node;
     }
 
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.jcr.IsPersistent#isPersistent()
-     */
+    @Override
     public boolean isPersistent() {
         return node != null;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.jcr.IsPersistent#merge(javax.jcr.Node)
-     */
+    @Override
     public void merge(Node node) throws RepositoryException {
         node.setProperty(USERNAME_PROPERTY, getUser());
         if (node.hasProperty(MAILBOXES_PROPERTY)) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerStressTest.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerStressTest.java b/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerStressTest.java
index eb9877b..fce7181 100644
--- a/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerStressTest.java
+++ b/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerStressTest.java
@@ -38,6 +38,7 @@ public class JCRMailboxManagerStressTest extends MailboxManagerStressTest {
 
     private Optional<RepositoryImpl> repository = Optional.empty();
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java b/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java
index 067afbd..518618e 100644
--- a/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java
+++ b/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java
@@ -37,6 +37,7 @@ public class JCRMailboxManagerTest extends MailboxManagerTest {
 
     private Optional<RepositoryImpl> repository = Optional.empty();
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();
@@ -55,6 +56,7 @@ public class JCRMailboxManagerTest extends MailboxManagerTest {
         return JCRMailboxManagerProvider.provideMailboxManager(user, pass, workspace, repository.get());
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         super.tearDown();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java
index 8251052..bd6a1a8 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java
@@ -36,9 +36,7 @@ public class JPASubscriptionManager extends StoreSubscriptionManager {
         super(mapperFactory);
     }
     
-    /**
-     * @see org.apache.james.mailbox.store.StoreSubscriptionManager#createSubscription(org.apache.james.mailbox.MailboxSession, java.lang.String)
-     */
+    @Override
     protected Subscription createSubscription(MailboxSession session, String mailbox) {
         return new JPASubscription(session.getUser().getUserName(), mailbox);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPATransactionalMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPATransactionalMapper.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPATransactionalMapper.java
index 2ec1fe7..6e053fa 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPATransactionalMapper.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPATransactionalMapper.java
@@ -52,9 +52,7 @@ public abstract class JPATransactionalMapper extends TransactionalMapper {
         return entityManager;
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.transaction.TransactionalMapper#begin()
-     */
+    @Override
     protected void begin() throws MailboxException {
         try {
             getEntityManager().getTransaction().begin();
@@ -66,6 +64,7 @@ public abstract class JPATransactionalMapper extends TransactionalMapper {
     /**
      * Commit the Transaction and close the EntityManager
      */
+    @Override
     protected void commit() throws MailboxException {
         try {
             getEntityManager().getTransaction().commit();
@@ -74,9 +73,7 @@ public abstract class JPATransactionalMapper extends TransactionalMapper {
         }
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.transaction.TransactionalMapper#rollback()
-     */
+    @Override
     protected void rollback() throws MailboxException {
         EntityTransaction transaction = entityManager.getTransaction();
         // check if we have a transaction to rollback
@@ -88,6 +85,7 @@ public abstract class JPATransactionalMapper extends TransactionalMapper {
     /**
      * Close open {@link EntityManager}
      */
+    @Override
     public void endRequest() {
         if (entityManager != null) {
             if (entityManager.isOpen()) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java
index 52859fc..8bc2df8 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java
@@ -78,9 +78,7 @@ public class JPAMailboxMapper extends JPATransactionalMapper implements MailboxM
         }
     }
     
-    /**
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#save(Mailbox)
-     */
+    @Override
     public MailboxId save(Mailbox mailbox) throws MailboxException {
         try {
             if (isPathAlreadyUsedByAnotherMailbox(mailbox)) {
@@ -109,9 +107,7 @@ public class JPAMailboxMapper extends JPATransactionalMapper implements MailboxM
         }
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxByPath(MailboxPath)
-     */
+    @Override
     public Mailbox findMailboxByPath(MailboxPath mailboxPath) throws MailboxException, MailboxNotFoundException {
         try {
             if (mailboxPath.getUser() == null) {
@@ -147,9 +143,7 @@ public class JPAMailboxMapper extends JPATransactionalMapper implements MailboxM
         } 
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#delete(Mailbox)
-     */
+    @Override
     public void delete(Mailbox mailbox) throws MailboxException {
         try {  
             JPAId mailboxId = (JPAId) mailbox.getMailboxId();
@@ -161,9 +155,7 @@ public class JPAMailboxMapper extends JPATransactionalMapper implements MailboxM
         } 
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxWithPathLike(MailboxPath)
-     */
+    @Override
     public List<Mailbox> findMailboxWithPathLike(MailboxPath path) throws MailboxException {
         try {
             if (path.getUser() == null) {
@@ -199,9 +191,7 @@ public class JPAMailboxMapper extends JPATransactionalMapper implements MailboxM
         } 
     }
     
-    /**
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#hasChildren(Mailbox, char)
-     */
+    @Override
     public boolean hasChildren(Mailbox mailbox, char delimiter) throws MailboxException,
             MailboxNotFoundException {
         final String name = mailbox.getName() + delimiter + SQL_WILDCARD_CHAR; 
@@ -214,9 +204,7 @@ public class JPAMailboxMapper extends JPATransactionalMapper implements MailboxM
         return numberOfChildMailboxes != null && numberOfChildMailboxes > 0;
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#list()
-     */
+    @Override
     public List<Mailbox> list() throws MailboxException {
         try {
             return getEntityManager().createNamedQuery("listMailboxes", Mailbox.class).getResultList();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
index ea8b542..63d35c4 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
@@ -23,6 +23,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+
 import javax.mail.Flags;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceException;
@@ -85,11 +86,6 @@ public class JPAMessageMapper extends JPATransactionalMapper implements MessageM
         return Iterators.transform(findInMailbox(mailbox, MessageRange.all(), FetchType.Full, UNLIMITED), MailboxMessage::getUid);
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MessageMapper#findInMailbox(org.apache.james.mailbox.store.mail.model.Mailbox,
-     *      org.apache.james.mailbox.model.MessageRange,
-     *      org.apache.james.mailbox.store.mail.MessageMapper.FetchType, int)
-     */
     @Override
     public Iterator<MailboxMessage> findInMailbox(Mailbox mailbox, MessageRange set, FetchType fType, int max)
             throws MailboxException {
@@ -123,9 +119,7 @@ public class JPAMessageMapper extends JPATransactionalMapper implements MessageM
         }
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MessageMapper#countMessagesInMailbox(Mailbox)
-     */
+    @Override
     public long countMessagesInMailbox(Mailbox mailbox) throws MailboxException {
         try {
             JPAId mailboxId = (JPAId) mailbox.getMailboxId();
@@ -136,9 +130,7 @@ public class JPAMessageMapper extends JPATransactionalMapper implements MessageM
         }
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MessageMapper#countUnseenMessagesInMailbox(Mailbox)
-     */
+    @Override
     public long countUnseenMessagesInMailbox(Mailbox mailbox) throws MailboxException {
         try {
             JPAId mailboxId = (JPAId) mailbox.getMailboxId();
@@ -149,10 +141,7 @@ public class JPAMessageMapper extends JPATransactionalMapper implements MessageM
         }
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MessageMapper#delete(org.apache.james.mailbox.store.mail.model.Mailbox,
-     *      MailboxMessage)
-     */
+    @Override
     public void delete(Mailbox mailbox, MailboxMessage message) throws MailboxException {
         try {
             AbstractJPAMailboxMessage jpaMessage = getEntityManager().find(AbstractJPAMailboxMessage.class, buildKey(mailbox, message));
@@ -190,6 +179,7 @@ public class JPAMessageMapper extends JPATransactionalMapper implements MessageM
         }
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public List<MessageUid> findRecentMessageUidsInMailbox(Mailbox mailbox) throws MailboxException {
         try {
@@ -247,12 +237,6 @@ public class JPAMessageMapper extends JPATransactionalMapper implements MessageM
         }
     }
 
-    /**
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.mailbox.store.mail.MessageMapper#move(org.apache.james.mailbox.store.mail.model.Mailbox,
-     *      MailboxMessage)
-     */
     @Override
     public MessageMetaData move(Mailbox mailbox, MailboxMessage original) throws MailboxException {
         throw new UnsupportedOperationException("Not implemented - see https://issues.apache.org/jira/browse/IMAP-370");

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
index 34992d2..eb3df49 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
@@ -122,9 +122,7 @@ public class JPAMailbox implements Mailbox {
         this(mailbox.generateAssociatedPath(), mailbox.getUidValidity());
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getMailboxId()
-     */
+    @Override
     public JPAId getMailboxId() {
         return JPAId.of(mailboxId);
     }
@@ -134,20 +132,17 @@ public class JPAMailbox implements Mailbox {
         this.mailboxId = ((JPAId)mailboxId).getRawId();
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getUidValidity()
-     */
+    @Override
     public long getUidValidity() {
         return uidValidity;
     }
     
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#setName(java.lang.String)
-     */
+    @Override
     public void setName(String name) {
         this.name = name;
     }
@@ -192,30 +187,22 @@ public class JPAMailbox implements Mailbox {
         return true;
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getNamespace()
-     */
+    @Override
     public String getNamespace() {
         return namespace;
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getUser()
-     */
+    @Override
     public String getUser() {
         return user;
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#setNamespace(java.lang.String)
-     */
+    @Override
     public void setNamespace(String namespace) {
         this.namespace = namespace;
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#setUser(java.lang.String)
-     */
+    @Override
     public void setUser(String user) {
         this.user = user;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAProperty.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAProperty.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAProperty.java
index f9d1c33..f3930a9 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAProperty.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAProperty.java
@@ -120,6 +120,7 @@ public class JPAProperty implements Property {
      * 
      * @return not null
      */
+    @Override
     public String getLocalName() {
         return localName;
     }
@@ -129,6 +130,7 @@ public class JPAProperty implements Property {
      * 
      * @return not null
      */
+    @Override
     public String getNamespace() {
         return namespace;
     }
@@ -138,6 +140,7 @@ public class JPAProperty implements Property {
      * 
      * @return not null
      */
+    @Override
     public String getValue() {
         return value;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java
index 1ab9117..0a37886 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java
@@ -330,34 +330,22 @@ public abstract class AbstractJPAMailboxMessage implements MailboxMessage {
             .build();
     }
 
-    /**
-     * @see MailboxMessage#getModSeq()
-     */
+    @Override
     public long getModSeq() {
         return modSeq;
     }
 
-    /**
-     * @see MailboxMessage#setModSeq(long)
-     */
+    @Override
     public void setModSeq(long modSeq) {
         this.modSeq = modSeq;
     }
 
-    /**
-     * Gets the top level MIME content media type.
-     *
-     * @return top level MIME content media type, or null if default
-     */
+    @Override
     public String getMediaType() {
         return mediaType;
     }
 
-    /**
-     * Gets the MIME content subtype.
-     *
-     * @return the MIME content subtype, or null if default
-     */
+    @Override
     public String getSubType() {
         return subType;
     }
@@ -369,22 +357,17 @@ public abstract class AbstractJPAMailboxMessage implements MailboxMessage {
      *
      * @return unmodifiable list of meta-data, not null
      */
+    @Override
     public List<Property> getProperties() {
         return new ArrayList<>(properties);
     }
 
-    /**
-     * Gets the number of CRLF in a textual document.
-     *
-     * @return CRLF count when document is textual, null otherwise
-     */
+    @Override
     public Long getTextualLineCount() {
         return textualLineCount;
     }
 
-    /**
-     * @see MailboxMessage#getFullContentOctets()
-     */
+    @Override
     public long getFullContentOctets() {
         return contentOctets;
     }
@@ -393,9 +376,7 @@ public abstract class AbstractJPAMailboxMessage implements MailboxMessage {
         return bodyStartOctet;
     }
 
-    /**
-     * @see MailboxMessage#getInternalDate()
-     */
+    @Override
     public Date getInternalDate() {
         return internalDate;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/user/JPASubscriptionMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/user/JPASubscriptionMapper.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/user/JPASubscriptionMapper.java
index 5759b81..7d41117 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/user/JPASubscriptionMapper.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/user/JPASubscriptionMapper.java
@@ -39,9 +39,7 @@ public class JPASubscriptionMapper extends JPATransactionalMapper implements Sub
     }
 
     
-    /**
-     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#findMailboxSubscriptionForUser(java.lang.String, java.lang.String)
-     */
+    @Override
     public Subscription findMailboxSubscriptionForUser(String user, String mailbox) throws SubscriptionException {
         try {
             return (Subscription) getEntityManager().createNamedQuery("findFindMailboxSubscriptionForUser")
@@ -53,10 +51,7 @@ public class JPASubscriptionMapper extends JPATransactionalMapper implements Sub
         }
     }
 
-    /**
-     * @throws SubscriptionException 
-     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#save(Subscription)
-     */
+    @Override
     public void save(Subscription subscription) throws SubscriptionException {
         try {
             getEntityManager().persist(subscription);
@@ -65,10 +60,7 @@ public class JPASubscriptionMapper extends JPATransactionalMapper implements Sub
         }
     }
 
-    /**
-     * @throws SubscriptionException 
-     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#findSubscriptionsForUser(java.lang.String)
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public List<Subscription> findSubscriptionsForUser(String user) throws SubscriptionException {
         try {
@@ -78,10 +70,7 @@ public class JPASubscriptionMapper extends JPATransactionalMapper implements Sub
         }
     }
 
-    /**
-     * @throws SubscriptionException 
-     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#delete(Subscription)
-     */
+    @Override
     public void delete(Subscription subscription) throws SubscriptionException {
         try {
             getEntityManager().remove(subscription);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/user/model/JPASubscription.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/user/model/JPASubscription.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/user/model/JPASubscription.java
index edb2c3f..359f007 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/user/model/JPASubscription.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/user/model/JPASubscription.java
@@ -85,16 +85,12 @@ public class JPASubscription implements Subscription {
         this.mailbox = mailbox;
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.user.model.Subscription#getMailbox()
-     */
+    @Override
     public String getMailbox() {
         return mailbox;
     }
     
-    /**
-     * @see org.apache.james.mailbox.store.user.model.Subscription#getUser()
-     */
+    @Override
     public String getUser() {
         return username;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java
index 0b5f58f..3c75021 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java
@@ -33,6 +33,7 @@ public class JPAMailboxManagerTest extends MailboxManagerTest {
     private static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
     private Optional<OpenJPAMailboxManager> openJPAMailboxManager = Optional.empty();
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();
@@ -46,6 +47,7 @@ public class JPAMailboxManagerTest extends MailboxManagerTest {
         return openJPAMailboxManager.get();
     }
 
+    @Override
     @After
     public void tearDown() throws MailboxException {
         JPA_TEST_CLUSTER.clear(JPAMailboxFixture.MAILBOX_TABLE_NAMES);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java
index 43bea41..cc6947f 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java
@@ -51,6 +51,7 @@ public class JPASubscriptionManagerTest extends AbstractSubscriptionManagerTest
         return new JPASubscriptionManager(mf);
     }
 
+    @Override
     @After
     public void teardown() throws SubscriptionException {
         JPA_TEST_CLUSTER.clear(JPAMailboxFixture.MAILBOX_TABLE_NAMES);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerStressTest.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerStressTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerStressTest.java
index 3ddf4cd..758bd66 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerStressTest.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerStressTest.java
@@ -34,6 +34,7 @@ public class JpaMailboxManagerStressTest extends MailboxManagerStressTest {
     private static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
     private Optional<OpenJPAMailboxManager> openJPAMailboxManager = Optional.empty();
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaAnnotationMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaAnnotationMapperTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaAnnotationMapperTest.java
index c35cbf3..e6b0dfa 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaAnnotationMapperTest.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaAnnotationMapperTest.java
@@ -29,6 +29,7 @@ public class JpaAnnotationMapperTest extends AnnotationMapperTest {
 
     public static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMailboxMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMailboxMapperTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMailboxMapperTest.java
index 224b8f1..2d0bbc5 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMailboxMapperTest.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMailboxMapperTest.java
@@ -30,6 +30,7 @@ public class JpaMailboxMapperTest extends MailboxMapperTest {
 
     public static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMessageMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMessageMapperTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMessageMapperTest.java
index 2e9328e..dba6c5b 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMessageMapperTest.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMessageMapperTest.java
@@ -30,6 +30,7 @@ public class JpaMessageMapperTest extends MessageMapperTest {
 
     public static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java
----------------------------------------------------------------------
diff --git a/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java b/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java
index e2e42c3..74ce42f 100644
--- a/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java
+++ b/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java
@@ -50,6 +50,7 @@ public class KafkaMessageConsumer implements MessageConsumer {
             this.stream = stream;
         }
 
+        @Override
         public void run() {
             for (MessageAndMetadata<byte[], byte[]> message : stream) {
                 messageReceiver.receiveSerializedEvent(message.message());
@@ -86,6 +87,7 @@ public class KafkaMessageConsumer implements MessageConsumer {
         }
     }
 
+    @Override
     @PreDestroy
     public void destroy() {
         if (consumer != null) {
@@ -97,6 +99,7 @@ public class KafkaMessageConsumer implements MessageConsumer {
         this.isInitialized = false;
     }
 
+    @Override
     @PostConstruct
     public void init(Topic topic) {
         if (!isInitialized) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
----------------------------------------------------------------------
diff --git a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
index ed7df14..557ebcb 100644
--- a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
+++ b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
@@ -1247,9 +1247,6 @@ public class LuceneMessageSearchIndex extends ListeningMessageSearchIndex {
 
     
 
-    /**
-     * @see org.apache.james.mailbox.store.search.ListeningMessageSearchIndex#add(org.apache.james.mailbox.MailboxSession, org.apache.james.mailbox.store.mail.model.Mailbox, MailboxMessage)
-     */
     @Override
     public void add(MailboxSession session, Mailbox mailbox, MailboxMessage membership) throws MailboxException {
         Document doc = createMessageDocument(session, membership);
@@ -1263,9 +1260,6 @@ public class LuceneMessageSearchIndex extends ListeningMessageSearchIndex {
         }
     }
 
-    /**
-     * @see ListeningMessageSearchIndex#update
-     */
     @Override
     public void update(MailboxSession session, Mailbox mailbox, List<UpdatedFlags> updatedFlagsList) throws MailboxException {
         for (UpdatedFlags updatedFlags : updatedFlagsList) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/StrictImapSearchAnalyzer.java
----------------------------------------------------------------------
diff --git a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/StrictImapSearchAnalyzer.java b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/StrictImapSearchAnalyzer.java
index 885d059..a351915 100644
--- a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/StrictImapSearchAnalyzer.java
+++ b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/StrictImapSearchAnalyzer.java
@@ -53,6 +53,7 @@ public final class StrictImapSearchAnalyzer extends Analyzer {
    /**
     * @see org.apache.lucene.analysis.Analyzer#tokenStream(java.lang.String, java.io.Reader)
     */
+   @Override
    public TokenStream tokenStream(String fieldName, Reader reader) {
        return new NGramTokenFilter(new UpperCaseFilter(new SentenceTokenizer(reader)), minTokenLength, maxTokenLength);
    }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java
----------------------------------------------------------------------
diff --git a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java
index d838f96..fdcead1 100644
--- a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java
+++ b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java
@@ -644,6 +644,7 @@ public class LuceneMailboxMessageSearchIndexTest {
             this.id = TestId.of(id);
         }
 
+        @Override
         public void setMailboxId(MailboxId id) {
         }
 
@@ -652,35 +653,43 @@ public class LuceneMailboxMessageSearchIndexTest {
             return new MailboxPath(getNamespace(), getUser(), getName());
         }
 
+        @Override
         public TestId getMailboxId() {
             return id;
         }
 
+        @Override
         public String getNamespace() {
             throw new UnsupportedOperationException("Not supported");
         }
 
+        @Override
         public void setNamespace(String namespace) {
             throw new UnsupportedOperationException("Not supported");
         }
 
+        @Override
         public String getUser() {
             throw new UnsupportedOperationException("Not supported");
         }
 
+        @Override
         public void setUser(String user) {
             throw new UnsupportedOperationException("Not supported");
         }
 
+        @Override
         public String getName() {
             return id.serialize();
         }
 
+        @Override
         public void setName(String name) {
             throw new UnsupportedOperationException("Not supported");
 
         }
 
+        @Override
         public long getUidValidity() {
             return 0;
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
index 3400448..55092c9 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
@@ -69,9 +69,6 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail
         this.session = session;
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#delete(org.apache.james.mailbox.store.mail.model.Mailbox)
-     */
     @Override
     public void delete(Mailbox mailbox) throws MailboxException {
         
@@ -109,9 +106,6 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail
         }
     }
    
-    /**
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxByPath(org.apache.james.mailbox.model.MailboxPath)
-     */
     @Override
     public Mailbox findMailboxByPath(MailboxPath mailboxPath)
             throws MailboxException, MailboxNotFoundException {      
@@ -125,9 +119,6 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail
         return getCachedMailbox(mailboxId);
     }
     
-    /**
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxWithPathLike(org.apache.james.mailbox.model.MailboxPath)
-     */
     @Override
     public List<Mailbox> findMailboxWithPathLike(MailboxPath mailboxPath)
             throws MailboxException {
@@ -151,9 +142,6 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail
         return mailboxList;
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#hasChildren(org.apache.james.mailbox.store.mail.model.Mailbox, char)
-     */
     @Override
     public boolean hasChildren(Mailbox mailbox, char delimiter) throws MailboxException, MailboxNotFoundException {
         String searchString = mailbox.getName() + MaildirStore.maildirDelimiter + MaildirStore.WILDCARD;
@@ -162,9 +150,6 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail
         return (mailboxes.size() > 0);
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#save(org.apache.james.mailbox.store.mail.model.Mailbox)
-     */
     @Override
     public MailboxId save(Mailbox mailbox) throws MailboxException {
         try {
@@ -249,9 +234,6 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail
         return mailbox.getMailboxId();
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#list()
-     */
     @Override
     public List<Mailbox> list() throws MailboxException {
         
@@ -273,9 +255,6 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail
         
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.transaction.TransactionalMapper#endRequest()
-     */
     @Override
     public void endRequest() {
         mailboxCache.clear();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
index 601b873..dd4697d 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
@@ -147,11 +147,6 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
         }
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MessageMapper#updateFlags(org.apache.james.mailbox.store.mail.model.Mailbox,
-     *      javax.mail.Flags, boolean, boolean,
-     *      org.apache.james.mailbox.model.MessageRange)
-     */
     @Override
     public Iterator<UpdatedFlags> updateFlags(Mailbox mailbox, FlagsUpdateCalculator flagsUpdateCalculator, MessageRange set) throws MailboxException {
         final List<UpdatedFlags> updatedFlags = new ArrayList<>();
@@ -247,12 +242,6 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
         return uids;
     }
 
-    /**
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.mailbox.store.mail.MessageMapper#move(org.apache.james.mailbox.store.mail.model.Mailbox,
-     *      MailboxMessage)
-     */
     @Override
     public MessageMetaData move(Mailbox mailbox, MailboxMessage original) throws MailboxException {
         throw new UnsupportedOperationException("Not implemented - see https://issues.apache.org/jira/browse/IMAP-370");
@@ -268,10 +257,6 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
         return save(mailbox, theCopy);
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.AbstractMessageMapper#save(org.apache.james.mailbox.store.mail.model.Mailbox,
-     *      MailboxMessage)
-     */
     @Override
     protected MessageMetaData save(Mailbox mailbox, MailboxMessage message) throws MailboxException {
         MaildirFolder folder = maildirStore.createMaildirFolder(mailbox);
@@ -346,9 +331,6 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
             .computeApplicableFlags();
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.transaction.TransactionalMapper#endRequest()
-     */
     @Override
     public void endRequest() {
         // not used
@@ -435,25 +417,16 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
 
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.transaction.TransactionalMapper#begin()
-     */
     @Override
     protected void begin() throws MailboxException {
         // nothing to do
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.transaction.TransactionalMapper#commit()
-     */
     @Override
     protected void commit() throws MailboxException {
         // nothing to do
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.transaction.TransactionalMapper#rollback()
-     */
     @Override
     protected void rollback() throws MailboxException {
         // nothing to do

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java
index fc1a2c1..b235c89 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java
@@ -49,9 +49,6 @@ public class MaildirSubscriptionMapper extends NonTransactionalMapper implements
         this.store = store;
     }
     
-    /**
-     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#delete(org.apache.james.mailbox.store.user.model.Subscription)
-     */
     @Override
     public void delete(Subscription subscription) throws SubscriptionException {
         // TODO: we need some kind of file locking here
@@ -67,9 +64,6 @@ public class MaildirSubscriptionMapper extends NonTransactionalMapper implements
         }
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#findSubscriptionsForUser(java.lang.String)
-     */
     @Override
     public List<Subscription> findSubscriptionsForUser(String user) throws SubscriptionException {
         Set<String> subscriptionNames = readSubscriptionsForUser(user);
@@ -78,9 +72,6 @@ public class MaildirSubscriptionMapper extends NonTransactionalMapper implements
             .collect(Guavate.toImmutableList());
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#findMailboxSubscriptionForUser(java.lang.String, java.lang.String)
-     */
     @Override
     public Subscription findMailboxSubscriptionForUser(String user, String mailbox) throws SubscriptionException {
         File userRoot = new File(store.userRoot(user));
@@ -96,9 +87,6 @@ public class MaildirSubscriptionMapper extends NonTransactionalMapper implements
         return null;
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#save(org.apache.james.mailbox.store.user.model.Subscription)
-     */
     @Override
     public void save(Subscription subscription) throws SubscriptionException {
         // TODO: we need some kind of file locking here
@@ -117,9 +105,6 @@ public class MaildirSubscriptionMapper extends NonTransactionalMapper implements
         }
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.transaction.TransactionalMapper#endRequest()
-     */
     @Override
     public void endRequest() {
         // nothing to do

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerStressTest.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerStressTest.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerStressTest.java
index d90cd2f..59a49bc 100644
--- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerStressTest.java
+++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerStressTest.java
@@ -31,6 +31,7 @@ public class DomainUserMaildirMailboxManagerStressTest extends MailboxManagerStr
     @Rule
     public TemporaryFolder tmpFolder = new TemporaryFolder();
     
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerTest.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerTest.java
index ab0a6d2..6b4e0a0 100644
--- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerTest.java
+++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerTest.java
@@ -35,6 +35,7 @@ public class DomainUserMaildirMailboxManagerTest extends MailboxManagerTest {
     @Rule
     public TemporaryFolder tmpFolder = new TemporaryFolder();
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerStressTest.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerStressTest.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerStressTest.java
index 3e87c41..9fa409a 100644
--- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerStressTest.java
+++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerStressTest.java
@@ -31,6 +31,7 @@ public class FullUserMaildirMailboxManagerStressTest extends MailboxManagerStres
     @Rule
     public TemporaryFolder tmpFolder = new TemporaryFolder();
     
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerTest.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerTest.java
index a1abd45..ad0b365 100644
--- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerTest.java
+++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerTest.java
@@ -35,6 +35,7 @@ public class FullUserMaildirMailboxManagerTest extends MailboxManagerTest {
     @Rule
     public TemporaryFolder tmpFolder = new TemporaryFolder();
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/UserMaildirMailboxManagerStressTest.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/UserMaildirMailboxManagerStressTest.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/UserMaildirMailboxManagerStressTest.java
index f12e6f4..b074c9f 100644
--- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/UserMaildirMailboxManagerStressTest.java
+++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/UserMaildirMailboxManagerStressTest.java
@@ -31,6 +31,7 @@ public class UserMaildirMailboxManagerStressTest extends MailboxManagerStressTes
     @Rule
     public TemporaryFolder tmpFolder = new TemporaryFolder();
     
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java
index fb85d67..03ac818 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java
@@ -51,9 +51,7 @@ public class InMemoryMailboxMapper implements MailboxMapper {
         mailboxesByPath = new ConcurrentHashMap<>(INITIAL_SIZE);
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#delete(org.apache.james.mailbox.store.mail.model.Mailbox)
-     */
+    @Override
     public void delete(Mailbox mailbox) throws MailboxException {
         mailboxesByPath.remove(mailbox.generateAssociatedPath());
     }
@@ -62,9 +60,7 @@ public class InMemoryMailboxMapper implements MailboxMapper {
         mailboxesByPath.clear();
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxByPath(org.apache.james.mailbox.model.MailboxPath)
-     */
+    @Override
     public synchronized Mailbox findMailboxByPath(MailboxPath path) throws MailboxException {
         Mailbox result = mailboxesByPath.get(path);
         if (result == null) {
@@ -74,6 +70,7 @@ public class InMemoryMailboxMapper implements MailboxMapper {
         }
     }
 
+    @Override
     public synchronized Mailbox findMailboxById(MailboxId id) throws MailboxException {
         InMemoryId mailboxId = (InMemoryId)id;
         for (Mailbox mailbox: mailboxesByPath.values()) {
@@ -84,9 +81,7 @@ public class InMemoryMailboxMapper implements MailboxMapper {
         throw new MailboxNotFoundException(mailboxId);
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxWithPathLike(org.apache.james.mailbox.model.MailboxPath)
-     */
+    @Override
     public List<Mailbox> findMailboxWithPathLike(MailboxPath path) throws MailboxException {
         final String regex = path.getName().replace("%", ".*");
         return mailboxesByPath.values()
@@ -102,9 +97,7 @@ public class InMemoryMailboxMapper implements MailboxMapper {
             && mailbox.getName().matches(regex);
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#save(org.apache.james.mailbox.store.mail.model.Mailbox)
-     */
+    @Override
     public MailboxId save(Mailbox mailbox) throws MailboxException {
         InMemoryId id = (InMemoryId) mailbox.getMailboxId();
         if (id == null) {
@@ -125,16 +118,12 @@ public class InMemoryMailboxMapper implements MailboxMapper {
         return mailbox.getMailboxId();
     }
 
-    /**
-     * Do nothing
-     */
+    @Override
     public void endRequest() {
         // Do nothing
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#hasChildren(org.apache.james.mailbox.store.mail.model.Mailbox, char)
-     */
+    @Override
     public boolean hasChildren(Mailbox mailbox, char delimiter) throws MailboxException {
         String mailboxName = mailbox.getName() + delimiter;
         return mailboxesByPath.values()
@@ -147,13 +136,12 @@ public class InMemoryMailboxMapper implements MailboxMapper {
             && Objects.equal(mailbox.getUser(), otherMailbox.getUser());
     }
 
-    /**
-     * @see org.apache.james.mailbox.store.mail.MailboxMapper#list()
-     */
+    @Override
     public List<Mailbox> list() throws MailboxException {
         return new ArrayList<>(mailboxesByPath.values());
     }
 
+    @Override
     public <T> T execute(Transaction<T> transaction) throws MailboxException {
         return transaction.run();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/user/InMemorySubscriptionMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/user/InMemorySubscriptionMapper.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/user/InMemorySubscriptionMapper.java
index 48679ea..d0c8336 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/user/InMemorySubscriptionMapper.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/user/InMemorySubscriptionMapper.java
@@ -37,10 +37,12 @@ public class InMemorySubscriptionMapper extends NonTransactionalMapper implement
         subscriptionsByUser = Multimaps.synchronizedListMultimap(ArrayListMultimap.create());
     }
 
+    @Override
     public synchronized void delete(Subscription subscription) {
         subscriptionsByUser.remove(subscription.getUser(), subscription);
     }
 
+    @Override
     public Subscription findMailboxSubscriptionForUser(String user, String mailbox) {
         final List<Subscription> subscriptions = ImmutableList.copyOf(subscriptionsByUser.get(user));
         if (subscriptions != null) {
@@ -52,6 +54,7 @@ public class InMemorySubscriptionMapper extends NonTransactionalMapper implement
         return null;
     }
 
+    @Override
     public List<Subscription> findSubscriptionsForUser(String user) {
         final List<Subscription> subcriptions = subscriptionsByUser.get(user);
         if (subcriptions == null) {
@@ -60,6 +63,7 @@ public class InMemorySubscriptionMapper extends NonTransactionalMapper implement
         return ImmutableList.copyOf(subcriptions);
     }
 
+    @Override
     public synchronized void save(Subscription subscription) {
         subscriptionsByUser.put(subscription.getUser(), subscription);
     }
@@ -68,6 +72,7 @@ public class InMemorySubscriptionMapper extends NonTransactionalMapper implement
         subscriptionsByUser.clear();
     }
 
+    @Override
     public void endRequest() {
         // nothing to do
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTest.java
index 75ceb4c..4866f1f 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTest.java
@@ -25,6 +25,7 @@ import org.junit.Before;
 
 public class InMemoryCombinationManagerTest extends AbstractCombinationManagerTest {
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();


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


[22/22] james-project git commit: JAMES-2352 Deprecate method whose Javadoc says so.

Posted by ma...@apache.org.
JAMES-2352 Deprecate method whose Javadoc says so.


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/5f74a300
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/5f74a300
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/5f74a300

Branch: refs/heads/master
Commit: 5f74a30054112642d777ecd56b2c5bb6374108c1
Parents: 6f75e23
Author: benwa <bt...@linagora.com>
Authored: Thu Mar 15 17:06:03 2018 +0700
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Fri Mar 16 11:14:17 2018 +0100

----------------------------------------------------------------------
 .../james/user/file/UsersFileRepository.java    |  5 +----
 .../user/ldap/ReadOnlyUsersLDAPRepository.java  | 21 +++-----------------
 2 files changed, 4 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/5f74a300/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java b/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
index 1d47ff2..98b65ae 100644
--- a/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
+++ b/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
@@ -198,10 +198,7 @@ public class UsersFileRepository extends AbstractJamesUsersRepository {
         }
     }
 
-    /*
-     * This is not longer in the api (deprecated)
-     * @see org.apache.james.user.api.UsersRepository#containsCaseInsensitive(java.lang.String)
-     */
+    @Deprecated
     private boolean containsCaseInsensitive(String name) {
         Iterator<String> it = list();
         while (it.hasNext()) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/5f74a300/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
index 8190c5b..c7e2764 100644
--- a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
+++ b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
@@ -634,12 +634,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
         return getUserByName(name) != null;
     }
 
-    /*
-     * TODO Should this be deprecated? At least the method isn't declared in the
-     * interface anymore
-     *
-     * @see UsersRepository#containsCaseInsensitive(java.lang.String)
-     */
+    @Deprecated
     public boolean containsCaseInsensitive(String name) throws UsersRepositoryException {
         return getUserByNameCaseInsensitive(name) != null;
     }
@@ -655,12 +650,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
         }
     }
 
-    /*
-     * TODO Should this be deprecated? At least the method isn't declared in the
-     * interface anymore
-     *
-     * @see UsersRepository#getRealName(java.lang.String)
-     */
+    @Deprecated
     public String getRealName(String name) throws UsersRepositoryException {
         User u = getUserByNameCaseInsensitive(name);
         if (u != null) {
@@ -681,12 +671,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
         }
     }
 
-    /*
-     * TODO Should this be deprecated? At least the method isn't declared in the
-     * interface anymore
-     *
-     * @see UsersRepository#getUserByNameCaseInsensitive(java.lang.String)
-     */
+    @Deprecated
     public User getUserByNameCaseInsensitive(String name) throws UsersRepositoryException {
         try {
             for (ReadOnlyLDAPUser u : buildUserCollection(getValidUsers())) {


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


[21/22] james-project git commit: JAMES-2352 Reindent, remove useless comments and enhance ExceptionRetryHandlerTest a bit

Posted by ma...@apache.org.
JAMES-2352 Reindent, remove useless comments and enhance ExceptionRetryHandlerTest a bit


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6f75e238
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6f75e238
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6f75e238

Branch: refs/heads/master
Commit: 6f75e238419dd202b52b89a7fc74081251f74aa8
Parents: ddc0484
Author: benwa <bt...@linagora.com>
Authored: Thu Mar 15 17:23:25 2018 +0700
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Fri Mar 16 11:13:15 2018 +0100

----------------------------------------------------------------------
 .../util/retry/ExceptionRetryHandlerTest.java   | 196 ++++++++-----------
 1 file changed, 82 insertions(+), 114 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/6f75e238/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java b/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java
index d8a20fd..9848efd 100644
--- a/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java
+++ b/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java
@@ -33,154 +33,122 @@ import org.apache.james.util.retry.api.RetrySchedule;
 import org.junit.Before;
 import org.junit.Test;
 
-/**
- * <code>ExceptionRetryHandlerTest</code>
- */
 public class ExceptionRetryHandlerTest {
+    private static class TestRetryingProxy implements ExceptionRetryingProxy {
+
+        @Override
+        public Context getDelegate() {
+            return null;
+        }
+
+        @Override
+        public Context newDelegate() {
+            return null;
+        }
+
+        @Override
+        public void resetDelegate() {
+        }
+    }
 
     private Class<?>[] exceptionClasses = null;
     private ExceptionRetryingProxy proxy = null;
     private RetrySchedule schedule = null;
 
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
     @Before
     public void setUp() throws Exception {
-    exceptionClasses = new Class<?>[]{Exception.class};
-    proxy = new TestRetryingProxy();
-    schedule = new TestRetrySchedule();
-    }
-
-    private class TestRetryingProxy implements ExceptionRetryingProxy {
-
-    @Override
-    public Context getDelegate() {
-        return null;
-    }
-
-    @Override
-    public Context newDelegate() throws Exception {
-        return null;
-    }
-
-    @Override
-    public void resetDelegate() throws Exception {
-    }
-    }
-
-    private class TestRetrySchedule implements RetrySchedule {
-
-    @Override
-    public long getInterval(int index) {
-        return index;
-    }
+        exceptionClasses = new Class<?>[]{Exception.class};
+        proxy = new TestRetryingProxy();
+        schedule = i -> i;
     }
 
-    /**
-     * Test method for .
-     */
     @Test
     public final void testExceptionRetryHandler() {
-    assertTrue(RetryHandler.class.isAssignableFrom(new ExceptionRetryHandler(
-        exceptionClasses, proxy, schedule, 0) {
+        assertTrue(RetryHandler.class.isAssignableFrom(new ExceptionRetryHandler(
+            exceptionClasses, proxy, schedule, 0) {
 
-        @Override
-        public Object operation() throws Exception {
-        return null;
-        }
-    }.getClass()));
+            @Override
+            public Object operation() {
+                return null;
+            }
+        }.getClass()));
     }
 
-    /**
-     * Test method for .
-     * @throws Exception 
-     */
     @Test
     public final void testPerform() throws Exception {
-    Object result = new ExceptionRetryHandler(
-        exceptionClasses, proxy, schedule, 0) {
-
-        @Override
-        public Object operation() throws Exception {
-        return "Hi!";
-        }
-    }.perform();
-    assertEquals("Hi!", result);
-
-    try {
-        new ExceptionRetryHandler(
+        Object result = new ExceptionRetryHandler(
             exceptionClasses, proxy, schedule, 0) {
 
-        @Override
-        public Object operation() throws Exception {
-            throw new Exception();
-        }
+            @Override
+            public Object operation() {
+                return "Hi!";
+            }
         }.perform();
-    } catch (Exception ex) {
-        // no-op
-    }
-    assertEquals("Hi!", result);
+        assertEquals("Hi!", result);
+
+        try {
+            new ExceptionRetryHandler(
+                exceptionClasses, proxy, schedule, 0) {
+
+                @Override
+                public Object operation() throws Exception {
+                    throw new Exception();
+                }
+            }.perform();
+        } catch (Exception ex) {
+            // no-op
+        }
+        assertEquals("Hi!", result);
     }
 
-    /**
-     * Test method for .
-     */
     @Test
     public final void testPostFailure() {
-    final List<Exception> results = new ArrayList<>();
-    RetryHandler handler = new ExceptionRetryHandler(
-        exceptionClasses, proxy, schedule, 7) {
-
-        @Override
-        public void postFailure(Exception ex, int retryCount) {
-        super.postFailure(ex, retryCount);
-        results.add(ex);
-        }
-
-        @Override
-        public Object operation() throws Exception {
-        throw new Exception();
+        final List<Exception> results = new ArrayList<>();
+        RetryHandler handler = new ExceptionRetryHandler(
+            exceptionClasses, proxy, schedule, 7) {
+
+            @Override
+            public void postFailure(Exception ex, int retryCount) {
+                super.postFailure(ex, retryCount);
+                results.add(ex);
+            }
+
+            @Override
+            public Object operation() throws Exception {
+                throw new Exception();
+            }
+        };
+        try {
+            handler.perform();
+        } catch (Exception ex) {
+            // no-op
         }
-    };
-    try {
-        handler.perform();
-    } catch (Exception ex) {
-        // no-op
-    }
-    assertEquals(7, results.size());
+        assertEquals(7, results.size());
     }
 
-    /**
-     * Test method for .
-     * @throws Exception 
-     */
     @Test
     public final void testOperation() throws Exception {
-    RetryHandler handler = new ExceptionRetryHandler(
-        exceptionClasses, proxy, schedule, 0) {
+        RetryHandler handler = new ExceptionRetryHandler(
+            exceptionClasses, proxy, schedule, 0) {
 
-        @Override
-        public Object operation() throws Exception {
-        return "Hi!";
-        }
-    };
-    assertEquals("Hi!", handler.operation());
+            @Override
+            public Object operation() {
+                return "Hi!";
+            }
+        };
+        assertEquals("Hi!", handler.operation());
     }
 
-    /**
-     * Test method for .
-     */
     @Test
     public final void testGetRetryInterval() {
-    ExceptionRetryHandler handler = new ExceptionRetryHandler(
-        exceptionClasses, proxy, schedule, 0) {
+        ExceptionRetryHandler handler = new ExceptionRetryHandler(
+            exceptionClasses, proxy, schedule, 0) {
 
-        @Override
-        public Object operation() throws Exception {
-        return null;
-        }
-    };
-    assertEquals(8, handler.getRetryInterval(8));
+            @Override
+            public Object operation() {
+                return null;
+            }
+        };
+        assertEquals(8, handler.getRetryInterval(8));
     }
 }


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


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

Posted by ma...@apache.org.
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


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

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
index 6f642e6..b1dd3b5 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
@@ -62,6 +62,7 @@ public class ValidSenderDomainHandlerTest {
         return new BaseFakeSMTPSession() {
             HashMap<String,Object> map = new HashMap<>();
 
+            @Override
             public Map<String,Object> getState() {
 
                 map.put(SMTPSession.SENDER, sender);
@@ -69,10 +70,12 @@ public class ValidSenderDomainHandlerTest {
                 return map;
             }
 
+            @Override
             public boolean isRelayingAllowed() {
                 return false;
             }
 
+            @Override
             public Object setAttachment(String key, Object value, State state) {
                 if (state == State.Connection) {
                     throw new UnsupportedOperationException();
@@ -90,6 +93,7 @@ public class ValidSenderDomainHandlerTest {
              * (non-Javadoc)
              * @see org.apache.james.protocols.api.ProtocolSession#getAttachment(java.lang.String, org.apache.james.protocols.api.ProtocolSession.State)
              */
+            @Override
             public Object getAttachment(String key, State state) {
                 if (state == State.Connection) {
                     throw new UnsupportedOperationException();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java
index 456c93e..e16b4bc 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java
@@ -50,144 +50,123 @@ public class BaseFakeSMTPSession implements SMTPSession {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.SMTPSession#getConnectionState()
-     */
+    @Override
     public Map<String, Object> getConnectionState() {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.SMTPSession#getRcptCount()
-     */
+    @Override
     public int getRcptCount() {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.SMTPSession#getSessionID()
-     */
+    @Override
     public String getSessionID() {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.SMTPSession#getState()
-     */
+    @Override
     public Map<String, Object> getState() {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.SMTPSession#getUser()
-     */
+    @Override
     public String getUser() {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.SMTPSession#isAuthSupported()
-     */
+    @Override
     public boolean isAuthSupported() {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.SMTPSession#isRelayingAllowed()
-     */
+    @Override
     public boolean isRelayingAllowed() {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.SMTPSession#resetState()
-     */
+    @Override
     public void resetState() {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.SMTPSession#setRelayingAllowed(boolean)
-     */
+    @Override
     public void setRelayingAllowed(boolean relayingAllowed) {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
-    /**
-     * @see org.apache.james.protocols.smtp.SMTPSession#setUser(java.lang.String)
-     */
+    @Override
     public void setUser(String user) {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
 
-    /**
-     * @see org.apache.james.protocols.smtp.SMTPSession#popLineHandler()
-     */
+    @Override
     public void popLineHandler() {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
+    @Override
     public boolean isStartTLSSupported() {
         return false;
     }
 
+    @Override
     public boolean isTLSStarted() {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
+    @Override
     public int getPushedLineHandlerCount() {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
+    @Override
     public Response newLineTooLongResponse() {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
+    @Override
     public Response newFatalErrorResponse() {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolSession#getRemoteAddress()
-     */
+    @Override
     public InetSocketAddress getRemoteAddress() {
         return new InetSocketAddress("localhost", 22);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolSession#getLocalAddress()
-     */
+    @Override
     public InetSocketAddress getLocalAddress() {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.smtp.SMTPSession#getConfiguration()
-     */
+    @Override
     public SMTPConfiguration getConfiguration() {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
+    @Override
     public Object setAttachment(String key, Object value, State state) {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
+    @Override
     public Object getAttachment(String key, State state) {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
+    @Override
     public Charset getCharset() {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
+    @Override
     public String getLineDelimiter() {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
+    @Override
     public <T extends ProtocolSession> void pushLineHandler(LineHandler<T> overrideCommandHandler) {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java
index f8ba661..5f7c60f 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java
@@ -33,6 +33,7 @@ public class TestMessageHook implements MessageHook {
 
     private final CopyOnWriteArrayList<MailEnvelope> queued = new CopyOnWriteArrayList<>();
     
+    @Override
     public HookResult onMessage(SMTPSession session, MailEnvelope mail) {
         queued.add(mail);
         return new HookResult(HookReturnCode.OK);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/app/src/main/java/org/apache/james/app/spring/JamesAppSpringMain.java
----------------------------------------------------------------------
diff --git a/server/app/src/main/java/org/apache/james/app/spring/JamesAppSpringMain.java b/server/app/src/main/java/org/apache/james/app/spring/JamesAppSpringMain.java
index 33fb831..9c0d236 100644
--- a/server/app/src/main/java/org/apache/james/app/spring/JamesAppSpringMain.java
+++ b/server/app/src/main/java/org/apache/james/app/spring/JamesAppSpringMain.java
@@ -47,32 +47,23 @@ public class JamesAppSpringMain implements Daemon {
 
     }
 
-    /**
-     * @see org.apache.commons.daemon.Daemon#destroy()
-     */
+    @Override
     public void destroy() {
     }
 
-    /**
-     * @see
-     * org.apache.commons.daemon.Daemon#init(org.apache.commons.daemon.DaemonContext)
-     */
+    @Override
     public void init(DaemonContext arg0) throws Exception {
         context = new JamesServerApplicationContext(new String[] { "META-INF/org/apache/james/spring-server.xml" });
         context.registerShutdownHook();
         context.start();
     }
 
-    /**
-     * @see org.apache.commons.daemon.Daemon#start()
-     */
+    @Override
     public void start() throws Exception {
         context.start();
     }
 
-    /**
-     * @see org.apache.commons.daemon.Daemon#stop()
-     */
+    @Override
     public void stop() throws Exception {
         if (context != null) {
             context.stop();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java
----------------------------------------------------------------------
diff --git a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java
index debcef9..631e11b 100644
--- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java
+++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java
@@ -44,6 +44,7 @@ public class JmxDataProbe implements DataProbe, JmxProbe {
     private RecipientRewriteTableManagementMBean virtualUserTableProxy;
     private UsersRepositoryManagementMBean usersRepositoryProxy;
 
+    @Override
     public JmxDataProbe connect(JmxConnection jmxc) throws IOException {
         try {
             domainListProxy = jmxc.retrieveBean(DomainListManagementMBean.class, DOMAINLIST_OBJECT_NAME);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java
----------------------------------------------------------------------
diff --git a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java
index 70cd71b..5003645 100644
--- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java
+++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java
@@ -48,6 +48,7 @@ public class JmxMailboxProbe implements MailboxProbe, JmxProbe {
     private MailboxManagerManagementMBean mailboxManagerManagement;
     private ReIndexerManagementMBean reIndexerManagement;
 
+    @Override
     public JmxMailboxProbe connect(JmxConnection jmxc) throws IOException {
         try {
             mailboxCopierManagement = jmxc.retrieveBean(MailboxCopierManagementMBean.class, MAILBOXCOPIER_OBJECT_NAME);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java
----------------------------------------------------------------------
diff --git a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java
index 227bf1f..545d180 100644
--- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java
+++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java
@@ -36,6 +36,7 @@ public class JmxQuotaProbe implements QuotaProbe, JmxProbe {
 
     private QuotaManagementMBean quotaManagement;
 
+    @Override
     public JmxQuotaProbe connect(JmxConnection jmxc) throws IOException {
         try {
             quotaManagement = jmxc.retrieveBean(QuotaManagementMBean.class, QUOTAMANAGER_OBJECT_NAME);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java
----------------------------------------------------------------------
diff --git a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java
index 3aea481..07a98c3 100644
--- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java
+++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java
@@ -32,6 +32,7 @@ public class JmxSieveProbe implements SieveProbe, JmxProbe {
     
     private SieveRepositoryManagementMBean sieveRepositoryManagement;
     
+    @Override
     public JmxSieveProbe connect(JmxConnection jmxc) throws IOException {
         try {
             sieveRepositoryManagement = jmxc.retrieveBean(SieveRepositoryManagementMBean.class, SIEVEMANAGER_OBJECT_NAME);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/core/src/main/java/org/apache/james/server/core/JamesServerResourceLoader.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/main/java/org/apache/james/server/core/JamesServerResourceLoader.java b/server/container/core/src/main/java/org/apache/james/server/core/JamesServerResourceLoader.java
index d64dc62..2a4c66f 100644
--- a/server/container/core/src/main/java/org/apache/james/server/core/JamesServerResourceLoader.java
+++ b/server/container/core/src/main/java/org/apache/james/server/core/JamesServerResourceLoader.java
@@ -28,25 +28,17 @@ public class JamesServerResourceLoader implements JamesDirectoriesProvider {
         this.rootDirectory = rootDirectory;
     }
 
-    /**
-     * @see org.apache.james.container.spring.resource.JamesResourceLoader#getAbsoluteDirectory()
-     */
+    @Override
     public String getAbsoluteDirectory() {
         return "/";
     }
 
-    /**
-     * @see
-     * org.apache.james.container.spring.resource.JamesResourceLoader#getConfDirectory()
-     */
+    @Override
     public String getConfDirectory() {
         return getRootDirectory() + "/conf/";
     }
 
-    /**
-     * @see
-     * org.apache.james.container.spring.resource.JamesResourceLoader#getVarDirectory()
-     */
+    @Override
     public String getVarDirectory() {
         return getRootDirectory() + "/var/";
     }
@@ -61,10 +53,7 @@ public class JamesServerResourceLoader implements JamesDirectoriesProvider {
         return getRootDirectory() + "/conf/lib/";
     }
 
-    /**
-     * @see
-     * org.apache.james.container.spring.resource.JamesResourceLoader#getRootDirectory()
-     */
+    @Override
     public String getRootDirectory() {
         return rootDirectory;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/core/src/main/java/org/apache/james/server/core/MailHeaders.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MailHeaders.java b/server/container/core/src/main/java/org/apache/james/server/core/MailHeaders.java
index a2d6b52..296042c 100644
--- a/server/container/core/src/main/java/org/apache/james/server/core/MailHeaders.java
+++ b/server/container/core/src/main/java/org/apache/james/server/core/MailHeaders.java
@@ -109,6 +109,7 @@ public class MailHeaders extends InternetHeaders implements Serializable, Clonea
      * @see javax.mail.internet.InternetHeaders#addHeader(java.lang.String,
      *      java.lang.String)
      */
+    @Override
     public synchronized void addHeader(String arg0, String arg1) {
         if (RFC2822Headers.RETURN_PATH.equalsIgnoreCase(arg0)) {
             headers.add(0, new InternetHeader(arg0, arg1));
@@ -126,6 +127,7 @@ public class MailHeaders extends InternetHeaders implements Serializable, Clonea
      * @see javax.mail.internet.InternetHeaders#setHeader(java.lang.String,
      *      java.lang.String)
      */
+    @Override
     public synchronized void setHeader(String arg0, String arg1) {
         if (RFC2822Headers.RETURN_PATH.equalsIgnoreCase(arg0)) {
             super.removeHeader(arg0);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java b/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java
index 00cc4c2..9521784 100644
--- a/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java
+++ b/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java
@@ -564,6 +564,7 @@ public class MailImpl implements Disposable, Mail {
         this.sender = sender;
     }
 
+    @Override
     public void setState(String state) {
         this.state = state;
     }
@@ -576,6 +577,7 @@ public class MailImpl implements Disposable, Mail {
         this.remoteAddr = remoteAddr;
     }
 
+    @Override
     public void setLastUpdated(Date lastUpdated) {
         // Make a defensive copy to ensure that the date
         // doesn't get changed external to the class

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageInputStreamSource.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageInputStreamSource.java b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageInputStreamSource.java
index e6617e6..38036a7 100644
--- a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageInputStreamSource.java
+++ b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageInputStreamSource.java
@@ -117,6 +117,7 @@ public class MimeMessageInputStreamSource extends MimeMessageSource implements D
      *
      * @return the unique identifier for this MimeMessageInputStreamSource
      */
+    @Override
     public String getSourceId() {
         return sourceId;
     }
@@ -126,6 +127,7 @@ public class MimeMessageInputStreamSource extends MimeMessageSource implements D
      *
      * @return a <code>BufferedInputStream</code> containing the data
      */
+    @Override
     public synchronized InputStream getInputStream() throws IOException {
         InputStream in;
         if (out.isInMemory()) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageUtil.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageUtil.java b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageUtil.java
index b3b344f..c017c63 100644
--- a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageUtil.java
+++ b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageUtil.java
@@ -222,6 +222,7 @@ public class MimeMessageUtil {
     private static final class SizeCalculatorOutputStream extends OutputStream {
         long size = 0;
 
+        @Override
         public void write(int arg0) throws IOException {
             size++;
         }
@@ -230,10 +231,12 @@ public class MimeMessageUtil {
             return size;
         }
 
+        @Override
         public void write(byte[] arg0, int arg1, int arg2) throws IOException {
             size += arg2;
         }
 
+        @Override
         public void write(byte[] arg0) throws IOException {
             size += arg0.length;
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java
index 103717b..1c13aea 100644
--- a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java
+++ b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java
@@ -164,8 +164,6 @@ public class MimeMessageWrapper extends MimeMessage implements Disposable {
      * Overrides default javamail behaviour by not altering the Message-ID by
      * default, see <a href="https://issues.apache.org/jira/browse/JAMES-875">JAMES-875</a> and
      * <a href="https://issues.apache.org/jira/browse/JAMES-1010">JAMES-1010</a>
-     *
-     * @see javax.mail.internet.MimeMessage#updateMessageID()
      */
     @Override
     protected void updateMessageID() throws MessagingException {
@@ -542,8 +540,6 @@ public class MimeMessageWrapper extends MimeMessage implements Disposable {
     /**
      * The message is changed when working with headers and when altering the
      * content. Every method that alter the content will fallback to this one.
-     * 
-     * @see javax.mail.Part#setDataHandler(javax.activation.DataHandler)
      */
     @Override
     public synchronized void setDataHandler(DataHandler arg0) throws MessagingException {
@@ -563,9 +559,6 @@ public class MimeMessageWrapper extends MimeMessage implements Disposable {
         }
     }
 
-    /**
-     * @see javax.mail.internet.MimeMessage#parse(java.io.InputStream)
-     */
     @Override
     protected synchronized void parse(InputStream is) throws MessagingException {
         // the super implementation calls
@@ -577,8 +570,6 @@ public class MimeMessageWrapper extends MimeMessage implements Disposable {
     /**
      * If we already parsed the headers then we simply return the updated ones.
      * Otherwise we parse
-     * 
-     * @see javax.mail.internet.MimeMessage#createInternetHeaders(java.io.InputStream)
      */
     @Override
     protected synchronized InternetHeaders createInternetHeaders(InputStream is) throws MessagingException {
@@ -620,9 +611,6 @@ public class MimeMessageWrapper extends MimeMessage implements Disposable {
         }
     }
 
-    /**
-     * @see javax.mail.internet.MimeMessage#getContentStream()
-     */
     @Override
     protected InputStream getContentStream() throws MessagingException {
         if (!messageParsed) {
@@ -631,9 +619,6 @@ public class MimeMessageWrapper extends MimeMessage implements Disposable {
         return super.getContentStream();
     }
 
-    /**
-     * @see javax.mail.internet.MimeMessage#getRawInputStream()
-     */
     @Override
     public synchronized InputStream getRawInputStream() throws MessagingException {
         if (!messageParsed && !isModified() && source != null) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ResilientClusterProvider.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ResilientClusterProvider.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ResilientClusterProvider.java
index 56820ec..67fda54 100644
--- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ResilientClusterProvider.java
+++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ResilientClusterProvider.java
@@ -186,6 +186,7 @@ public class ResilientClusterProvider implements Provider<Cluster> {
         return builder.build();
     }
 
+    @Override
     public Cluster get() {
         return cluster;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java
index 449a10b..0f36425 100644
--- a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java
+++ b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java
@@ -56,6 +56,7 @@ public class DNSServiceModule extends AbstractModule {
             this.dnsService = dnsService;
         }
 
+        @Override
         public void initModule() {
             try {
                 dnsService.configure(configurationProvider.getConfiguration("dnsservice"));

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractBasicStageable.java
----------------------------------------------------------------------
diff --git a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractBasicStageable.java b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractBasicStageable.java
index 0d13a2f..a29aa48 100644
--- a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractBasicStageable.java
+++ b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractBasicStageable.java
@@ -35,9 +35,6 @@ public abstract class AbstractBasicStageable<S> implements Stageable {
         this.object = object;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public final String toString() {
         return object.toString();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractMethodTypeListener.java
----------------------------------------------------------------------
diff --git a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractMethodTypeListener.java b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractMethodTypeListener.java
index ddde9e4..aae0bbb 100644
--- a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractMethodTypeListener.java
+++ b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractMethodTypeListener.java
@@ -51,9 +51,6 @@ abstract class AbstractMethodTypeListener implements TypeListener {
         this.annotationTypes = annotationTypes;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public final <I> void hear(TypeLiteral<I> type, TypeEncounter<I> encounter) {
         hear(type, type.getRawType(), encounter);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractStageable.java
----------------------------------------------------------------------
diff --git a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractStageable.java b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractStageable.java
index 6725f5d..ed80fd8 100644
--- a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractStageable.java
+++ b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/AbstractStageable.java
@@ -30,9 +30,6 @@ public abstract class AbstractStageable<S> extends AbstractBasicStageable<S> {
         super(object);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public final void stage(StageHandler stageHandler) {
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/DefaultStager.java
----------------------------------------------------------------------
diff --git a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/DefaultStager.java b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/DefaultStager.java
index b0b204a..a68e124 100644
--- a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/DefaultStager.java
+++ b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/DefaultStager.java
@@ -71,9 +71,6 @@ public class DefaultStager<A extends Annotation> implements DisposingStager<A> {
         stageables = localStageables;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void register(Stageable stageable) {
         synchronized (stageables) {
@@ -81,35 +78,23 @@ public class DefaultStager<A extends Annotation> implements DisposingStager<A> {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public <T extends ExecutorService> T register(T executorService) {
         register(new ExecutorServiceStageable(executorService));
         return executorService;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public <T extends Closeable> T register(T closeable) {
         register(new CloseableStageable(closeable));
         return closeable;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void stage() {
         stage(null);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void stage(StageHandler stageHandler) {
         if (stageHandler == null) {
@@ -128,9 +113,6 @@ public class DefaultStager<A extends Annotation> implements DisposingStager<A> {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public Class<A> getStage() {
         return stage;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/LifeCycleStageModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/LifeCycleStageModule.java b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/LifeCycleStageModule.java
index 380c9da..a5b3d5f 100644
--- a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/LifeCycleStageModule.java
+++ b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/LifeCycleStageModule.java
@@ -68,9 +68,6 @@ public abstract class LifeCycleStageModule extends LifeCycleModule {
         return stagerType;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected final void configure() {
         if (bindings != null) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/NoOpStageHandler.java
----------------------------------------------------------------------
diff --git a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/NoOpStageHandler.java b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/NoOpStageHandler.java
index d643918..7c4f574 100644
--- a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/NoOpStageHandler.java
+++ b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/NoOpStageHandler.java
@@ -24,17 +24,11 @@ package org.apache.james.onami.lifecycle;
  */
 public final class NoOpStageHandler implements StageHandler {
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public <I, E extends Throwable> void onError(I injectee, E error) {
         // do nothing
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public <I> void onSuccess(I injectee) {
         // do nothing

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/StageableMethod.java
----------------------------------------------------------------------
diff --git a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/StageableMethod.java b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/StageableMethod.java
index cafadfe..89b5651 100644
--- a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/StageableMethod.java
+++ b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/StageableMethod.java
@@ -46,9 +46,6 @@ final class StageableMethod extends AbstractBasicStageable<Object> {
         this.stageMethod = stageMethod;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public final void stage(StageHandler stageHandler) {
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java
----------------------------------------------------------------------
diff --git a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java
index d58f342..7769bc3 100644
--- a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java
+++ b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java
@@ -54,11 +54,7 @@ public class MailboxCopierManagement implements MailboxCopierManagementMBean {
         this.resolver = resolver;
     }
     
-    /**
-     * @see
-     * org.apache.james.container.spring.mailbox.MailboxCopierManagementMBean
-     * #getMailboxManagerBeans()
-     */
+    @Override
     public Map<String, String> getMailboxManagerBeans() {
         Map<String, String> bMap = new HashMap<>();
         Map<String, MailboxManager> beans = resolver.getMailboxManagerBeans();
@@ -71,11 +67,7 @@ public class MailboxCopierManagement implements MailboxCopierManagementMBean {
         return bMap;
     }
 
-    /**
-     * @see
-     * org.apache.james.container.spring.mailbox.MailboxCopierManagementMBean
-     * #copy(java.lang.String, java.lang.String)
-     */
+    @Override
     public void copy(String srcBean, String dstBean) throws Exception {
         if (srcBean.equals(dstBean)) {
             throw new IllegalArgumentException("srcBean and dstBean can not have the same name!");

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
----------------------------------------------------------------------
diff --git a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
index 792b9fc..29c1dfb 100644
--- a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
+++ b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
@@ -66,9 +66,6 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
         super(MailboxManagerManagementMBean.class);
     }
 
-    /**
-     * @see org.apache.james.adapter.mailbox.MailboxManagerManagementMBean#deleteMailboxes(java.lang.String)
-     */
     @Override
     public boolean deleteMailboxes(String username) {
         checkString(username, "Username");
@@ -96,11 +93,6 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
         return false;
     }
 
-    /**
-     * @see
-     * org.apache.james.adapter.mailbox.MailboxManagerManagementMBean#listMailboxes
-     * (java.lang.String)
-     */
     @Override
     public List<String> listMailboxes(String username) {
         checkString(username, "Username");

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
----------------------------------------------------------------------
diff --git a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
index 31de75c..64d975a 100644
--- a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
+++ b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
@@ -39,6 +39,7 @@ public class UserRepositoryAuthenticator implements Authenticator {
         this.repos = repos;
     }
 
+    @Override
     public boolean isAuthentic(String userid, CharSequence passwd) throws MailboxException {
         try {
             return repos.test(userid, passwd.toString());

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/bean/AbstractBeanFactory.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/AbstractBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/AbstractBeanFactory.java
index bed2a3e..546bcf3 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/AbstractBeanFactory.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/AbstractBeanFactory.java
@@ -32,6 +32,7 @@ public abstract class AbstractBeanFactory implements BeanFactoryAware {
 
     private ConfigurableListableBeanFactory beanFactory;
 
+    @Override
     public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
         this.beanFactory = (ConfigurableListableBeanFactory) beanFactory;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/AbstractBeanFactory.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/AbstractBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/AbstractBeanFactory.java
index 6f260c9..ad0b2d1 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/AbstractBeanFactory.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/AbstractBeanFactory.java
@@ -32,6 +32,7 @@ public abstract class AbstractBeanFactory implements BeanFactoryAware {
 
     private ConfigurableListableBeanFactory beanFactory;
 
+    @Override
     public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
         this.beanFactory = (ConfigurableListableBeanFactory) beanFactory;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MailetLoaderBeanFactory.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MailetLoaderBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MailetLoaderBeanFactory.java
index 6090872..d759884 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MailetLoaderBeanFactory.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MailetLoaderBeanFactory.java
@@ -33,9 +33,7 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
  */
 public class MailetLoaderBeanFactory extends AbstractLoaderBeanFactory<Mailet> implements MailetLoader {
 
-    /**
-     * @see org.apache.james.mailetcontainer.api.MailetLoader#getMailet(org.apache.mailet.MailetConfig)
-     */
+    @Override
     public Mailet getMailet(MailetConfig config) throws MessagingException {
         String mailetName = config.getMailetName();
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MatcherLoaderBeanFactory.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MatcherLoaderBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MatcherLoaderBeanFactory.java
index 19cd9a9..1559535 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MatcherLoaderBeanFactory.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MatcherLoaderBeanFactory.java
@@ -33,9 +33,7 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
  */
 public class MatcherLoaderBeanFactory extends AbstractLoaderBeanFactory<Matcher> implements MatcherLoader {
 
-    /**
-     * @see org.apache.james.mailetcontainer.api.MatcherLoader#getMatcher(org.apache.mailet.MatcherConfig)
-     */
+    @Override
     public Matcher getMatcher(MatcherConfig config) throws MessagingException {
 
         String matchName = config.getMatcherName();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
index 404ac21..2004442 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
@@ -66,9 +66,7 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen
      */
     private HierarchicalConfiguration configuration;
 
-    /**
-     * @see org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
-     */
+    @Override
     public void configure(HierarchicalConfiguration configuration) throws ConfigurationException {
         this.configuration = configuration;
     }
@@ -153,6 +151,7 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen
      * @throws MailRepositoryStoreException if any error occurs while parsing the Configuration or
      *                                      retrieving the MailRepository
      */
+    @Override
     @SuppressWarnings("deprecation")
     public synchronized MailRepository select(String destination) throws MailRepositoryStoreException {
         int idx = destination.indexOf(':');
@@ -206,9 +205,7 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen
 
     }
 
-    /**
-     * @see org.apache.james.mailrepository.api.MailRepositoryStore#getUrls()
-     */
+    @Override
     public synchronized List<String> getUrls() {
         return new ArrayList<>(repositories.keySet());
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ConfigurationBeanFactoryPostProcessor.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ConfigurationBeanFactoryPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ConfigurationBeanFactoryPostProcessor.java
index cffff50..16133fe 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ConfigurationBeanFactoryPostProcessor.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ConfigurationBeanFactoryPostProcessor.java
@@ -54,6 +54,7 @@ public class ConfigurationBeanFactoryPostProcessor implements BeanFactoryPostPro
     /**
      * Parse the configuration file and depending on it register the beans
      */
+    @Override
     public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
 
         ConfigurationProvider confProvider = beanFactory.getBean(ConfigurationProvider.class);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java
index 7638f39..1948169 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java
@@ -48,10 +48,7 @@ public class FileSystemBeanFactoryPostProcessor implements BeanFactoryPostProces
         this.fileSystem = fileSystem;
     }
 
-    /**
-     * @see org.springframework.beans.factory.config.BeanFactoryPostProcessor#postProcessBeanFactory
-     * (org.springframework.beans.factory.config.ConfigurableListableBeanFactory)
-     */
+    @Override
     public void postProcessBeanFactory(ConfigurableListableBeanFactory factory) throws BeansException {
         String[] names = factory.getBeanDefinitionNames();
         for (String name : names) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/IndexerConfigurationBeanFactoryPostProcessor.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/IndexerConfigurationBeanFactoryPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/IndexerConfigurationBeanFactoryPostProcessor.java
index 5795712..4eb9fd9 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/IndexerConfigurationBeanFactoryPostProcessor.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/IndexerConfigurationBeanFactoryPostProcessor.java
@@ -37,10 +37,7 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
  */
 public class IndexerConfigurationBeanFactoryPostProcessor implements BeanFactoryPostProcessor {
 
-    /**
-     * @see org.springframework.beans.factory.config.BeanFactoryPostProcessor#postProcessBeanFactory
-     * (org.springframework.beans.factory.config.ConfigurableListableBeanFactory)
-     */
+    @Override
     public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
         ConfigurationProvider confProvider = beanFactory.getBean(ConfigurationProvider.class);
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java
index 5daa4bf..dd81722 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java
@@ -53,6 +53,7 @@ public class MailboxConfigurationBeanFactoryPostProcessor implements BeanFactory
             JCR_MAILBOXMANAGER, MAILDIR_MAILBOXMANAGER,
             HBASE_MAILBOXMANAGER, CASSANDRA_MAILBOXMANAGER);
 
+    @Override
     public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
         ConfigurationProvider confProvider = beanFactory.getBean(ConfigurationProvider.class);
         try {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java b/server/container/spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java
index 16795e6..b97f124 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java
@@ -47,10 +47,7 @@ public class JamesServerApplicationContext extends ClassPathXmlApplicationContex
         return resourceLoader;
     }
     
-    /**
-     * @see
-     * org.springframework.core.io.DefaultResourceLoader#getResource(java.lang.String)
-     */
+    @Override
     public Resource getResource(String fileURL) {
         // delegate the loading to the resourceloader
         Resource r = getResourceLoader().getResource(fileURL);
@@ -60,34 +57,22 @@ public class JamesServerApplicationContext extends ClassPathXmlApplicationContex
         return r;
     }
 
-    /**
-     * @see
-     * org.apache.james.container.spring.resource.JamesResourceLoader#getAbsoluteDirectory()
-     */
+    @Override
     public String getAbsoluteDirectory() {
         return getResourceLoader().getAbsoluteDirectory();
     }
 
-    /**
-     * @see
-     * org.apache.james.container.spring.resource.JamesResourceLoader#getConfDirectory()
-     */
+    @Override
     public String getConfDirectory() {
         return getResourceLoader().getConfDirectory();
     }
 
-    /**
-     * @see
-     * org.apache.james.container.spring.resource.JamesResourceLoader#getVarDirectory()
-     */
+    @Override
     public String getVarDirectory() {
         return getResourceLoader().getVarDirectory();
     }
 
-    /**
-     * @see
-     * org.apache.james.container.spring.resource.JamesResourceLoader#getRootDirectory()
-     */
+    @Override
     public String getRootDirectory() {
         return getResourceLoader().getRootDirectory();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java b/server/container/spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java
index eafcded..b073a39 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java
@@ -35,6 +35,7 @@ public class JamesServerWebApplicationContext extends XmlWebApplicationContext i
      */
     private final JamesResourceLoader resourceLoader = new DefaultJamesResourceLoader(new JamesDirectoriesProvider() {
         
+        @Override
         public String getAbsoluteDirectory() {
             if (absoluteDirectory == null) {
                 return getRootDirectory();
@@ -45,6 +46,7 @@ public class JamesServerWebApplicationContext extends XmlWebApplicationContext i
 
         /**
          */
+        @Override
         public String getConfDirectory() {
             if (confDirectory == null) {
                 return getRootDirectory() + "/WEB-INF/conf/";
@@ -55,6 +57,7 @@ public class JamesServerWebApplicationContext extends XmlWebApplicationContext i
 
         /**
          */
+        @Override
         public String getRootDirectory() {
             if (rootDirectory == null) {
                 // the root dir is the same as the servlets path
@@ -66,6 +69,7 @@ public class JamesServerWebApplicationContext extends XmlWebApplicationContext i
 
         /**
          */
+        @Override
         public String getVarDirectory() {
             if (varDirectory == null) {
                 return getRootDirectory() + "/var/";
@@ -80,10 +84,7 @@ public class JamesServerWebApplicationContext extends XmlWebApplicationContext i
     private String varDirectory;
     private String confDirectory;
 
-    /**
-     * @see
-     * org.springframework.core.io.DefaultResourceLoader#getResource(java.lang.String)
-     */
+    @Override
     public Resource getResource(String fileURL) {
         // delegate the loading to the resourceloader
         Resource r = resourceLoader.getResource(fileURL);
@@ -109,34 +110,22 @@ public class JamesServerWebApplicationContext extends XmlWebApplicationContext i
         this.confDirectory = confDirectory;
     }
 
-    /**
-     * @see
-     * org.apache.james.container.spring.resource.JamesResourceLoader#getAbsoluteDirectory()
-     */
+    @Override
     public String getAbsoluteDirectory() {
         return resourceLoader.getAbsoluteDirectory();
     }
 
-    /**
-     * @see
-     * org.apache.james.container.spring.resource.JamesResourceLoader#getConfDirectory()
-     */
+    @Override
     public String getConfDirectory() {
         return resourceLoader.getConfDirectory();
     }
 
-    /**
-     * @see
-     * org.apache.james.container.spring.resource.JamesResourceLoader#getVarDirectory()
-     */
+    @Override
     public String getVarDirectory() {
         return resourceLoader.getVarDirectory();
     }
 
-    /**
-     * @see
-     * org.apache.james.container.spring.resource.JamesResourceLoader#getRootDirectory()
-     */
+    @Override
     public String getRootDirectory() {
         return resourceLoader.getRootDirectory();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifecycleBeanPostProcessor.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifecycleBeanPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifecycleBeanPostProcessor.java
index 4f59727..951e6cb 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifecycleBeanPostProcessor.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifecycleBeanPostProcessor.java
@@ -43,10 +43,7 @@ public abstract class AbstractLifecycleBeanPostProcessor<T> implements BeanPostP
         this.factory = (ConfigurableListableBeanFactory) factory;
     }
 
-    /**
-     * @see org.springframework.beans.factory.config.BeanPostProcessor
-     * #postProcessBeforeInitialization(java.lang.Object, java.lang.String)
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public final Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
         try {
@@ -65,10 +62,7 @@ public abstract class AbstractLifecycleBeanPostProcessor<T> implements BeanPostP
         return bean;
     }
 
-    /**
-     * @see org.springframework.beans.factory.config.BeanPostProcessor
-     * #postProcessAfterInitialization(java.lang.Object, java.lang.String)
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public final Object postProcessAfterInitialization(Object bean, String name) throws BeansException {
         try {
@@ -125,9 +119,7 @@ public abstract class AbstractLifecycleBeanPostProcessor<T> implements BeanPostP
         this.order = order;
     }
 
-    /**
-     * @see org.springframework.core.Ordered#getOrder()
-     */
+    @Override
     public int getOrder() {
         return order;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java
index 451a97b..0e26e36 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java
@@ -64,9 +64,7 @@ public class ConfigurationProviderImpl implements ConfigurationProvider, Resourc
         this.configurationMappings = configurationMappings;
     }
 
-    /**
-     * @see ConfigurationProvider#registerConfiguration(String, HierarchicalConfiguration)
-     */
+    @Override
     public void registerConfiguration(String beanName, HierarchicalConfiguration conf) {
         configurations.put(beanName, conf);
     }
@@ -77,6 +75,7 @@ public class ConfigurationProviderImpl implements ConfigurationProvider, Resourc
      * 
      * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
      */
+    @Override
     public void afterPropertiesSet() throws Exception {
         if (configurationMappings != null) {
             for (String key : configurationMappings.keySet()) {
@@ -86,9 +85,7 @@ public class ConfigurationProviderImpl implements ConfigurationProvider, Resourc
         }
     }
 
-    /**
-     * @see ConfigurationProvider#getConfiguration(java.lang.String)
-     */
+    @Override
     public HierarchicalConfiguration getConfiguration(String name) throws ConfigurationException {
 
         HierarchicalConfiguration conf = configurations.get(name);
@@ -134,10 +131,7 @@ public class ConfigurationProviderImpl implements ConfigurationProvider, Resourc
 
     }
 
-    /**
-     * @see
-     * org.springframework.context.ResourceLoaderAware#setResourceLoader(org.springframework.core.io.ResourceLoader)
-     */
+    @Override
     public void setResourceLoader(ResourceLoader loader) {
         this.loader = loader;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java
index df45b7d..d2adee1 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java
@@ -55,10 +55,7 @@ public class LogProviderImpl implements LogProvider, InitializingBean, LogProvid
         this.logs = logs;
     }
 
-    /**
-     * @see
-     * org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-     */
+    @Override
     public void afterPropertiesSet() throws Exception {
         if (logs != null) {
             for (String key : logs.keySet()) {
@@ -68,33 +65,23 @@ public class LogProviderImpl implements LogProvider, InitializingBean, LogProvid
         }
     }
 
-    /**
-     * @see
-     * org.apache.james.container.spring.lifecycle.LogProvider#getLog(java.lang.String)
-     */
+    @Override
     public Logger getLog(String name) {
         logMap.putIfAbsent(name, createLog(PREFIX + name));
         return logMap.get(name);
     }
 
-    /**
-     * @see
-     * org.apache.james.container.spring.lifecycle.LogProvider#registerLog(java.lang.String, org.slf4j.Logger)
-     */
+    @Override
     public void registerLog(String beanName, Logger log) {
         logMap.put(beanName, log);
     }
 
-    /**
-     * @see LogProviderManagementMBean#getSupportedLogLevels()
-     */
+    @Override
     public List<String> getSupportedLogLevels() {
         return Arrays.asList("DEBUG", "INFO", "WARN", "ERROR", "OFF");
     }
 
-    /**
-     * @see LogProviderManagementMBean#getLogLevels()
-     */
+    @Override
     public Map<String, String> getLogLevels() {
         TreeMap<String, String> levels = new TreeMap<>();
         for (String name : logMap.keySet()) {
@@ -107,9 +94,7 @@ public class LogProviderImpl implements LogProvider, InitializingBean, LogProvid
 
     }
 
-    /**
-     * @see LogProviderManagementMBean#getLogLevel(java.lang.String)
-     */
+    @Override
     public String getLogLevel(String component) {
         Logger log = logMap.get(component);
         if (log == null) {
@@ -123,9 +108,7 @@ public class LogProviderImpl implements LogProvider, InitializingBean, LogProvid
         return level.toString();
     }
 
-    /**
-     * @see LogProviderManagementMBean#setLogLevel(String, String)
-     */
+    @Override
     public void setLogLevel(String component, String loglevel) {
         if (!getSupportedLogLevels().contains(loglevel)) {
             throw new IllegalArgumentException("Not supported loglevel given");

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java
index c4344af..6ec3d07 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java
@@ -133,9 +133,7 @@ public abstract class AbstractOSGIAnnotationBeanPostProcessor<A extends Annotati
         }
     }
 
-    /**
-     * @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader)
-     */
+    @Override
     public void setBeanClassLoader(ClassLoader classLoader) {
         this.classLoader = classLoader;
     }
@@ -274,16 +272,12 @@ public abstract class AbstractOSGIAnnotationBeanPostProcessor<A extends Annotati
         return setter != null ? AnnotationUtils.getAnnotation(setter, getAnnotation()) : null;
     }
 
-    /**
-     * @see org.springframework.osgi.context.BundleContextAware#setBundleContext(org.osgi.framework.BundleContext)
-     */
+    @Override
     public void setBundleContext(BundleContext context) {
         this.bundleContext = context;
     }
 
-    /**
-     * @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org.springframework.beans.factory.BeanFactory)
-     */
+    @Override
     public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
         this.beanFactory = beanFactory;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIResourceAnnotationBeanPostProcessor.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIResourceAnnotationBeanPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIResourceAnnotationBeanPostProcessor.java
index 2570b06..cd8b485 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIResourceAnnotationBeanPostProcessor.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIResourceAnnotationBeanPostProcessor.java
@@ -24,9 +24,7 @@ import org.springframework.osgi.service.exporter.OsgiServicePropertiesResolver;
 
 public class OSGIResourceAnnotationBeanPostProcessor extends AbstractOSGIAnnotationBeanPostProcessor<Resource> {
 
-    /**
-     * @see org.apache.james.container.spring.lifecycle.osgi.AbstractOSGIAnnotationBeanPostProcessor#getAnnotation()
-     */
+    @Override
     protected Class<Resource> getAnnotation() {
         return Resource.class;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/SpringResolver.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/SpringResolver.java b/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/SpringResolver.java
index bdfb6f3..3e7d555 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/SpringResolver.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/SpringResolver.java
@@ -31,11 +31,7 @@ public class SpringResolver implements MailboxManagerResolver, ApplicationContex
     
     private ApplicationContext context;
 
-    /**
-     * @see
-     * org.springframework.context.ApplicationContextAware#setApplicationContext
-     * (org.springframework.context.ApplicationContext)
-     */
+    @Override
     public void setApplicationContext(ApplicationContext context) {
         this.context = context;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/spring/src/main/java/org/apache/james/container/spring/resource/DefaultJamesResourceLoader.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/resource/DefaultJamesResourceLoader.java b/server/container/spring/src/main/java/org/apache/james/container/spring/resource/DefaultJamesResourceLoader.java
index 6590f97..e86a5fd 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/resource/DefaultJamesResourceLoader.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/resource/DefaultJamesResourceLoader.java
@@ -46,6 +46,7 @@ public class DefaultJamesResourceLoader extends DefaultResourceLoader implements
      * 
      * @see org.springframework.core.io.ResourceLoader#getResource(java.lang.String)
      */
+    @Override
     public Resource getResource(String fileURL) {
         Resource r;
         if (fileURL.startsWith(FileSystem.CLASSPATH_PROTOCOL)) {
@@ -70,18 +71,22 @@ public class DefaultJamesResourceLoader extends DefaultResourceLoader implements
         return r;
     }
 
+    @Override
     public String getAbsoluteDirectory() {
         return jamesDirectoriesProvider.getAbsoluteDirectory();
     }
 
+    @Override
     public String getConfDirectory() {
         return jamesDirectoriesProvider.getConfDirectory();
     }
 
+    @Override
     public String getVarDirectory() {
         return jamesDirectoriesProvider.getVarDirectory();
     }
 
+    @Override
     public String getRootDirectory() {
         return jamesDirectoriesProvider.getRootDirectory();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/BodyOffsetInputStream.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/BodyOffsetInputStream.java b/server/container/util/src/main/java/org/apache/james/util/BodyOffsetInputStream.java
index ddb4dfe..e0bb63a 100644
--- a/server/container/util/src/main/java/org/apache/james/util/BodyOffsetInputStream.java
+++ b/server/container/util/src/main/java/org/apache/james/util/BodyOffsetInputStream.java
@@ -40,9 +40,7 @@ public class BodyOffsetInputStream extends InputStream {
         this.in = new PushbackInputStream(in, 3);
     }
 
-    /**
-     * @see InputStream#read()
-     */
+    @Override
     public int read() throws IOException {
         int i = in.read();
         if (i != -1) {
@@ -110,16 +108,12 @@ public class BodyOffsetInputStream extends InputStream {
         
     }
 
-    /**
-     * Mark is not supported by this implementation
-     */
+    @Override
     public boolean markSupported() {
         return false;
     }
 
-    /**
-     * Throws {@link IOException}
-     */
+    @Override
     public void reset() throws IOException {
         throw new IOException("Not supported");
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/RestrictingRMISocketFactory.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/RestrictingRMISocketFactory.java b/server/container/util/src/main/java/org/apache/james/util/RestrictingRMISocketFactory.java
index 4dcee20..5296e16 100644
--- a/server/container/util/src/main/java/org/apache/james/util/RestrictingRMISocketFactory.java
+++ b/server/container/util/src/main/java/org/apache/james/util/RestrictingRMISocketFactory.java
@@ -49,6 +49,7 @@ public class RestrictingRMISocketFactory extends RMISocketFactory {
      * the given port. The address can be specified by the System Property
      * james.jmx.address. If none is given it will use localhost
      */
+    @Override
     public ServerSocket createServerSocket(int port) throws IOException {
         ServerSocket socket = new ServerSocket();
         socket.bind(new InetSocketAddress(address, port));
@@ -59,6 +60,7 @@ public class RestrictingRMISocketFactory extends RMISocketFactory {
     /**
      * Create a new {@link Socket} for the given host and port
      */
+    @Override
     public Socket createSocket(String host, int port) throws IOException {
         return new Socket(host, port);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java b/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java
index 743b886..3f5df93 100644
--- a/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java
+++ b/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java
@@ -161,6 +161,7 @@ public class BayesianAnalyzer {
          *         instance with.
          * @return The result of the comparison (before, equal, after).
          */
+        @Override
         public final int compareTo(TokenProbabilityStrength anotherTokenProbabilityStrength) {
             int result = (int) ((anotherTokenProbabilityStrength.strength - strength) * 1000000);
             if (result == 0) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java b/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java
index 2940290..9c3f499 100644
--- a/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java
+++ b/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java
@@ -56,12 +56,14 @@ public class JMXEnabledScheduledThreadPoolExecutor extends ScheduledThreadPoolEx
         registerMBean();
     }
 
+    @Override
     protected void beforeExecute(Thread t, Runnable r) {
         super.beforeExecute(t, r);
         inProgress.add(r);
         startTime.set(System.currentTimeMillis());
     }
 
+    @Override
     protected void afterExecute(Runnable r, Throwable t) {
         long time = System.currentTimeMillis() - startTime.get();
         synchronized (this) {
@@ -117,44 +119,32 @@ public class JMXEnabledScheduledThreadPoolExecutor extends ScheduledThreadPoolEx
         return super.shutdownNow();
     }
 
-    /**
-     * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getTotalTasks()
-     */
+    @Override
     public synchronized int getTotalTasks() {
         return totalTasks;
     }
 
-    /**
-     * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getAverageTaskTime()
-     */
+    @Override
     public synchronized double getAverageTaskTime() {
         return (totalTasks == 0) ? 0 : totalTime / totalTasks;
     }
 
-    /**
-     * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getActiveThreads()
-     */
+    @Override
     public int getActiveThreads() {
         return getPoolSize();
     }
 
-    /**
-     * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getActiveTasks()
-     */
+    @Override
     public int getActiveTasks() {
         return getActiveCount();
     }
 
-    /**
-     * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getQueuedTasks()
-     */
+    @Override
     public int getQueuedTasks() {
         return getQueue().size();
     }
 
-    /**
-     * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getMaximalThreads()
-     */
+    @Override
     public int getMaximalThreads() {
         return getMaximumPoolSize();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java b/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java
index e4110ba..2a42464 100644
--- a/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java
+++ b/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java
@@ -50,12 +50,14 @@ public class JMXEnabledThreadPoolExecutor extends ThreadPoolExecutor implements
         registerMBean();
     }
 
+    @Override
     protected void beforeExecute(Thread t, Runnable r) {
         super.beforeExecute(t, r);
         inProgress.add(r);
         startTime.set(System.currentTimeMillis());
     }
 
+    @Override
     protected void afterExecute(Runnable r, Throwable t) {
         long time = System.currentTimeMillis() - startTime.get();
         synchronized (this) {
@@ -111,44 +113,32 @@ public class JMXEnabledThreadPoolExecutor extends ThreadPoolExecutor implements
         return super.shutdownNow();
     }
 
-    /**
-     * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getTotalTasks()
-     */
+    @Override
     public synchronized int getTotalTasks() {
         return totalTasks;
     }
 
-    /**
-     * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getAverageTaskTime()
-     */
+    @Override
     public synchronized double getAverageTaskTime() {
         return (totalTasks == 0) ? 0 : totalTime / totalTasks;
     }
 
-    /**
-     * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getActiveThreads()
-     */
+    @Override
     public int getActiveThreads() {
         return getPoolSize();
     }
 
-    /**
-     * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getActiveTasks()
-     */
+    @Override
     public int getActiveTasks() {
         return getActiveCount();
     }
 
-    /**
-     * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getQueuedTasks()
-     */
+    @Override
     public int getQueuedTasks() {
         return getQueue().size();
     }
 
-    /**
-     * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getMaximalThreads()
-     */
+    @Override
     public int getMaximalThreads() {
         return getMaximumPoolSize();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/retry/DoublingRetrySchedule.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/DoublingRetrySchedule.java b/server/container/util/src/main/java/org/apache/james/util/retry/DoublingRetrySchedule.java
index 08465d7..2c8d4fe 100644
--- a/server/container/util/src/main/java/org/apache/james/util/retry/DoublingRetrySchedule.java
+++ b/server/container/util/src/main/java/org/apache/james/util/retry/DoublingRetrySchedule.java
@@ -76,8 +76,6 @@ public class DoublingRetrySchedule implements RetrySchedule {
         this.multiplier = Math.max(1, multiplier);
     }
 
-    /**
-     */
     @Override
     public long getInterval(int index) {
         if (startInterval > 0) {
@@ -90,9 +88,6 @@ public class DoublingRetrySchedule implements RetrySchedule {
         return multiplier * Math.min((long) (startInterval * Math.pow(2, index)), maxInterval);
     }    
 
-    /**
-     * @see java.lang.Object#toString()
-     */
     @Override
     public String toString() {
         StringBuilder builder = new StringBuilder();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/retry/ExceptionRetryHandler.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/ExceptionRetryHandler.java b/server/container/util/src/main/java/org/apache/james/util/retry/ExceptionRetryHandler.java
index dcc46c0..1b4f53b 100644
--- a/server/container/util/src/main/java/org/apache/james/util/retry/ExceptionRetryHandler.java
+++ b/server/container/util/src/main/java/org/apache/james/util/retry/ExceptionRetryHandler.java
@@ -70,8 +70,7 @@ public abstract class ExceptionRetryHandler implements RetryHandler {
             this.maxRetries = maxRetries;
         }
 
-        /**
-         */
+        @Override
         public Object perform() throws Exception {
             boolean success = false;
             Object result = null;
@@ -114,15 +113,13 @@ public abstract class ExceptionRetryHandler implements RetryHandler {
             }
             return isRetryable;
         }
-        
-        /**
-         */
+
+        @Override
         public void postFailure(Exception ex, int retryCount) {
             // no-op
         }        
 
-        /**
-         */
+        @Override
         public abstract Object operation() throws Exception;
         
         /**

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java
index 84c0ab8..2c8ff64 100644
--- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java
+++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java
@@ -45,8 +45,6 @@ public abstract class LoggingRetryHandler extends NamingExceptionRetryHandler {
         super(exceptionClasses, proxy, schedule, maxRetries);
     }
 
-    /**
-     */
     @Override
     public void postFailure(NamingException ex, int retryCount) {
         super.postFailure(ex, retryCount);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/server/container/util/src/main/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandler.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandler.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandler.java
index f269fa7..5395b43 100644
--- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandler.java
+++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandler.java
@@ -49,8 +49,6 @@ public abstract class NamingExceptionRetryHandler extends ExceptionRetryHandler
         super(exceptionClasses, proxy, schedule, maxRetries);
     }
 
-    /**
-     */
     @Override
     public Object perform() throws NamingException {
         try {
@@ -63,8 +61,6 @@ public abstract class NamingExceptionRetryHandler extends ExceptionRetryHandler
         }
     }
 
-    /**
-     */
     @Override
     public void postFailure(Exception ex, int retryCount) {
         postFailure(((NamingException) ex), retryCount);        


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