Repository: james-project Updated Branches: refs/heads/master 6d30e8db7 -> 18bca9849
MAILET-108 Remove unused headers and other intellij warnings Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/19444cae Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/19444cae Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/19444cae Branch: refs/heads/master Commit: 19444cae6f8fc1cb4bad295945b78671240da93a Parents: 6d30e8d Author: Benoit Tellier <btell...@linagora.com> Authored: Wed Aug 17 12:12:20 2016 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Mon Aug 29 17:38:18 2016 +0700 ---------------------------------------------------------------------- .../james/transport/matchers/AllTest.java | 13 +++++++------ .../transport/matchers/FetchedFromTest.java | 12 ++++++------ .../matchers/HasMailAttributeTest.java | 1 - .../HasMailAttributeWithValueRegexTest.java | 8 ++++---- .../matchers/HasMailAttributeWithValueTest.java | 8 ++++---- .../transport/matchers/HostIsLocalTest.java | 20 ++++++++++---------- .../james/transport/matchers/HostIsTest.java | 10 +++++----- .../matchers/IsSingleRecipientTest.java | 10 +++++----- .../transport/matchers/NESSpamCheckTest.java | 10 +++++----- .../matchers/SMTPAuthSuccessfulTest.java | 1 - .../matchers/SMTPIsAuthNetworkTest.java | 10 +++++----- .../transport/matchers/SizeGreaterThanTest.java | 12 ++++++------ 12 files changed, 57 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/mailet/standard/src/test/java/org/apache/james/transport/matchers/AllTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/AllTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/AllTest.java index 803dccb..e019357 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/AllTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/AllTest.java @@ -20,21 +20,22 @@ package org.apache.james.transport.matchers; -import org.apache.james.transport.matchers.All; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.Collection; + +import javax.mail.MessagingException; + import org.apache.mailet.MailAddress; import org.apache.mailet.Matcher; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; import org.apache.mailet.base.test.FakeMatcherConfig; import org.apache.mailet.base.test.MailUtil; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import org.junit.Before; import org.junit.Test; -import javax.mail.MessagingException; -import java.util.Collection; - public class AllTest { private Matcher matcher; http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/mailet/standard/src/test/java/org/apache/james/transport/matchers/FetchedFromTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/FetchedFromTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/FetchedFromTest.java index c6589d6..211403a 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/FetchedFromTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/FetchedFromTest.java @@ -20,7 +20,12 @@ package org.apache.james.transport.matchers; -import org.apache.james.transport.matchers.FetchedFrom; +import java.util.Collection; + +import javax.mail.MessagingException; +import javax.mail.internet.MimeMessage; +import javax.mail.internet.ParseException; + import org.apache.mailet.MailAddress; import org.apache.mailet.Matcher; import org.apache.mailet.base.test.FakeMail; @@ -30,11 +35,6 @@ import org.apache.mailet.base.test.MailUtil; import org.junit.Assert; import org.junit.Test; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.ParseException; -import java.util.Collection; - public class FetchedFromTest { private MimeMessage mockedMimeMessage; http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/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 ca69915..c5776b6 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 @@ -20,7 +20,6 @@ package org.apache.james.transport.matchers; -import org.apache.james.transport.matchers.HasMailAttribute; import org.apache.mailet.base.GenericMatcher; public class HasMailAttributeTest extends AbstractHasMailAttributeTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/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 9e3e8ea..d37c08a 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 @@ -20,12 +20,12 @@ package org.apache.james.transport.matchers; -import org.apache.james.transport.matchers.HasMailAttributeWithValueRegex; -import org.apache.mailet.MailAddress; -import org.apache.mailet.base.GenericMatcher; +import java.util.Collection; import javax.mail.MessagingException; -import java.util.Collection; + +import org.apache.mailet.MailAddress; +import org.apache.mailet.base.GenericMatcher; import junit.framework.AssertionFailedError; http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/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 9b99617..cc7fabb 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 @@ -20,12 +20,12 @@ package org.apache.james.transport.matchers; -import org.apache.james.transport.matchers.HasMailAttributeWithValue; -import org.apache.mailet.MailAddress; -import org.apache.mailet.base.GenericMatcher; +import java.util.Collection; import javax.mail.MessagingException; -import java.util.Collection; + +import org.apache.mailet.MailAddress; +import org.apache.mailet.base.GenericMatcher; public class HasMailAttributeWithValueTest extends AbstractHasMailAttributeTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java index b4a363b..78e5cf3 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java @@ -20,7 +20,15 @@ package org.apache.james.transport.matchers; -import org.apache.james.transport.matchers.HostIsLocal; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; + +import javax.mail.MessagingException; +import javax.mail.internet.MimeMessage; + import org.apache.mailet.HostAddress; import org.apache.mailet.LookupException; import org.apache.mailet.Mail; @@ -33,14 +41,6 @@ import org.apache.mailet.base.test.FakeMatcherConfig; import org.junit.Assert; import org.junit.Test; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; - @SuppressWarnings("deprecation") public class HostIsLocalTest { @@ -188,7 +188,7 @@ public class HostIsLocalTest { "Unimplemented mock service"); } - public List<String> dnsLookup(String name, RecordType type) throws TemporaryLookupException, LookupException { + public List<String> dnsLookup(String name, RecordType type) throws LookupException { throw new UnsupportedOperationException( "Unimplemented mock service"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsTest.java index 0ceacb1..65715a3 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsTest.java @@ -20,7 +20,11 @@ package org.apache.james.transport.matchers; -import org.apache.james.transport.matchers.HostIs; +import java.util.Arrays; +import java.util.Collection; + +import javax.mail.MessagingException; + import org.apache.mailet.MailAddress; import org.apache.mailet.Matcher; import org.apache.mailet.base.test.FakeMail; @@ -29,10 +33,6 @@ import org.apache.mailet.base.test.FakeMatcherConfig; import org.junit.Assert; import org.junit.Test; -import javax.mail.MessagingException; -import java.util.Arrays; -import java.util.Collection; - public class HostIsTest { private FakeMail mockedMail; http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/mailet/standard/src/test/java/org/apache/james/transport/matchers/IsSingleRecipientTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/IsSingleRecipientTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/IsSingleRecipientTest.java index 51de54c..1423fdb 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/IsSingleRecipientTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/IsSingleRecipientTest.java @@ -20,7 +20,11 @@ package org.apache.james.transport.matchers; -import org.apache.james.transport.matchers.IsSingleRecipient; +import java.util.Arrays; +import java.util.Collection; + +import javax.mail.MessagingException; + import org.apache.mailet.MailAddress; import org.apache.mailet.Matcher; import org.apache.mailet.base.test.FakeMail; @@ -29,10 +33,6 @@ import org.apache.mailet.base.test.FakeMatcherConfig; import org.junit.Assert; import org.junit.Test; -import javax.mail.MessagingException; -import java.util.Arrays; -import java.util.Collection; - public class IsSingleRecipientTest { private FakeMail mockedMail; http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/mailet/standard/src/test/java/org/apache/james/transport/matchers/NESSpamCheckTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/NESSpamCheckTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/NESSpamCheckTest.java index c3b1b02..74a04a2 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/NESSpamCheckTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/NESSpamCheckTest.java @@ -20,7 +20,11 @@ package org.apache.james.transport.matchers; -import org.apache.james.transport.matchers.NESSpamCheck; +import java.util.Collection; + +import javax.mail.MessagingException; +import javax.mail.internet.MimeMessage; + import org.apache.mailet.MailAddress; import org.apache.mailet.Matcher; import org.apache.mailet.base.RFC2822Headers; @@ -31,10 +35,6 @@ import org.apache.mailet.base.test.MailUtil; import org.junit.Assert; import org.junit.Test; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; -import java.util.Collection; - public class NESSpamCheckTest { private MimeMessage mockedMimeMessage; http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java index ead2e61..83df994 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java @@ -20,7 +20,6 @@ package org.apache.james.transport.matchers; -import org.apache.james.transport.matchers.SMTPAuthSuccessful; import org.apache.mailet.base.GenericMatcher; public class SMTPAuthSuccessfulTest extends AbstractHasMailAttributeTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java index 4a30f75..2f2fb66 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java @@ -20,7 +20,11 @@ package org.apache.james.transport.matchers; -import org.apache.james.transport.matchers.SMTPIsAuthNetwork; +import java.util.Collection; + +import javax.mail.MessagingException; +import javax.mail.internet.ParseException; + import org.apache.mailet.MailAddress; import org.apache.mailet.Matcher; import org.apache.mailet.base.test.FakeMail; @@ -30,10 +34,6 @@ import org.apache.mailet.base.test.MailUtil; import org.junit.Assert; import org.junit.Test; -import javax.mail.MessagingException; -import javax.mail.internet.ParseException; -import java.util.Collection; - public class SMTPIsAuthNetworkTest { private FakeMail mockedMail; http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/mailet/standard/src/test/java/org/apache/james/transport/matchers/SizeGreaterThanTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SizeGreaterThanTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SizeGreaterThanTest.java index d494206..0fb6727 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SizeGreaterThanTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SizeGreaterThanTest.java @@ -20,7 +20,12 @@ package org.apache.james.transport.matchers; -import org.apache.james.transport.matchers.SizeGreaterThan; +import java.util.Arrays; +import java.util.Collection; + +import javax.mail.MessagingException; +import javax.mail.internet.ParseException; + import org.apache.mailet.MailAddress; import org.apache.mailet.Matcher; import org.apache.mailet.base.test.FakeMail; @@ -29,11 +34,6 @@ import org.apache.mailet.base.test.FakeMatcherConfig; import org.junit.Assert; import org.junit.Test; -import javax.mail.MessagingException; -import javax.mail.internet.ParseException; -import java.util.Arrays; -import java.util.Collection; - public class SizeGreaterThanTest { private FakeMail mockedMail; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org