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-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

Reply via email to