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