http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java index 02e2ca5..46763a9 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java @@ -30,10 +30,7 @@ import org.apache.mailet.base.GenericRecipientMatcher; */ public class HostIsLocal extends GenericRecipientMatcher { - /* - * (non-Javadoc) - * @see org.apache.mailet.base.GenericRecipientMatcher#matchRecipient(org.apache.mailet.MailAddress) - */ + @Override public boolean matchRecipient(MailAddress recipient) { return getMailetContext().isLocalServer(recipient.getDomain()); }
http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java index a4ee697..56cdd0c 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java @@ -33,6 +33,7 @@ import org.apache.mailet.base.GenericMatcher; */ public class IsSingleRecipient extends GenericMatcher { + @Override public Collection<MailAddress> match(Mail mail) { if (mail.getRecipients().size() == 1) { return mail.getRecipients(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java index 7290bce..3ecba10 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java @@ -93,6 +93,7 @@ public class NESSpamCheck extends GenericRegexMatcher { {"X-pmrqc", ".*"}, {"Host-From:envonly", ".*"}}; + @Override public void init() throws MessagingException { //No condition passed... just compile a bunch of regular expressions try { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIs.java index db64b76..5d53105 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIs.java @@ -45,6 +45,7 @@ public class RecipientIs extends GenericRecipientMatcher { private Collection<MailAddress> recipients; + @Override public void init() throws javax.mail.MessagingException { if (Strings.isNullOrEmpty(getCondition())) { throw new MessagingException("RecipientIs should have a condition composed of a list of mail addresses"); @@ -55,6 +56,7 @@ public class RecipientIs extends GenericRecipientMatcher { } } + @Override public boolean matchRecipient(MailAddress recipient) { return recipients.contains(recipient); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java index f9f8bc8..e21b056 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java @@ -31,6 +31,7 @@ import org.apache.mailet.base.GenericRecipientMatcher; */ public class RecipientIsLocal extends GenericRecipientMatcher { + @Override public boolean matchRecipient(MailAddress recipient) { MailetContext mailetContext = getMailetContext(); //This might change after startup http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java index 900405f..dc31a94 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java @@ -48,6 +48,7 @@ import com.google.common.base.Strings; public class RecipientIsRegex extends GenericRecipientMatcher { Pattern pattern = null; + @Override public void init() throws javax.mail.MessagingException { String patternString = getCondition(); if (Strings.isNullOrEmpty(patternString)) { @@ -62,6 +63,7 @@ public class RecipientIsRegex extends GenericRecipientMatcher { } } + @Override public boolean matchRecipient(MailAddress recipient) { String myRecipient = recipient.toString(); return pattern.matcher(myRecipient).matches(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/RelayLimit.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RelayLimit.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RelayLimit.java index 9bbade4..04a2385 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RelayLimit.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RelayLimit.java @@ -42,10 +42,12 @@ import org.apache.mailet.base.RFC2822Headers; public class RelayLimit extends GenericMatcher { int limit = 30; + @Override public void init() throws MessagingException { limit = MailetUtil.getInitParameterAsStrictlyPositiveInteger(getCondition()); } + @Override public Collection<MailAddress> match(Mail mail) throws javax.mail.MessagingException { MimeMessage mm = mail.getMessage(); int count = 0; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java index 70cb9d4..2ef9a43 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java @@ -45,6 +45,7 @@ public class SMTPAuthSuccessful extends GenericMatcher { * The mail attribute holding the SMTP AUTH user name, if any. */ + @Override public Collection<MailAddress> match(Mail mail) { String authUser = (String) mail.getAttribute(Mail.SMTP_AUTH_USER_ATTRIBUTE_NAME); if (authUser != null) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java index eab66ed..3e2284b 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java @@ -46,6 +46,7 @@ public class SMTPAuthUserIs extends GenericMatcher { */ private Collection<String> users; + @Override public void init() throws javax.mail.MessagingException { StringTokenizer st = new StringTokenizer(getCondition(), ", \t", false); users = new java.util.HashSet<>(); @@ -54,6 +55,7 @@ public class SMTPAuthUserIs extends GenericMatcher { } } + @Override public Collection<MailAddress> match(Mail mail) { String authUser = (String) mail.getAttribute(Mail.SMTP_AUTH_USER_ATTRIBUTE_NAME); if (authUser != null && users.contains(authUser)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java index 9773993..e50b076 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java @@ -44,6 +44,7 @@ public class SMTPIsAuthNetwork extends GenericMatcher { */ public static final String SMTP_AUTH_NETWORK_NAME = "org.apache.james.SMTPIsAuthNetwork"; + @Override public Collection<MailAddress> match(Mail mail) { String relayingAllowed = (String) mail .getAttribute(SMTP_AUTH_NETWORK_NAME); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java index 5eb70e3..3fcfb26 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java @@ -52,6 +52,7 @@ public class SenderHostIs extends GenericMatcher { private Collection<String> senderHosts; + @Override public void init() { String condition = getCondition(); Preconditions.checkNotNull(condition, "'condition' should not be null"); @@ -74,6 +75,7 @@ public class SenderHostIs extends GenericMatcher { * * @param mail the mail being processed */ + @Override public Collection<MailAddress> match(Mail mail) { try { if (mail.getSender() != null && senderHosts.contains(mail.getSender().getDomain().toLowerCase(Locale.US))) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java index a3ed557..7102211 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java @@ -38,6 +38,7 @@ import org.apache.mailet.base.GenericMatcher; * <br> */ public class SenderHostIsLocal extends GenericMatcher { + @Override public Collection<MailAddress> match(Mail mail) { if (mail.getSender() != null && isLocalServer(mail)) { return mail.getRecipients(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIs.java index fef0665..9a70406 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIs.java @@ -53,6 +53,7 @@ public class SenderIs extends GenericMatcher { return senders; } + @Override public void init() throws javax.mail.MessagingException { if (Strings.isNullOrEmpty(getCondition())) { throw new MessagingException("SenderIs should have at least one address as parameter"); @@ -63,6 +64,7 @@ public class SenderIs extends GenericMatcher { } } + @Override public Collection<MailAddress> match(Mail mail) { if (senders.contains(mail.getSender())) { return mail.getRecipients(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsLocal.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsLocal.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsLocal.java index 105b251..241dd7c 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsLocal.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsLocal.java @@ -31,6 +31,7 @@ import org.apache.mailet.base.GenericMatcher; */ public class SenderIsLocal extends GenericMatcher { + @Override public final Collection<MailAddress> match(Mail mail) throws MessagingException { if (isLocal(mail.getSender())) { return mail.getRecipients(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java index d9c4ae6..9dda490 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java @@ -36,6 +36,7 @@ import org.apache.mailet.base.GenericMatcher; */ public class SenderIsNull extends GenericMatcher { + @Override public Collection<MailAddress> match(Mail mail) { if (mail.getSender() == null) { return mail.getRecipients(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java index cfd39f6..dcb43d9 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java @@ -57,6 +57,7 @@ public class SenderIsRegex extends GenericMatcher { private Pattern pattern; + @Override public void init() throws MessagingException { String patternString = getCondition(); if (Strings.isNullOrEmpty(patternString)) { @@ -71,6 +72,7 @@ public class SenderIsRegex extends GenericMatcher { } } + @Override public Collection<MailAddress> match(Mail mail) { MailAddress mailAddress = mail.getSender(); if (mailAddress == null) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SentByMailet.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SentByMailet.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SentByMailet.java index 2699fe2..896a27d 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SentByMailet.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SentByMailet.java @@ -38,6 +38,7 @@ import com.google.common.collect.ImmutableList; */ public class SentByMailet extends GenericMatcher { + @Override public Collection<MailAddress> match(Mail mail) { String authUser = (String) mail.getAttribute(Mail.SENT_BY_MAILET); if (authUser != null) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java index ddfc27c..60189b6 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java @@ -41,10 +41,7 @@ public class SizeGreaterThan extends GenericMatcher { int cutoff = 0; - /* - * (non-Javadoc) - * @see org.apache.mailet.base.GenericMatcher#init() - */ + @Override public void init() throws MessagingException { String amount = getCondition(); @@ -71,10 +68,7 @@ public class SizeGreaterThan extends GenericMatcher { } } - /* - * (non-Javadoc) - * @see org.apache.mailet.base.GenericMatcher#match(org.apache.mailet.Mail) - */ + @Override public Collection<MailAddress> match(Mail mail) throws MessagingException { if (mail.getMessageSize() > cutoff) { return mail.getRecipients(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectIs.java index 874a6bd..610b7e2 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectIs.java @@ -34,6 +34,7 @@ import org.apache.mailet.base.GenericMatcher; * @version 1.0.0, 1/5/2000 */ public class SubjectIs extends GenericMatcher { + @Override public Collection<MailAddress> match(Mail mail) throws javax.mail.MessagingException { MimeMessage mm = mail.getMessage(); String subject = mm.getSubject(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java index eb760d5..1d756a8 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java @@ -36,6 +36,7 @@ import org.apache.mailet.base.GenericMatcher; */ public class SubjectStartsWith extends GenericMatcher { + @Override public Collection<MailAddress> match(Mail mail) throws MessagingException { MimeMessage mm = mail.getMessage(); String subject = mm.getSubject(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/main/java/org/apache/james/transport/matchers/UserIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/UserIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/UserIs.java index ece24da..f1143bd 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/UserIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/UserIs.java @@ -38,6 +38,7 @@ public class UserIs extends GenericRecipientMatcher { Set<String> users; + @Override public void init() throws MessagingException { if (Strings.isNullOrEmpty(getCondition())) { throw new MessagingException("UserIs should have a condition composed of a list of local parts of mail addresses"); @@ -48,6 +49,7 @@ public class UserIs extends GenericRecipientMatcher { } } + @Override public boolean matchRecipient(MailAddress recipient) { return users.contains(recipient.getLocalPart()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeTest.java index 5bd2b6a..5d02173 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeTest.java @@ -28,14 +28,17 @@ public class HasMailAttributeTest extends AbstractHasMailAttributeTest { super(); } + @Override protected GenericMatcher createMatcher() { return new HasMailAttribute(); } + @Override protected String getHasMailAttribute() { return MAIL_ATTRIBUTE_NAME; } + @Override protected String getMatcherName() { return "HasMailAttribute"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java index 566627e..cfa7b02 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java @@ -42,15 +42,18 @@ public class HasMailAttributeWithValueRegexTest extends this.regex = regex; } + @Override protected String getHasMailAttribute() { return MAIL_ATTRIBUTE_NAME + ", " + regex; } + @Override protected GenericMatcher createMatcher() { return new HasMailAttributeWithValueRegex(); } // test if the mail attribute was matched + @Override public void testAttributeIsMatched() throws MessagingException { init(); setRegex(".*"); @@ -102,6 +105,7 @@ public class HasMailAttributeWithValueRegexTest extends } } + @Override protected String getMatcherName() { return "HasMailAttributeWithValueRegex"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java index f67cc74..1aa1130 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java @@ -33,10 +33,12 @@ public class HasMailAttributeWithValueTest extends AbstractHasMailAttributeTest super(); } + @Override protected String getHasMailAttribute() { return MAIL_ATTRIBUTE_NAME + ", " + MAIL_ATTRIBUTE_VALUE; } + @Override protected GenericMatcher createMatcher() { return new HasMailAttributeWithValue(); } @@ -52,6 +54,7 @@ public class HasMailAttributeWithValueTest extends AbstractHasMailAttributeTest assertNull(matchedRecipients); } + @Override protected String getMatcherName() { return "HasMailAttributeWithValue"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java index 09e2b4e..4e1908d 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java @@ -30,18 +30,22 @@ import org.apache.mailet.base.GenericMatcher; public class SMTPAuthUserIsTest extends AbstractHasMailAttributeTest { + @Override protected String getHasMailAttribute() { return "t...@james.apache.org"; } + @Override protected GenericMatcher createMatcher() { return new SMTPAuthUserIs(); } + @Override protected String getMatcherName() { return "SMTPAuthUserIs"; } + @Override protected void init() { super.init(); setMailAttributeName(Mail.SMTP_AUTH_USER_ATTRIBUTE_NAME); @@ -50,6 +54,7 @@ public class SMTPAuthUserIsTest extends AbstractHasMailAttributeTest { // test if the mail attribute was not matched + @Override public void testAttributeIsNotMatched() throws MessagingException { setupAll(); setMailAttributeValue("notmatc...@james.apache.org"); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java ---------------------------------------------------------------------- diff --git a/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java b/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java index 5c01700..04acf3c 100644 --- a/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java +++ b/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java @@ -398,6 +398,7 @@ public class MailProtocolTestTask extends Task implements Monitor { } } + @Override public void note(String message) { if (quiet) { log(message, Project.MSG_DEBUG); @@ -406,10 +407,12 @@ public class MailProtocolTestTask extends Task implements Monitor { } } + @Override public void debug(char character) { log("'" + character + "'", Project.MSG_DEBUG); } + @Override public void debug(String message) { log(message, Project.MSG_DEBUG); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestAddUser.java ---------------------------------------------------------------------- diff --git a/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestAddUser.java b/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestAddUser.java index ba4ee14..7eba9e99 100644 --- a/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestAddUser.java +++ b/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestAddUser.java @@ -33,6 +33,7 @@ public class TestAddUser extends TestCase { MailProtocolTestTask subject; + @Override protected void setUp() throws Exception { super.setUp(); fakeServer = new DiscardProtocol(); @@ -46,6 +47,7 @@ public class TestAddUser extends TestCase { subject.setProject(new Project()); } + @Override protected void tearDown() throws Exception { super.tearDown(); fakeServer.stop(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestRunScripts.java ---------------------------------------------------------------------- diff --git a/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestRunScripts.java b/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestRunScripts.java index c48af1e..5c5e92d 100644 --- a/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestRunScripts.java +++ b/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestRunScripts.java @@ -43,6 +43,7 @@ public class TestRunScripts extends TestCase { MailProtocolTestTask subject; + @Override protected void setUp() throws Exception { super.setUp(); fakeServer = new DiscardProtocol(); @@ -59,6 +60,7 @@ public class TestRunScripts extends TestCase { subject.setProject(new Project()); } + @Override protected void tearDown() throws Exception { super.tearDown(); fakeServer.stop(); @@ -66,6 +68,7 @@ public class TestRunScripts extends TestCase { public void testIgnoreUnsupportedResource() throws Exception { final Resource unsupportedResource = new StringResource() { + @Override public InputStream getInputStream() { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/Runner.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/Runner.java b/mpt/core/src/main/java/org/apache/james/mpt/Runner.java index 3af348e..956fab6 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/Runner.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/Runner.java @@ -86,6 +86,7 @@ public class Runner { public ProtocolSession session; + @Override public void doContinue() { if (session != null) { session.doContinue(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java b/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java index 0464da4..70176ff 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java @@ -52,6 +52,7 @@ public interface HostSystem extends SessionFactory { * @return <code>Session</code>, not null * @throws Exception */ + @Override Session newSession(Continuation continuation) throws Exception; void beforeTest() throws Exception; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferInputStream.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferInputStream.java b/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferInputStream.java index 7848c46..9658888 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferInputStream.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferInputStream.java @@ -34,6 +34,7 @@ public class ByteBufferInputStream extends InputStream { private boolean readLast = true; + @Override public int read() throws IOException { if (!readLast) { readLast = true; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferOutputStream.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferOutputStream.java b/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferOutputStream.java index 9076a35..f080849 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferOutputStream.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferOutputStream.java @@ -44,6 +44,7 @@ public class ByteBufferOutputStream extends OutputStream { ascii.newEncoder().encode(CharBuffer.wrap(message), buffer, true); } + @Override public void write(int b) throws IOException { buffer.put((byte) b); if (b == '\n' && matchPlus && matchCR && matchLF) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/helper/ScriptBuilder.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/helper/ScriptBuilder.java b/mpt/core/src/main/java/org/apache/james/mpt/helper/ScriptBuilder.java index fb21446..d08678f 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/helper/ScriptBuilder.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/helper/ScriptBuilder.java @@ -1485,6 +1485,7 @@ public class ScriptBuilder { this.delegate = delegate; } + @Override public int read() throws IOException { final int result; final int next = delegate.read(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java b/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java index 7a67e7d..ffbbafe 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java @@ -80,6 +80,7 @@ public class ExternalHostSystem extends ExternalSessionFactory implements ImapHo this.userAdder = userAdder; } + @Override public boolean addUser(String user, String password) throws Exception { if (userAdder == null) { monitor.note("Please ensure user '" + user + "' with password '" + password + "' exists."); @@ -90,6 +91,7 @@ public class ExternalHostSystem extends ExternalSessionFactory implements ImapHo return true; } + @Override public void createMailbox(MailboxPath mailboxPath) throws Exception { throw new NotImplementedException(); } @@ -100,9 +102,11 @@ public class ExternalHostSystem extends ExternalSessionFactory implements ImapHo public void afterTests() throws Exception { } + @Override public void beforeTest() throws Exception { } + @Override public void afterTest() throws Exception { } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/monitor/NullMonitor.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/monitor/NullMonitor.java b/mpt/core/src/main/java/org/apache/james/mpt/monitor/NullMonitor.java index e21b0f7..483b896 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/monitor/NullMonitor.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/monitor/NullMonitor.java @@ -26,12 +26,15 @@ import org.apache.james.mpt.api.Monitor; */ public class NullMonitor implements Monitor { + @Override public void note(String message) { } + @Override public void debug(char character) { } + @Override public void debug(String messsage) { } } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/monitor/SystemLoggingMonitor.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/monitor/SystemLoggingMonitor.java b/mpt/core/src/main/java/org/apache/james/mpt/monitor/SystemLoggingMonitor.java index 41cee05..cc0553b 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/monitor/SystemLoggingMonitor.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/monitor/SystemLoggingMonitor.java @@ -44,16 +44,19 @@ public final class SystemLoggingMonitor implements Monitor { this.verbose = verbose; } + @Override public void note(String message) { System.out.println(message); } + @Override public void debug(char character) { if (verbose) { System.out.print(character); } } + @Override public void debug(String message) { if (verbose) { System.out.println(message); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java b/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java index 666f784..6788e09 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java @@ -53,6 +53,7 @@ public class FileProtocolSessionBuilder extends ProtocolSessionBuilder { * The name of the protocol session file. * @return The ProtocolSession */ + @Override public ProtocolSession buildProtocolSession(String fileName) throws Exception { ProtocolSession session = new ProtocolSession(); addTestFile(fileName, session); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java index 4c80dbc..77f9f86 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java @@ -142,6 +142,7 @@ public class ProtocolSession implements ProtocolInteractor { /** * adds a new Client request line to the test elements */ + @Override public void cl(String clientLine) { testElements.add(new ClientRequest(clientLine)); } @@ -150,6 +151,7 @@ public class ProtocolSession implements ProtocolInteractor { * adds a new Server Response line to the test elements, with the specified * location. */ + @Override public void sl(String serverLine, String location) { testElements.add(new ServerResponse(serverLine, location)); } @@ -157,6 +159,7 @@ public class ProtocolSession implements ProtocolInteractor { /** * adds a new Server Unordered Block to the test elements. */ + @Override public void sub(List<String> serverLines, String location) { testElements.add(new ServerUnorderedBlockResponse(serverLines, location)); } @@ -164,6 +167,7 @@ public class ProtocolSession implements ProtocolInteractor { /** * adds a new Client request line to the test elements */ + @Override public void cl(int sessionNumber, String clientLine) { this.maxSessionNumber = Math.max(this.maxSessionNumber, sessionNumber); testElements.add(new ClientRequest(sessionNumber, clientLine)); @@ -172,6 +176,7 @@ public class ProtocolSession implements ProtocolInteractor { /** * Adds a continuation. To allow one thread to be used for testing. */ + @Override public void cont(int sessionNumber) throws Exception { this.maxSessionNumber = Math.max(this.maxSessionNumber, sessionNumber); testElements.add(new ContinuationElement(sessionNumber)); @@ -181,6 +186,7 @@ public class ProtocolSession implements ProtocolInteractor { * adds a new Server Response line to the test elements, with the specified * location. */ + @Override public void sl(int sessionNumber, String serverLine, String location, String lastClientMessage) { this.maxSessionNumber = Math.max(this.maxSessionNumber, sessionNumber); testElements.add(new ServerResponse(sessionNumber, serverLine, location, lastClientMessage)); @@ -189,6 +195,7 @@ public class ProtocolSession implements ProtocolInteractor { /** * adds a new Server Unordered Block to the test elements. */ + @Override public void sub(int sessionNumber, List<String> serverLines, String location, String lastClientMessage) { this.maxSessionNumber = Math.max(this.maxSessionNumber, sessionNumber); testElements.add(new ServerUnorderedBlockResponse(sessionNumber, serverLines, location, lastClientMessage)); @@ -249,6 +256,7 @@ public class ProtocolSession implements ProtocolInteractor { * * @throws Exception */ + @Override public void testProtocol(Session[] sessions, boolean continueAfterFailure) throws Exception { if (sessionNumber < 0) { for (Session session : sessions) { @@ -265,6 +273,7 @@ public class ProtocolSession implements ProtocolInteractor { session.writeLine(message); } + @Override public boolean isClient() { return true; } @@ -329,6 +338,7 @@ public class ProtocolSession implements ProtocolInteractor { * If the actual server response didn't match the regular * expression expected. */ + @Override public void testProtocol(Session[] sessions, boolean continueAfterFailure) throws Exception { if (sessionNumber < 0) { for (Session session : sessions) { @@ -379,6 +389,7 @@ public class ProtocolSession implements ProtocolInteractor { } } + @Override public boolean isClient() { return false; } @@ -435,6 +446,7 @@ public class ProtocolSession implements ProtocolInteractor { * If a line is encountered which doesn't match one of the * expected lines. */ + @Override protected void checkResponse(Session session, boolean continueAfterFailure) throws Exception { List<String> testLines = new ArrayList<>(expectedLines); while (testLines.size() > 0) { @@ -473,6 +485,7 @@ public class ProtocolSession implements ProtocolInteractor { this.sessionNumber = Math.max(0, sessionNumber); } + @Override public void testProtocol(Session[] sessions, boolean continueAfterFailure) throws Exception { Session session = sessions[sessionNumber]; continuationExpected = true; @@ -490,6 +503,7 @@ public class ProtocolSession implements ProtocolInteractor { } } + @Override public boolean isClient() { return false; } @@ -511,11 +525,13 @@ public class ProtocolSession implements ProtocolInteractor { this.sessionNumber = Math.max(0, sessionNumber); } + @Override public void testProtocol(Session[] sessions, boolean continueAfterFailure) throws Exception { Session session = sessions[sessionNumber]; session.restart(); } + @Override public boolean isClient() { return false; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java b/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java index 33b5eba..93dc6bb 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java @@ -51,6 +51,7 @@ public class GenericSimpleScriptedTestProtocol<T extends HostSystem, SelfT exten this.password = password; } + @Override public void prepare(HostSystem system) throws Exception { try { system.addUser(user, password); @@ -151,6 +152,7 @@ public class GenericSimpleScriptedTestProtocol<T extends HostSystem, SelfT exten public ProtocolSession session; + @Override public void doContinue() { if (session != null) { session.doContinue(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/script/ImapScriptedTestProtocol.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/script/ImapScriptedTestProtocol.java b/mpt/core/src/main/java/org/apache/james/mpt/script/ImapScriptedTestProtocol.java index cc32d1b..f968a32 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/script/ImapScriptedTestProtocol.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/script/ImapScriptedTestProtocol.java @@ -51,6 +51,7 @@ public class ImapScriptedTestProtocol extends GenericSimpleScriptedTestProtocol< this.rights = rights; } + @Override public void prepare(ImapHostSystem system) throws Exception { system.grantRights(mailboxPath, userName, rights); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java b/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java index 1f39963..1568ba6 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java @@ -65,6 +65,7 @@ public final class ExternalSession implements Session { this.shabang = shabang; } + @Override public String readLine() throws Exception { StringBuffer buffer = new StringBuffer(); readlineInto(buffer); @@ -138,6 +139,7 @@ public final class ExternalSession implements Session { return true; } + @Override public void start() throws Exception { while (!socket.finishConnect()) { monitor.note("connecting..."); @@ -145,15 +147,18 @@ public final class ExternalSession implements Session { } } + @Override public void restart() throws Exception { throw new NotImplementedException("Restart is not implemented for ExternalSession"); } + @Override public void stop() throws Exception { monitor.note("closing"); socket.close(); } + @Override public void writeLine(String line) throws Exception { monitor.note("-> " + line); monitor.debug("[Writing line]"); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSessionFactory.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSessionFactory.java b/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSessionFactory.java index 51d49a5..f1fbaf0 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSessionFactory.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSessionFactory.java @@ -52,6 +52,7 @@ public class ExternalSessionFactory implements SessionFactory { this.address = address; } + @Override public Session newSession(Continuation continuation) throws Exception { InetSocketAddress address = getAddress(); monitor.note("Connecting to " + address.getHostName() + ":" + address.getPort()); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java b/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java index 1630160..5f6eeca 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java @@ -83,6 +83,7 @@ public class ScriptedUserAdder implements UserAdder { * @throws Exception upon failure * @throws NullPointerException when script has not been set */ + @Override public void addUser(String user, String password) throws Exception { final StringReader reader = new StringReader(script); addUser(user, password, reader); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java b/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java index 1d4b3f4..53dfd5d 100644 --- a/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java +++ b/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java @@ -134,6 +134,7 @@ public class DiscardProtocol { } private final class SocketMonitor implements Runnable { + @Override public void run() { try { long lastConnection = System.currentTimeMillis(); @@ -209,6 +210,7 @@ public class DiscardProtocol { this.socketChannel = socketChannel; } + @Override public void run() { try { if (socketChannel == null) { @@ -269,6 +271,7 @@ public class DiscardProtocol { /** * Blocks until connection is complete (closed) */ + @Override public synchronized String complete() throws Exception { if (aborted) { throw new Exception("Aborted"); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/test/java/org/apache/james/mpt/TestDiscardProtocol.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/test/java/org/apache/james/mpt/TestDiscardProtocol.java b/mpt/core/src/test/java/org/apache/james/mpt/TestDiscardProtocol.java index 1bde877..787a426 100644 --- a/mpt/core/src/test/java/org/apache/james/mpt/TestDiscardProtocol.java +++ b/mpt/core/src/test/java/org/apache/james/mpt/TestDiscardProtocol.java @@ -33,6 +33,7 @@ public class TestDiscardProtocol extends TestCase { private final class InputLater implements Runnable { private Exception e; + @Override public void run() { try { Thread.sleep(1000); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/core/src/test/java/org/apache/james/mpt/TestScriptedUserAdder.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/test/java/org/apache/james/mpt/TestScriptedUserAdder.java b/mpt/core/src/test/java/org/apache/james/mpt/TestScriptedUserAdder.java index 940bf35..b3d461d 100644 --- a/mpt/core/src/test/java/org/apache/james/mpt/TestScriptedUserAdder.java +++ b/mpt/core/src/test/java/org/apache/james/mpt/TestScriptedUserAdder.java @@ -29,6 +29,7 @@ public class TestScriptedUserAdder extends TestCase { private DiscardProtocol.Record record; + @Override protected void setUp() throws Exception { super.setUp(); protocol = new DiscardProtocol(); @@ -36,6 +37,7 @@ public class TestScriptedUserAdder extends TestCase { record = protocol.recordNext(); } + @Override protected void tearDown() throws Exception { super.tearDown(); protocol.stop(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraQuotaTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraQuotaTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraQuotaTest.java index 00ba775..5c67d44 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraQuotaTest.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraQuotaTest.java @@ -40,6 +40,7 @@ public class CassandraQuotaTest extends QuotaTest { return cassandraHostSystemRule.getImapHostSystem(); } + @Override @After public void tearDown() throws Exception { cassandraHostSystemRule.clean(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java index 21386e7..1d6fe94 100644 --- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java +++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java @@ -86,6 +86,7 @@ public abstract class JamesImapHostSystem implements ImapHostSystem, GrantRights return true; } + @Override public Session newSession(Continuation continuation) throws Exception { return new Session(continuation); @@ -93,6 +94,7 @@ public abstract class JamesImapHostSystem implements ImapHostSystem, GrantRights protected abstract MailboxManager getMailboxManager(); + @Override public void createMailbox(MailboxPath mailboxPath) throws Exception { MailboxManager mailboxManager = getMailboxManager(); MailboxSession mailboxSession = mailboxManager.createSystemSession(mailboxPath.getUser()); @@ -102,6 +104,7 @@ public abstract class JamesImapHostSystem implements ImapHostSystem, GrantRights mailboxManager.endProcessingRequest(mailboxSession); } + @Override public void grantRights(MailboxPath mailboxPath, String userName, MailboxACL.Rfc4314Rights rights) throws Exception { MailboxManager mailboxManager = getMailboxManager(); MailboxSession mailboxSession = mailboxManager.createSystemSession(mailboxPath.getUser()); @@ -134,6 +137,7 @@ public abstract class JamesImapHostSystem implements ImapHostSystem, GrantRights session = new FakeImapSession(); } + @Override public String readLine() throws Exception { if (!isReadLast) { handler.handleRequest(in, out, session); @@ -142,19 +146,23 @@ public abstract class JamesImapHostSystem implements ImapHostSystem, GrantRights return out.nextLine(); } + @Override public void start() throws Exception { // Welcome message handled in the server out.write("* OK IMAP4rev1 Server ready\r\n"); } + @Override public void restart() throws Exception { session = new FakeImapSession(); } + @Override public void stop() throws Exception { session.deselect(); } + @Override public void writeLine(String line) throws Exception { isReadLast = false; in.nextLine(line); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusACLCommands.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusACLCommands.java b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusACLCommands.java index b00dbda..ae04e46 100644 --- a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusACLCommands.java +++ b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusACLCommands.java @@ -33,6 +33,7 @@ public class CyrusACLCommands extends ACLCommands { private ImapHostSystem system; private GrantRightsOnHost grantRightsOnHost; + @Override @Before public void setUp() throws Exception { Injector injector = Guice.createInjector(new CyrusMailboxTestModule()); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusACLIntegration.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusACLIntegration.java b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusACLIntegration.java index 51f5aa6..84f7367 100644 --- a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusACLIntegration.java +++ b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusACLIntegration.java @@ -35,6 +35,7 @@ public class CyrusACLIntegration extends ACLIntegration { private GrantRightsOnHost grantRightsOnHost; private MailboxMessageAppender mailboxMessageAppender; + @Override @Before public void setUp() throws Exception { Injector injector = Guice.createInjector(new CyrusMailboxTestModule()); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/CyrusHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/CyrusHostSystem.java b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/CyrusHostSystem.java index 8ba0956..220972c 100644 --- a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/CyrusHostSystem.java +++ b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/CyrusHostSystem.java @@ -74,11 +74,13 @@ public class CyrusHostSystem extends ExternalHostSystem implements Provider<Cont return true; } + @Override public void beforeTest() throws Exception { container = docker.start(); addressSupplier = () -> new InetSocketAddress(docker.getHost(container), docker.getIMAPPort(container)); } + @Override public void afterTest() throws Exception { docker.stop(container); container = null; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/GrantRightsOnCyrusHost.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/GrantRightsOnCyrusHost.java b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/GrantRightsOnCyrusHost.java index 59a9460..e49a89b 100644 --- a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/GrantRightsOnCyrusHost.java +++ b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/GrantRightsOnCyrusHost.java @@ -36,6 +36,7 @@ public class GrantRightsOnCyrusHost implements GrantRightsOnHost { this.system = system; } + @Override public void grantRights(MailboxPath mailboxPath, String userName, MailboxACL.Rfc4314Rights rights) throws Exception { ProtocolSession protocolSession = system.logAndGetAdminProtocolSession(new ProtocolSession()); protocolSession.cl(String.format("A1 SETACL %s %s %s", http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/MailboxMessageAppenderOnCyrusHost.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/MailboxMessageAppenderOnCyrusHost.java b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/MailboxMessageAppenderOnCyrusHost.java index 41d42d7..c541f77 100644 --- a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/MailboxMessageAppenderOnCyrusHost.java +++ b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/MailboxMessageAppenderOnCyrusHost.java @@ -35,6 +35,7 @@ public class MailboxMessageAppenderOnCyrusHost implements MailboxMessageAppender this.hostSystem = hostSystem; } + @Override public void fillMailbox(MailboxPath mailboxPath) { String mailboxName = hostSystem.createMailboxStringFromMailboxPath(mailboxPath); ProtocolSession protocolSession = hostSystem.logAndGetAdminProtocolSession(new ProtocolSession()); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchUidSearchOnIndex.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchUidSearchOnIndex.java b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchUidSearchOnIndex.java index 186ee31..47b4663 100644 --- a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchUidSearchOnIndex.java +++ b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchUidSearchOnIndex.java @@ -29,6 +29,7 @@ public class ElasticSearchUidSearchOnIndex extends UidSearchOnIndex { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = new ElasticSearchHostSystem(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidation.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidation.java b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidation.java index f223ab7..bb055e3 100644 --- a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidation.java +++ b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidation.java @@ -31,6 +31,7 @@ public class JamesDeploymentValidation extends DeploymentValidation { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { Injector injector = Guice.createInjector(new ExternalJamesModule()); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/ExternalJamesHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/ExternalJamesHostSystem.java b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/ExternalJamesHostSystem.java index 782629a..38ddd84 100644 --- a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/ExternalJamesHostSystem.java +++ b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/ExternalJamesHostSystem.java @@ -64,10 +64,12 @@ public class ExternalJamesHostSystem extends ExternalHostSystem { return super.addUser(user, password); } + @Override public void beforeTest() throws Exception { } + @Override public void afterTest() throws Exception { } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatePlain.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatePlain.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatePlain.java index 0882dc5..2c2b724 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatePlain.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatePlain.java @@ -31,6 +31,7 @@ public class HBaseAuthenticatePlain extends AuthenticatePlain { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatedState.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatedState.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatedState.java index f8e63fa..d6aed77 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatedState.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatedState.java @@ -31,6 +31,7 @@ public class HBaseAuthenticatedState extends AuthenticatedState { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseConcurrentSessions.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseConcurrentSessions.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseConcurrentSessions.java index 206ff86..789e365 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseConcurrentSessions.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseConcurrentSessions.java @@ -31,6 +31,7 @@ public class HBaseConcurrentSessions extends ConcurrentSessions { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java index 2d9e2e7..b252eb1 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java @@ -31,6 +31,7 @@ public class HBaseCondstore extends Condstore { private JamesImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCopy.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCopy.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCopy.java index f19afc4..58ea413 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCopy.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCopy.java @@ -31,6 +31,7 @@ public class HBaseCopy extends Copy { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseEvents.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseEvents.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseEvents.java index 7e3d113..393459b 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseEvents.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseEvents.java @@ -31,6 +31,7 @@ public class HBaseEvents extends Events { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseExpunge.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseExpunge.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseExpunge.java index 46769ca..7bbb394 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseExpunge.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseExpunge.java @@ -31,6 +31,7 @@ public class HBaseExpunge extends Expunge { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetch.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetch.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetch.java index 02b6b11..74a9984 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetch.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetch.java @@ -31,6 +31,7 @@ public class HBaseFetch extends Fetch { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodySection.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodySection.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodySection.java index da4b486..c2669e2 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodySection.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodySection.java @@ -31,6 +31,7 @@ public class HBaseFetchBodySection extends FetchBodySection { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodyStructure.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodyStructure.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodyStructure.java index 8385a06..69bc086 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodyStructure.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodyStructure.java @@ -31,6 +31,7 @@ public class HBaseFetchBodyStructure extends FetchBodyStructure { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchHeaders.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchHeaders.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchHeaders.java index ba852ff..1945c6a 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchHeaders.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchHeaders.java @@ -31,6 +31,7 @@ public class HBaseFetchHeaders extends FetchHeaders { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseListing.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseListing.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseListing.java index 13318d8..f62804c 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseListing.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseListing.java @@ -31,6 +31,7 @@ public class HBaseListing extends Listing { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxAnnotation.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxAnnotation.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxAnnotation.java index f6f28e2..02cf0f9 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxAnnotation.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxAnnotation.java @@ -31,6 +31,7 @@ public class HBaseMailboxAnnotation extends MailboxAnnotation { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxWithLongNameError.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxWithLongNameError.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxWithLongNameError.java index ddc806e..cf298e4 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxWithLongNameError.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxWithLongNameError.java @@ -31,6 +31,7 @@ public class HBaseMailboxWithLongNameError extends MailboxWithLongNameError { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMove.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMove.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMove.java index eee86dc..ed57f4b 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMove.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMove.java @@ -31,6 +31,7 @@ public class HBaseMove extends Move { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseNonAuthenticatedState.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseNonAuthenticatedState.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseNonAuthenticatedState.java index ca9e768..04c0bc6 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseNonAuthenticatedState.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseNonAuthenticatedState.java @@ -31,6 +31,7 @@ public class HBaseNonAuthenticatedState extends NonAuthenticatedState { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBasePartialFetch.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBasePartialFetch.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBasePartialFetch.java index a58a88b..b7138ba 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBasePartialFetch.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBasePartialFetch.java @@ -31,6 +31,7 @@ public class HBasePartialFetch extends PartialFetch { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseQuotaTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseQuotaTest.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseQuotaTest.java index ae1b1e7..053fd62 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseQuotaTest.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseQuotaTest.java @@ -31,6 +31,7 @@ public class HBaseQuotaTest extends QuotaTest { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); @@ -43,6 +44,7 @@ public class HBaseQuotaTest extends QuotaTest { return system; } + @Override @After public void tearDown() throws Exception { system.afterTest(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseRename.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseRename.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseRename.java index 9b58f5a..958a9a1 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseRename.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseRename.java @@ -31,6 +31,7 @@ public class HBaseRename extends Rename { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSearch.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSearch.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSearch.java index fdec8ca..020e690 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSearch.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSearch.java @@ -31,6 +31,7 @@ public class HBaseSearch extends Search { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSecurity.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSecurity.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSecurity.java index d4b3165..5bbb3d8 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSecurity.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSecurity.java @@ -31,6 +31,7 @@ public class HBaseSecurity extends Security { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelect.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelect.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelect.java index d747cdc..933da88 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelect.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelect.java @@ -31,6 +31,7 @@ public class HBaseSelect extends Select { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedInbox.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedInbox.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedInbox.java index 0ccfff9..15f5035 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedInbox.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedInbox.java @@ -31,6 +31,7 @@ public class HBaseSelectedInbox extends SelectedInbox { private ImapHostSystem system; + @Override @Before public void setUp() throws Exception { system = HBaseHostSystem.build(); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
