http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/FlagsDataTransferObject.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/FlagsDataTransferObject.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/FlagsDataTransferObject.java index a2c168f..08515ab 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/FlagsDataTransferObject.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/FlagsDataTransferObject.java @@ -19,11 +19,11 @@ package org.apache.james.mailbox.store.json.event.dto; +import javax.mail.Flags; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import javax.mail.Flags; - public class FlagsDataTransferObject { @JsonProperty() private boolean answered;
http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/LocaleDataTransferObject.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/LocaleDataTransferObject.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/LocaleDataTransferObject.java index 2b9bd18..dfbf307 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/LocaleDataTransferObject.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/LocaleDataTransferObject.java @@ -19,11 +19,11 @@ package org.apache.james.mailbox.store.json.event.dto; +import java.util.Locale; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.Locale; - public class LocaleDataTransferObject { @JsonProperty() private String country; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/MailboxPathDataTransferObject.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/MailboxPathDataTransferObject.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/MailboxPathDataTransferObject.java index c52113d..f2755bb 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/MailboxPathDataTransferObject.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/MailboxPathDataTransferObject.java @@ -19,9 +19,10 @@ package org.apache.james.mailbox.store.json.event.dto; +import org.apache.james.mailbox.model.MailboxPath; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.james.mailbox.model.MailboxPath; public class MailboxPathDataTransferObject { @JsonProperty() http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/SerializableQuota.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/SerializableQuota.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/SerializableQuota.java index 100b609..a636677 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/SerializableQuota.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/SerializableQuota.java @@ -19,10 +19,10 @@ package org.apache.james.mailbox.store.mail.model; -import org.apache.james.mailbox.model.Quota; - import java.io.Serializable; +import org.apache.james.mailbox.model.Quota; + public class SerializableQuota implements Serializable { private final long max; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java index 6d4c65a..78670b4 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java @@ -39,6 +39,7 @@ import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_CONTE import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_MEDIA_TYPE_NAME; import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_MIME_TYPE_SPACE; import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_SUB_TYPE_NAME; + import java.util.ArrayList; import java.util.Iterator; import java.util.List; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/FixedMaxQuotaManager.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/FixedMaxQuotaManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/FixedMaxQuotaManager.java index 244935d..6e64b52 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/FixedMaxQuotaManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/FixedMaxQuotaManager.java @@ -2,9 +2,9 @@ package org.apache.james.mailbox.store.quota; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.UnsupportedOperationException; -import org.apache.james.mailbox.quota.MaxQuotaManager; import org.apache.james.mailbox.model.Quota; import org.apache.james.mailbox.model.QuotaRoot; +import org.apache.james.mailbox.quota.MaxQuotaManager; /** * {@link MaxQuotaManager} which use the same quota for all users. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaImpl.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaImpl.java index 852b295..294de6e 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaImpl.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaImpl.java @@ -18,11 +18,11 @@ ****************************************************************/ package org.apache.james.mailbox.store.quota; +import org.apache.james.mailbox.model.Quota; + import com.google.common.base.Objects; import com.google.common.base.Preconditions; -import org.apache.james.mailbox.model.Quota; - public final class QuotaImpl implements Quota { private static final Quota UNLIMITED_QUOTA = new QuotaImpl(UNKNOWN, UNLIMITED); http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaRootImpl.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaRootImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaRootImpl.java index 347c1b0..6ef8e4e 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaRootImpl.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaRootImpl.java @@ -19,9 +19,10 @@ package org.apache.james.mailbox.store.quota; -import com.google.common.base.Objects; import org.apache.james.mailbox.model.QuotaRoot; +import com.google.common.base.Objects; + public class QuotaRootImpl implements QuotaRoot { public static QuotaRoot quotaRoot(String value) { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/StoreQuotaManager.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/StoreQuotaManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/StoreQuotaManager.java index a5e9dba..5c5cef4 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/StoreQuotaManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/StoreQuotaManager.java @@ -19,14 +19,14 @@ package org.apache.james.mailbox.store.quota; -import org.apache.james.mailbox.quota.CurrentQuotaManager; -import org.apache.james.mailbox.quota.MaxQuotaManager; -import org.apache.james.mailbox.quota.QuotaManager; +import javax.inject.Inject; + import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.Quota; import org.apache.james.mailbox.model.QuotaRoot; - -import javax.inject.Inject; +import org.apache.james.mailbox.quota.CurrentQuotaManager; +import org.apache.james.mailbox.quota.MaxQuotaManager; +import org.apache.james.mailbox.quota.QuotaManager; /** * Default implementation for the Quota Manager. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java index 6796b7e..0c63a9e 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java @@ -28,7 +28,6 @@ import java.util.stream.Stream; import javax.inject.Inject; -import com.github.fge.lambdas.Throwing; import org.apache.james.mailbox.MailboxManager.MessageCapabilities; import org.apache.james.mailbox.MailboxManager.SearchCapabilities; import org.apache.james.mailbox.MailboxSession; @@ -51,6 +50,7 @@ import org.apache.james.mailbox.store.mail.MessageMapperFactory; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.MailboxMessage; +import com.github.fge.lambdas.Throwing; import com.github.steveash.guavate.Guavate; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java index b465178..050c748 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java @@ -18,11 +18,6 @@ ****************************************************************/ package org.apache.james.mailbox.store.streaming; -import org.apache.james.mailbox.exception.MailboxException; -import org.apache.james.mailbox.model.Content; -import org.apache.james.mailbox.model.MessageResult; -import org.apache.james.mailbox.model.MessageResult.Header; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -30,6 +25,11 @@ import java.io.InputStream; import java.io.SequenceInputStream; import java.util.List; +import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.model.Content; +import org.apache.james.mailbox.model.MessageResult; +import org.apache.james.mailbox.model.MessageResult.Header; + /** * Abstract base class for {@link Content} implementations which hold the headers and * the body a email http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java index 9c38138..c414601 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java @@ -19,6 +19,7 @@ package org.apache.james.mailbox.store; +import static org.apache.james.mailbox.fixture.MailboxFixture.ALICE; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -29,8 +30,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import static org.apache.james.mailbox.fixture.MailboxFixture.ALICE; - import java.util.List; import javax.mail.Flags; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/PublisherReceiver.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/PublisherReceiver.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/PublisherReceiver.java index 907b668..d6a03f4 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/PublisherReceiver.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/PublisherReceiver.java @@ -19,13 +19,14 @@ package org.apache.james.mailbox.store.event.distributed; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import org.apache.james.mailbox.store.publisher.MessageConsumer; import org.apache.james.mailbox.store.publisher.MessageReceiver; import org.apache.james.mailbox.store.publisher.Publisher; import org.apache.james.mailbox.store.publisher.Topic; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; + public class PublisherReceiver implements Publisher, MessageConsumer { private final Multimap<Topic, MessageReceiver> messageReceiverMultimap; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssert.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssert.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssert.java index 69439ca..cf2ab15 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssert.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssert.java @@ -20,6 +20,7 @@ package org.apache.james.mailbox.store.mail.model; import static org.assertj.core.api.Assertions.assertThat; + import java.util.List; import org.apache.james.mailbox.model.MailboxId; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessagePropertiesAssert.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessagePropertiesAssert.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessagePropertiesAssert.java index 11153b8..c15c6a0 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessagePropertiesAssert.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessagePropertiesAssert.java @@ -20,6 +20,7 @@ package org.apache.james.mailbox.store.mail.model; import static org.assertj.core.api.Assertions.assertThat; + import java.util.List; import java.util.function.Function; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java index e445b14..f8f0636 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java @@ -20,6 +20,7 @@ package org.apache.james.mailbox.store.mail.model; import static org.assertj.core.api.Assertions.assertThat; + import org.apache.james.mailbox.acl.ACLDiff; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxACL; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/GenericMaxQuotaManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/GenericMaxQuotaManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/GenericMaxQuotaManagerTest.java index ff46574..e0de93a 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/GenericMaxQuotaManagerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/GenericMaxQuotaManagerTest.java @@ -19,14 +19,14 @@ package org.apache.james.mailbox.store.quota; +import static org.assertj.core.api.Assertions.assertThat; + import org.apache.james.mailbox.model.Quota; import org.apache.james.mailbox.model.QuotaRoot; import org.apache.james.mailbox.quota.MaxQuotaManager; import org.junit.Before; import org.junit.Test; -import static org.assertj.core.api.Assertions.assertThat; - public abstract class GenericMaxQuotaManagerTest { private QuotaRoot quotaRoot; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/events/FlagsMessageEvent.java ---------------------------------------------------------------------- diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/events/FlagsMessageEvent.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/events/FlagsMessageEvent.java index f45f225..ea83245 100644 --- a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/events/FlagsMessageEvent.java +++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/events/FlagsMessageEvent.java @@ -19,12 +19,12 @@ package org.apache.james.mailbox.indexer.events; -import com.google.common.base.Objects; +import javax.mail.Flags; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.model.MailboxPath; -import javax.mail.Flags; +import com.google.common.base.Objects; public class FlagsMessageEvent implements ImpactingMessageEvent { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/events/MessageDeletedEvent.java ---------------------------------------------------------------------- diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/events/MessageDeletedEvent.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/events/MessageDeletedEvent.java index 690586a..ee0a52a 100644 --- a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/events/MessageDeletedEvent.java +++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/events/MessageDeletedEvent.java @@ -19,11 +19,11 @@ package org.apache.james.mailbox.indexer.events; -import com.google.common.base.Objects; - import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.model.MailboxPath; +import com.google.common.base.Objects; + public class MessageDeletedEvent implements ImpactingMessageEvent { private final MailboxPath mailboxPath; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java ---------------------------------------------------------------------- diff --git a/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java b/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java index bc9bc5e..085d3cc 100644 --- a/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java +++ b/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java @@ -32,9 +32,9 @@ import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; import javax.sql.DataSource; +import org.apache.james.core.MailAddress; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.apache.mailet.base.RFC2822Headers; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java ---------------------------------------------------------------------- diff --git a/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java b/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java index ae4c863..8d80437 100644 --- a/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java +++ b/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java @@ -19,7 +19,6 @@ package org.apache.james.ai.classic; - import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.PreparedStatement; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/api/src/main/java/org/apache/mailet/Mail.java ---------------------------------------------------------------------- diff --git a/mailet/api/src/main/java/org/apache/mailet/Mail.java b/mailet/api/src/main/java/org/apache/mailet/Mail.java index 3339370..793ae6d 100644 --- a/mailet/api/src/main/java/org/apache/mailet/Mail.java +++ b/mailet/api/src/main/java/org/apache/mailet/Mail.java @@ -19,17 +19,17 @@ package org.apache.mailet; +import java.io.Serializable; +import java.util.Collection; +import java.util.Date; +import java.util.Iterator; + import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; import org.apache.james.core.MailAddress; import org.apache.mailet.PerRecipientHeaders.Header; -import java.io.Serializable; -import java.util.Collection; -import java.util.Date; -import java.util.Iterator; - /** * <p>Wraps a MimeMessage with additional routing and processing information. * <p>This includes http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/base/src/main/java/org/apache/mailet/base/AutomaticallySentMailDetectorImpl.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/AutomaticallySentMailDetectorImpl.java b/mailet/base/src/main/java/org/apache/mailet/base/AutomaticallySentMailDetectorImpl.java index 3cba4f5..1438eb2 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/AutomaticallySentMailDetectorImpl.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/AutomaticallySentMailDetectorImpl.java @@ -27,13 +27,13 @@ import java.util.Arrays; import javax.mail.MessagingException; +import org.apache.james.core.MailAddress; import org.apache.james.mime4j.MimeException; import org.apache.james.mime4j.parser.AbstractContentHandler; import org.apache.james.mime4j.parser.MimeStreamParser; import org.apache.james.mime4j.stream.BodyDescriptor; import org.apache.james.mime4j.stream.MimeConfig; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; public class AutomaticallySentMailDetectorImpl implements AutomaticallySentMailDetector { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/base/src/main/java/org/apache/mailet/base/FlowedMessageUtils.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/FlowedMessageUtils.java b/mailet/base/src/main/java/org/apache/mailet/base/FlowedMessageUtils.java index 73e4291..f4f068f 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/FlowedMessageUtils.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/FlowedMessageUtils.java @@ -19,12 +19,12 @@ package org.apache.mailet.base; +import java.io.IOException; + import javax.mail.Message; import javax.mail.MessagingException; import javax.mail.internet.ContentType; -import java.io.IOException; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java b/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java index 262965f..9dc25dc 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java @@ -24,8 +24,8 @@ import java.util.Collection; import javax.mail.MessagingException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.MailetContext; import org.apache.mailet.Matcher; import org.apache.mailet.MatcherConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java b/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java index c7691bf..f63a6cd 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java @@ -25,8 +25,8 @@ import java.util.Collection; import javax.mail.MessagingException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java b/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java index 8249e49..97ad423 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java @@ -25,8 +25,8 @@ import java.util.Collection; import javax.mail.MessagingException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.Matcher; import org.apache.mailet.MatcherConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/base/src/test/java/org/apache/mailet/base/MailetUtilTest.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/MailetUtilTest.java b/mailet/base/src/test/java/org/apache/mailet/base/MailetUtilTest.java index e9981a3..64430ec 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/MailetUtilTest.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/MailetUtilTest.java @@ -20,6 +20,7 @@ package org.apache.mailet.base; import static org.assertj.core.api.Assertions.assertThat; + import javax.mail.MessagingException; import org.apache.mailet.base.test.FakeMailetConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/base/src/test/java/org/apache/mailet/base/MatcherInverterTest.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/MatcherInverterTest.java b/mailet/base/src/test/java/org/apache/mailet/base/MatcherInverterTest.java index bc49fec..ddcf874 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/MatcherInverterTest.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/MatcherInverterTest.java @@ -28,8 +28,8 @@ import java.util.Collection; import javax.mail.MessagingException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.base.test.FakeMail; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/base/src/test/java/org/apache/mailet/base/test/MailUtil.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/MailUtil.java b/mailet/base/src/test/java/org/apache/mailet/base/test/MailUtil.java index 148e352..ea432be 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/test/MailUtil.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/test/MailUtil.java @@ -25,8 +25,8 @@ import java.io.IOException; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; /** * some utilities for James unit testing http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java index f11b012..4676ff5 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java @@ -34,12 +34,12 @@ import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; import javax.mail.internet.ParseException; +import org.apache.james.core.MailAddress; import org.apache.james.transport.KeyHolder; import org.apache.james.transport.SMIMEAttributeNames; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.apache.mailet.base.RFC2822Headers; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMEEncrypted.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMEEncrypted.java b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMEEncrypted.java index f65344b..4358375 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMEEncrypted.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMEEncrypted.java @@ -25,9 +25,9 @@ import java.util.Collection; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; -import org.apache.mailet.base.GenericMatcher; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; +import org.apache.mailet.base.GenericMatcher; /** * Checks if a mail is smime encrypted. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMESigned.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMESigned.java b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMESigned.java index 5fd99a0..a730339 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMESigned.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMESigned.java @@ -25,9 +25,9 @@ import java.util.Collection; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; -import org.apache.mailet.base.GenericMatcher; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; +import org.apache.mailet.base.GenericMatcher; /** * checks if a mail is smime signed. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java index 8ccef7a..2c28328 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java @@ -29,8 +29,8 @@ import java.util.List; import javax.mail.MessagingException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.base.GenericMatcher; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java ---------------------------------------------------------------------- diff --git a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java index 1f64246..b561842 100644 --- a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java +++ b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java @@ -33,9 +33,9 @@ import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; import org.apache.commons.lang3.tuple.Pair; +import org.apache.james.core.MailAddress; import org.apache.james.transport.mailets.model.ICAL; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddDeliveredToHeader.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddDeliveredToHeader.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddDeliveredToHeader.java index c1651a0..9295b37 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddDeliveredToHeader.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddDeliveredToHeader.java @@ -21,8 +21,8 @@ package org.apache.james.transport.mailets; import javax.mail.MessagingException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.PerRecipientHeaders; import org.apache.mailet.base.GenericMailet; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java index 084880a..cdb0c49 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java @@ -40,9 +40,9 @@ import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; import org.apache.commons.io.IOUtils; +import org.apache.james.core.MailAddress; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.apache.mailet.base.RFC2822Headers; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/mailets/Null.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/Null.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/Null.java index 7f25514..53038fa 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/Null.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/Null.java @@ -21,8 +21,8 @@ package org.apache.james.transport.mailets; -import org.apache.mailet.base.GenericMailet; import org.apache.mailet.Mail; +import org.apache.mailet.base.GenericMailet; /** * Simplest Mailet which destroys any incoming messages http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecipientToLowerCase.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecipientToLowerCase.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecipientToLowerCase.java index 57968be..f87fc42 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecipientToLowerCase.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecipientToLowerCase.java @@ -19,11 +19,12 @@ package org.apache.james.transport.mailets; import java.util.Locale; + import javax.mail.MessagingException; import javax.mail.internet.AddressException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.base.GenericMailet; import com.github.steveash.guavate.Guavate; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java index aaf3193..4a3b14c 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java @@ -21,15 +21,16 @@ package org.apache.james.transport.mailets; +import javax.mail.MessagingException; + +import org.apache.mailet.Mail; +import org.apache.mailet.MailetException; +import org.apache.mailet.base.GenericMailet; + import com.google.common.base.Preconditions; import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; -import org.apache.mailet.base.GenericMailet; -import org.apache.mailet.Mail; -import org.apache.mailet.MailetException; - -import javax.mail.MessagingException; /** * This mailet sets attributes on the Mail. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/mailets/ServerTime.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ServerTime.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ServerTime.java index e375422..b58015c 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ServerTime.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ServerTime.java @@ -21,11 +21,11 @@ package org.apache.james.transport.mailets; +import javax.mail.internet.MimeMessage; + import org.apache.mailet.Experimental; -import org.apache.mailet.base.GenericMailet; import org.apache.mailet.Mail; - -import javax.mail.internet.MimeMessage; +import org.apache.mailet.base.GenericMailet; /** * Returns the current time for the mail server. Sample configuration: http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java index 21edea0..9462731 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java @@ -34,6 +34,7 @@ import java.util.Map; import java.util.Optional; import java.util.UUID; import java.util.regex.Pattern; + import javax.mail.BodyPart; import javax.mail.Message; import javax.mail.MessagingException; @@ -42,10 +43,10 @@ import javax.mail.Part; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeUtility; -import org.apache.james.mime4j.codec.DecodeMonitor; -import org.apache.james.mime4j.codec.DecoderUtil; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; +import org.apache.james.mime4j.codec.DecodeMonitor; +import org.apache.james.mime4j.codec.DecoderUtil; import org.apache.mailet.Mail; import org.apache.mailet.MailetException; import org.apache.mailet.base.GenericMailet; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java index 20c5656..876d790 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java @@ -23,11 +23,13 @@ package org.apache.james.transport.mailets; import java.io.UnsupportedEncodingException; import java.util.Collection; import java.util.stream.Stream; + import javax.mail.MessagingException; import javax.mail.internet.AddressException; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeUtility; +import org.apache.james.core.MailAddress; import org.apache.james.mime4j.dom.address.Address; import org.apache.james.mime4j.dom.address.AddressList; import org.apache.james.mime4j.dom.address.Group; @@ -36,7 +38,6 @@ import org.apache.james.mime4j.field.address.LenientAddressParser; import org.apache.james.mime4j.util.MimeUtil; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java index 28f3c0f..27d8067 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java @@ -21,11 +21,11 @@ package org.apache.james.transport.mailets.debug; -import org.apache.mailet.base.GenericMailet; +import javax.mail.MessagingException; + import org.apache.mailet.Mail; import org.apache.mailet.MailetException; - -import javax.mail.MessagingException; +import org.apache.mailet.base.GenericMailet; /** * Debugging purpose Mailet. Just throws an exception. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Identity.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Identity.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Identity.java index 619b2d5..533bc01 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Identity.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/debug/Identity.java @@ -21,8 +21,8 @@ package org.apache.james.transport.mailets.debug; -import org.apache.mailet.base.GenericMailet; import org.apache.mailet.Mail; +import org.apache.mailet.base.GenericMailet; /** * Opposite of Null Mailet. It let any incoming mail untouched. Used only for http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java index 2ae2263..ca626cc 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java @@ -26,9 +26,9 @@ import java.util.Collection; import javax.mail.MessagingException; +import org.apache.james.core.MailAddress; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMatcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/matchers/All.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/All.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/All.java index 8133740..4df2e50 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/All.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/All.java @@ -18,12 +18,12 @@ ****************************************************************/ package org.apache.james.transport.matchers; -import org.apache.mailet.base.GenericMatcher; -import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; - import java.util.Collection; +import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; +import org.apache.mailet.base.GenericMatcher; + /** * Matches all mail. * @version 1.0.0, 24/04/1999 http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java index fd46feb..f5b0b89 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java @@ -35,9 +35,9 @@ import javax.mail.Multipart; import javax.mail.Part; import javax.mail.internet.MimeMessage; +import org.apache.james.core.MailAddress; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMatcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java index 119b8fd..9f977cd 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java @@ -21,11 +21,11 @@ package org.apache.james.transport.matchers; +import javax.mail.MessagingException; + +import org.apache.james.core.MailAddress; import org.apache.mailet.Experimental; import org.apache.mailet.base.GenericRecipientMatcher; -import org.apache.james.core.MailAddress; - -import javax.mail.MessagingException; /** * Returns positive if the recipient is a command for a listserv. For example, http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java index a784edf..bea2b2c 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java @@ -21,11 +21,11 @@ package org.apache.james.transport.matchers; +import javax.mail.MessagingException; + +import org.apache.james.core.MailAddress; import org.apache.mailet.Experimental; import org.apache.mailet.base.GenericRecipientMatcher; -import org.apache.james.core.MailAddress; - -import javax.mail.MessagingException; /** * CommandListservMatcher is the matcher that pairs with the CommandListservManager http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java index 5dc8e6e..b7a284f 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java @@ -21,18 +21,16 @@ package org.apache.james.transport.matchers; -import org.apache.mailet.Experimental; -import org.apache.mailet.base.GenericMatcher; -import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; +import java.util.Collection; +import java.util.StringTokenizer; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; -import java.lang.NumberFormatException; - -import java.util.Collection; -import java.util.StringTokenizer; +import org.apache.james.core.MailAddress; +import org.apache.mailet.Experimental; +import org.apache.mailet.Mail; +import org.apache.mailet.base.GenericMatcher; /** * <P>Matches mails containing a header with a numeric value whose comparison with the specified value is true. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java index 729e1a7..385f772 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java @@ -28,8 +28,8 @@ import java.util.regex.PatternSyntaxException; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.base.GenericMatcher; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasAttachment.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasAttachment.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasAttachment.java index 5f58a75..c1fa48a 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasAttachment.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasAttachment.java @@ -21,15 +21,16 @@ package org.apache.james.transport.matchers; -import org.apache.mailet.base.GenericMatcher; -import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; +import java.util.Collection; import javax.mail.MessagingException; import javax.mail.Multipart; import javax.mail.Part; import javax.mail.internet.MimeMessage; -import java.util.Collection; + +import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; +import org.apache.mailet.base.GenericMatcher; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java index e203f83..3588e74 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java @@ -26,9 +26,9 @@ import java.util.Collection; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; +import org.apache.james.core.MailAddress; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMatcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java index c659634..d83623b 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java @@ -29,11 +29,11 @@ import java.util.StringTokenizer; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; +import org.apache.james.core.MailAddress; import org.apache.james.mime4j.codec.DecodeMonitor; import org.apache.james.mime4j.codec.DecoderUtil; import org.apache.james.mime4j.util.MimeUtil; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMatcher; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeaderWithPrefix.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeaderWithPrefix.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeaderWithPrefix.java index 3295015..b71ad88 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeaderWithPrefix.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeaderWithPrefix.java @@ -25,9 +25,9 @@ import java.util.List; import javax.mail.Header; import javax.mail.MessagingException; +import org.apache.james.core.MailAddress; import org.apache.james.transport.mailets.utils.MimeMessageUtils; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMatcher; import com.google.common.base.Strings; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java index 7f32d41..3f2d64f 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java @@ -21,13 +21,12 @@ package org.apache.james.transport.matchers; - import java.util.Collection; import javax.mail.MessagingException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.base.GenericMatcher; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java index 65a833c..8f45d1f 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java @@ -25,8 +25,8 @@ import java.util.Collection; import javax.mail.MessagingException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.base.GenericMatcher; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java index 2ca0e8a..cf03db7 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java @@ -21,17 +21,17 @@ package org.apache.james.transport.matchers; - -import org.apache.mailet.base.GenericMatcher; -import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; -import org.apache.mailet.MatcherConfig; +import java.io.Serializable; import java.util.Collection; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import javax.mail.MessagingException; -import java.io.Serializable; + +import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; +import org.apache.mailet.MatcherConfig; +import org.apache.mailet.base.GenericMatcher; /** * <P>This Matcher determines if the mail contains the attribute specified in the http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMimeType.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMimeType.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMimeType.java index 709bcaa..deaf188 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMimeType.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMimeType.java @@ -20,22 +20,24 @@ package org.apache.james.transport.matchers; -import com.google.common.base.Splitter; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; +import java.util.Collection; +import java.util.Optional; +import java.util.Set; + +import javax.activation.MimeType; +import javax.activation.MimeTypeParseException; +import javax.mail.MessagingException; +import javax.mail.internet.MimeMessage; + import org.apache.james.core.MailAddress; import org.apache.mailet.Mail; import org.apache.mailet.base.GenericMatcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.activation.MimeType; -import javax.activation.MimeTypeParseException; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; -import java.util.Collection; -import java.util.Optional; -import java.util.Set; +import com.google.common.base.Splitter; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/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 9d37136..02e2ca5 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 @@ -21,8 +21,8 @@ package org.apache.james.transport.matchers; -import org.apache.mailet.base.GenericRecipientMatcher; import org.apache.james.core.MailAddress; +import org.apache.mailet.base.GenericRecipientMatcher; /** * Matches mail to Domains which are local http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/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 cdbdbf9..a4ee697 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 @@ -21,12 +21,12 @@ package org.apache.james.transport.matchers; -import org.apache.mailet.base.GenericMatcher; -import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; - import java.util.Collection; +import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; +import org.apache.mailet.base.GenericMatcher; + /** * Matches mail where the number of recipiants is exactly one. * @version 1.0.0, 04/12/2000 http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/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 0c567df..db64b76 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 @@ -23,8 +23,8 @@ import java.util.Collection; import javax.mail.MessagingException; -import org.apache.james.transport.matchers.utils.MailAddressCollectionReader; import org.apache.james.core.MailAddress; +import org.apache.james.transport.matchers.utils.MailAddressCollectionReader; import org.apache.mailet.base.GenericRecipientMatcher; import com.google.common.base.Strings; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/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 7155581..f9f8bc8 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 @@ -21,9 +21,9 @@ package org.apache.james.transport.matchers; -import org.apache.mailet.base.GenericRecipientMatcher; import org.apache.james.core.MailAddress; import org.apache.mailet.MailetContext; +import org.apache.mailet.base.GenericRecipientMatcher; /** * Matches mail where the recipient is local. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/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 3444081..900405f 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 @@ -22,11 +22,11 @@ package org.apache.james.transport.matchers; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import org.apache.mailet.base.GenericRecipientMatcher; -import org.apache.james.core.MailAddress; - import javax.mail.MessagingException; +import org.apache.james.core.MailAddress; +import org.apache.mailet.base.GenericRecipientMatcher; + import com.google.common.base.Strings; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/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 3c248ba..1ee931d 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 @@ -21,18 +21,18 @@ package org.apache.james.transport.matchers; -import org.apache.mailet.base.MailetUtil; -import org.apache.mailet.base.RFC2822Headers; -import org.apache.mailet.base.GenericMatcher; -import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; +import java.util.Collection; +import java.util.Enumeration; import javax.mail.Header; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; -import java.util.Collection; -import java.util.Enumeration; +import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; +import org.apache.mailet.base.GenericMatcher; +import org.apache.mailet.base.MailetUtil; +import org.apache.mailet.base.RFC2822Headers; /** * Matches mail which has been relayed more than a given number of times. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/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 54aa8af..70cb9d4 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 @@ -21,12 +21,13 @@ package org.apache.james.transport.matchers; -import com.google.common.collect.ImmutableList; -import org.apache.mailet.base.GenericMatcher; -import org.apache.mailet.Mail; +import java.util.Collection; + import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; +import org.apache.mailet.base.GenericMatcher; -import java.util.Collection; +import com.google.common.collect.ImmutableList; /** * <P>Matches mails that are sent by an SMTP authenticated user.</P> http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/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 ba9719f..eab66ed 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 @@ -24,8 +24,8 @@ package org.apache.james.transport.matchers; import java.util.Collection; import java.util.StringTokenizer; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.base.GenericMatcher; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/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 d6f67e1..5eb70e3 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 @@ -24,8 +24,8 @@ package org.apache.james.transport.matchers; import java.util.Collection; import java.util.Locale; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.base.GenericMatcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/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 6eac31d..a3ed557 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 @@ -23,8 +23,8 @@ package org.apache.james.transport.matchers; import java.util.Collection; import java.util.Locale; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.base.GenericMatcher; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/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 1513674..fef0665 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 @@ -24,9 +24,9 @@ import java.util.Set; import javax.mail.MessagingException; +import org.apache.james.core.MailAddress; import org.apache.james.transport.matchers.utils.MailAddressCollectionReader; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMatcher; import com.google.common.annotations.VisibleForTesting; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/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 8903278..105b251 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 @@ -22,8 +22,8 @@ import java.util.Collection; import javax.mail.MessagingException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.base.GenericMatcher; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/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 b791ff5..d9c4ae6 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 @@ -19,12 +19,12 @@ package org.apache.james.transport.matchers; -import org.apache.mailet.base.GenericMatcher; -import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; - import java.util.Collection; +import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; +import org.apache.mailet.base.GenericMatcher; + /** * <P>Matches mails that are sent by a null sender.</P> * <PRE><CODE> http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/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 63aa634..cfd39f6 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 @@ -19,16 +19,16 @@ package org.apache.james.transport.matchers; -import org.apache.mailet.base.GenericMatcher; -import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; - import java.util.Collection; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import javax.mail.MessagingException; +import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; +import org.apache.mailet.base.GenericMatcher; + import com.google.common.base.Strings; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/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 3c3ba02..2699fe2 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 @@ -21,11 +21,12 @@ package org.apache.james.transport.matchers; import java.util.Collection; -import com.google.common.collect.ImmutableList; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.base.GenericMatcher; +import com.google.common.collect.ImmutableList; + /** * This matcher matches email sent automatically by mailets. * http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/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 f2bfff2..ddfc27c 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 @@ -21,14 +21,15 @@ package org.apache.james.transport.matchers; -import org.apache.mailet.base.GenericMatcher; -import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; - -import javax.mail.MessagingException; import java.util.Collection; import java.util.Locale; +import javax.mail.MessagingException; + +import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; +import org.apache.mailet.base.GenericMatcher; + /** * Checks whether the message (entire message, not just content) is greater * than a certain number of bytes. You can use 'k' and 'm' as optional postfixes. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/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 8be7516..874a6bd 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 @@ -21,12 +21,13 @@ package org.apache.james.transport.matchers; -import org.apache.mailet.base.GenericMatcher; -import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; +import java.util.Collection; import javax.mail.internet.MimeMessage; -import java.util.Collection; + +import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; +import org.apache.mailet.base.GenericMatcher; /** * Matches mail where the subject is contained in a configurable list. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/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 c48c6a5..eb760d5 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 @@ -21,13 +21,14 @@ package org.apache.james.transport.matchers; -import org.apache.mailet.base.GenericMatcher; -import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; +import java.util.Collection; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; -import java.util.Collection; + +import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; +import org.apache.mailet.base.GenericMatcher; /** * Matches mail where the subject starts with a given phrase. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/matchers/TooManyLines.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/TooManyLines.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/TooManyLines.java index 5ebd8b0..763abf1 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/TooManyLines.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/TooManyLines.java @@ -23,8 +23,8 @@ import java.util.Collection; import javax.mail.MessagingException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.base.GenericMatcher; import org.apache.mailet.base.MailetUtil; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/main/java/org/apache/james/transport/matchers/TooManyRecipients.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/TooManyRecipients.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/TooManyRecipients.java index 555a92d..b5789fc 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/TooManyRecipients.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/TooManyRecipients.java @@ -23,8 +23,8 @@ import java.util.Collection; import javax.mail.MessagingException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.base.GenericMatcher; import org.apache.mailet.base.MailetUtil; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/test/java/org/apache/james/transport/mailets/MailAttributesListToMimeHeadersTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/MailAttributesListToMimeHeadersTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/MailAttributesListToMimeHeadersTest.java index 7479385..0f6dec3 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/MailAttributesListToMimeHeadersTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/MailAttributesListToMimeHeadersTest.java @@ -19,7 +19,6 @@ package org.apache.james.transport.mailets; - import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/test/java/org/apache/james/transport/mailets/ToProcessorTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/ToProcessorTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/ToProcessorTest.java index 7f5c898..6fe84e3 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/ToProcessorTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/ToProcessorTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.mock; import javax.mail.MessagingException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.Mailet; import org.apache.mailet.MailetException; import org.apache.mailet.base.test.FakeMail; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/test/java/org/apache/james/transport/mailets/utils/MimeMessageModifierTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/utils/MimeMessageModifierTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/utils/MimeMessageModifierTest.java index 9baa698..413a9bb 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/utils/MimeMessageModifierTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/utils/MimeMessageModifierTest.java @@ -20,8 +20,10 @@ package org.apache.james.transport.mailets.utils; import static org.assertj.core.api.Assertions.assertThat; + import java.util.Optional; import java.util.Properties; + import javax.mail.Session; import javax.mail.internet.MimeMessage; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/test/java/org/apache/james/transport/mailets/utils/MimeMessageUtilsTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/utils/MimeMessageUtilsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/utils/MimeMessageUtilsTest.java index baf3da1..b7111c0 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/utils/MimeMessageUtilsTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/utils/MimeMessageUtilsTest.java @@ -20,8 +20,10 @@ package org.apache.james.transport.mailets.utils; import static org.assertj.core.api.Assertions.assertThat; + import java.util.Optional; import java.util.Properties; + import javax.mail.Session; import javax.mail.internet.MimeMessage; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/test/java/org/apache/james/transport/matchers/RecipientIsLocalTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/RecipientIsLocalTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/RecipientIsLocalTest.java index 5fdb250..1825e39 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/RecipientIsLocalTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/RecipientIsLocalTest.java @@ -23,8 +23,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.MailetContext; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMatcherConfig; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
