http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/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 4162fcb..67c7425 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 @@ -23,8 +23,8 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Collection; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext;
http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java index 970ba27..09e2b4e 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java @@ -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.base.GenericMatcher; public class SMTPAuthUserIsTest extends AbstractHasMailAttributeTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsLocalTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsLocalTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsLocalTest.java index 6ab12eb..86e6e85 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsLocalTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsLocalTest.java @@ -32,8 +32,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.base.test.FakeMail; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsTest.java index 2904f8a..c4f85c0 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsTest.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.MailetContext; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMatcherConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsLocalTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsLocalTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsLocalTest.java index f97aea6..d47bea1 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsLocalTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsLocalTest.java @@ -20,8 +20,8 @@ package org.apache.james.transport.matchers; import static org.apache.mailet.base.MailAddressFixture.ANY_AT_JAMES; -import static org.apache.mailet.base.MailAddressFixture.OTHER_AT_JAMES; import static org.apache.mailet.base.MailAddressFixture.ANY_AT_JAMES2; +import static org.apache.mailet.base.MailAddressFixture.OTHER_AT_JAMES; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -30,8 +30,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.base.test.FakeMail; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/test/java/org/apache/james/transport/matchers/SentByMailetTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SentByMailetTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SentByMailetTest.java index 29841bb..8d04492 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SentByMailetTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SentByMailetTest.java @@ -23,8 +23,8 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Collection; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/test/java/org/apache/james/transport/matchers/UserIsTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/UserIsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/UserIsTest.java index 52b8b3a..348896c 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/UserIsTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/UserIsTest.java @@ -20,7 +20,6 @@ package org.apache.james.transport.matchers; - import static org.apache.mailet.base.MailAddressFixture.ANY_AT_JAMES; import static org.apache.mailet.base.MailAddressFixture.ANY_AT_JAMES2; import static org.apache.mailet.base.MailAddressFixture.OTHER_AT_JAMES; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailet/standard/src/test/java/org/apache/james/transport/matchers/util/MailAddressCollectionReaderTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/util/MailAddressCollectionReaderTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/util/MailAddressCollectionReaderTest.java index ce9f83a..c4b0d8a 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/util/MailAddressCollectionReaderTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/util/MailAddressCollectionReaderTest.java @@ -21,8 +21,8 @@ package org.apache.james.transport.matchers.util; import static org.assertj.core.api.Assertions.assertThat; -import org.apache.james.transport.matchers.utils.MailAddressCollectionReader; import org.apache.james.core.MailAddress; +import org.apache.james.transport.matchers.utils.MailAddressCollectionReader; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/metrics/metrics-logger/src/main/java/org/apache/james/metrics/logger/DefaultMetricFactory.java ---------------------------------------------------------------------- diff --git a/metrics/metrics-logger/src/main/java/org/apache/james/metrics/logger/DefaultMetricFactory.java b/metrics/metrics-logger/src/main/java/org/apache/james/metrics/logger/DefaultMetricFactory.java index 8f3f258..2997805 100644 --- a/metrics/metrics-logger/src/main/java/org/apache/james/metrics/logger/DefaultMetricFactory.java +++ b/metrics/metrics-logger/src/main/java/org/apache/james/metrics/logger/DefaultMetricFactory.java @@ -18,14 +18,14 @@ ****************************************************************/ package org.apache.james.metrics.logger; +import java.util.function.Supplier; + import org.apache.james.metrics.api.Metric; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.metrics.api.TimeMetric; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.function.Supplier; - public class DefaultMetricFactory implements MetricFactory { public static final Logger LOGGER = LoggerFactory.getLogger(DefaultMetricFactory.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferOutputStream.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferOutputStream.java b/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferOutputStream.java index cc99c9a..9076a35 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferOutputStream.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/helper/ByteBufferOutputStream.java @@ -19,14 +19,14 @@ package org.apache.james.mpt.helper; -import org.apache.james.mpt.api.Continuation; - import java.io.IOException; import java.io.OutputStream; import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.charset.Charset; +import org.apache.james.mpt.api.Continuation; + public class ByteBufferOutputStream extends OutputStream { private final ByteBuffer buffer = ByteBuffer.allocate(160384); http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mpt/core/src/test/java/org/apache/james/mpt/api/ImapFeaturesTest.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/test/java/org/apache/james/mpt/api/ImapFeaturesTest.java b/mpt/core/src/test/java/org/apache/james/mpt/api/ImapFeaturesTest.java index cf0e3d6..d6790ba 100644 --- a/mpt/core/src/test/java/org/apache/james/mpt/api/ImapFeaturesTest.java +++ b/mpt/core/src/test/java/org/apache/james/mpt/api/ImapFeaturesTest.java @@ -18,11 +18,11 @@ ****************************************************************/ package org.apache.james.mpt.api; +import static org.assertj.core.api.Assertions.assertThat; + import org.apache.james.mpt.api.ImapFeatures.Feature; import org.junit.Test; -import static org.assertj.core.api.Assertions.assertThat; - public class ImapFeaturesTest { @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusMailboxTestModule.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusMailboxTestModule.java b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusMailboxTestModule.java index 64f236c..9fac1eb 100644 --- a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusMailboxTestModule.java +++ b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusMailboxTestModule.java @@ -28,11 +28,11 @@ import org.apache.james.mpt.imapmailbox.MailboxMessageAppender; import org.apache.james.mpt.imapmailbox.cyrus.host.CyrusHostSystem; import org.apache.james.mpt.imapmailbox.cyrus.host.CyrusUserAdder; import org.apache.james.mpt.imapmailbox.cyrus.host.Docker; +import org.apache.james.mpt.imapmailbox.cyrus.host.GrantRightsOnCyrusHost; +import org.apache.james.mpt.imapmailbox.cyrus.host.MailboxMessageAppenderOnCyrusHost; import com.google.inject.AbstractModule; import com.spotify.docker.client.messages.ContainerCreation; -import org.apache.james.mpt.imapmailbox.cyrus.host.GrantRightsOnCyrusHost; -import org.apache.james.mpt.imapmailbox.cyrus.host.MailboxMessageAppenderOnCyrusHost; public class CyrusMailboxTestModule extends AbstractModule { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/ExternalJamesModule.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/ExternalJamesModule.java b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/ExternalJamesModule.java index e154d5d..0d3f7f1 100644 --- a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/ExternalJamesModule.java +++ b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/ExternalJamesModule.java @@ -19,7 +19,6 @@ package org.apache.james.mpt.imapmailbox.external.james; -import com.google.inject.AbstractModule; import org.apache.james.mpt.api.HostSystem; import org.apache.james.mpt.api.ImapHostSystem; import org.apache.james.mpt.api.UserAdder; @@ -27,6 +26,8 @@ import org.apache.james.mpt.host.ExternalHostSystem; import org.apache.james.mpt.imapmailbox.external.james.host.ExternalJamesHostSystem; import org.apache.james.mpt.imapmailbox.external.james.host.ExternalJamesUserAdder; +import com.google.inject.AbstractModule; + public class ExternalJamesModule extends AbstractModule { @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/ExternalJamesHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/ExternalJamesHostSystem.java b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/ExternalJamesHostSystem.java index 65853eb..01fe073 100644 --- a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/ExternalJamesHostSystem.java +++ b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/ExternalJamesHostSystem.java @@ -21,12 +21,12 @@ package org.apache.james.mpt.imapmailbox.external.james.host; import java.net.InetSocketAddress; import java.util.function.Supplier; +import org.apache.commons.lang.NotImplementedException; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mpt.api.ImapFeatures; import org.apache.james.mpt.api.ImapFeatures.Feature; import org.apache.james.mpt.host.ExternalHostSystem; import org.apache.james.mpt.monitor.NullMonitor; -import org.apache.commons.lang.NotImplementedException; import com.google.common.base.Preconditions; import com.google.inject.Inject; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/ExternalJamesUserAdder.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/ExternalJamesUserAdder.java b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/ExternalJamesUserAdder.java index dfd2c66..80801de 100644 --- a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/ExternalJamesUserAdder.java +++ b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/ExternalJamesUserAdder.java @@ -18,9 +18,10 @@ ****************************************************************/ package org.apache.james.mpt.imapmailbox.external.james.host; -import com.google.inject.Singleton; import org.apache.james.mpt.api.UserAdder; +import com.google.inject.Singleton; + @Singleton public class ExternalJamesUserAdder implements UserAdder { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mpt/impl/managesieve/core/src/main/java/org/apache/james/mpt/host/ManageSieveSession.java ---------------------------------------------------------------------- diff --git a/mpt/impl/managesieve/core/src/main/java/org/apache/james/mpt/host/ManageSieveSession.java b/mpt/impl/managesieve/core/src/main/java/org/apache/james/mpt/host/ManageSieveSession.java index 7c1f913..aa802ff 100644 --- a/mpt/impl/managesieve/core/src/main/java/org/apache/james/mpt/host/ManageSieveSession.java +++ b/mpt/impl/managesieve/core/src/main/java/org/apache/james/mpt/host/ManageSieveSession.java @@ -19,6 +19,8 @@ package org.apache.james.mpt.host; +import java.io.StringWriter; + import org.apache.commons.io.IOUtils; import org.apache.james.managesieve.api.SessionTerminatedException; import org.apache.james.managesieve.transcode.ManageSieveProcessor; @@ -30,8 +32,6 @@ import org.apache.james.mpt.helper.ByteBufferOutputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.StringWriter; - public class ManageSieveSession implements Session { private static final Logger LOGGER = LoggerFactory.getLogger(ManageSieveSession.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileModule.java ---------------------------------------------------------------------- diff --git a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileModule.java b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileModule.java index 3de2d7f..dc31de1 100644 --- a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileModule.java +++ b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileModule.java @@ -19,10 +19,11 @@ package org.apache.james.mpt.managesieve.file; -import com.google.inject.AbstractModule; import org.apache.james.mpt.host.ManageSieveHostSystem; import org.apache.james.mpt.managesieve.file.host.FileHostSystem; +import com.google.inject.AbstractModule; + public class FileModule extends AbstractModule { @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpHostSystem.java b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpHostSystem.java index 2eac29f..a0c7c06 100644 --- a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpHostSystem.java +++ b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpHostSystem.java @@ -19,8 +19,8 @@ package org.apache.james.mpt.smtp; -import org.apache.james.mpt.api.HostSystem; import org.apache.james.dnsservice.api.InMemoryDNSService; +import org.apache.james.mpt.api.HostSystem; public interface SmtpHostSystem extends HostSystem { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandler.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandler.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandler.java index 4ee8bcf..9565558 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandler.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandler.java @@ -21,7 +21,6 @@ package org.apache.james.protocols.api.handler; - import java.util.Collection; import org.apache.james.protocols.api.ProtocolSession; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/api/src/test/java/org/apache/james/protocols/api/utils/BogusSslContextFactory.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/test/java/org/apache/james/protocols/api/utils/BogusSslContextFactory.java b/protocols/api/src/test/java/org/apache/james/protocols/api/utils/BogusSslContextFactory.java index eb0cba1..4b2dc13 100644 --- a/protocols/api/src/test/java/org/apache/james/protocols/api/utils/BogusSslContextFactory.java +++ b/protocols/api/src/test/java/org/apache/james/protocols/api/utils/BogusSslContextFactory.java @@ -20,7 +20,6 @@ package org.apache.james.protocols.api.utils; - import java.security.KeyStore; import java.security.Security; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaResponseEncoder.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaResponseEncoder.java index 6055aff..8319ece 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaResponseEncoder.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaResponseEncoder.java @@ -19,6 +19,8 @@ package org.apache.james.imap.encode; +import java.io.IOException; + import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; @@ -26,8 +28,6 @@ import org.apache.james.imap.encode.base.AbstractChainedImapEncoder; import org.apache.james.imap.message.response.QuotaResponse; import org.apache.james.mailbox.model.Quota; -import java.io.IOException; - /** * Quota response encoder */ http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaRootResponseEncoder.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaRootResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaRootResponseEncoder.java index 20e487e..062dd54 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaRootResponseEncoder.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/QuotaRootResponseEncoder.java @@ -19,14 +19,14 @@ package org.apache.james.imap.encode; +import java.io.IOException; + import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; import org.apache.james.imap.encode.base.AbstractChainedImapEncoder; import org.apache.james.imap.message.response.QuotaRootResponse; -import java.io.IOException; - /** * QUOTAROOT response encoder */ http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/main/java/org/apache/james/imap/encode/XListResponseEncoder.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/XListResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/XListResponseEncoder.java index ce220d1..08ab6c2 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/encode/XListResponseEncoder.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/XListResponseEncoder.java @@ -20,13 +20,12 @@ package org.apache.james.imap.encode; import java.io.IOException; -import org.apache.james.imap.encode.base.AbstractChainedImapEncoder; -import org.apache.james.imap.message.response.AbstractListingResponse; -import org.apache.james.imap.message.response.XListResponse; - import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.process.ImapSession; +import org.apache.james.imap.encode.base.AbstractChainedImapEncoder; +import org.apache.james.imap.message.response.AbstractListingResponse; +import org.apache.james.imap.message.response.XListResponse; /** * http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java index c70f268..ce2e24a 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java @@ -36,16 +36,16 @@ import org.apache.james.imap.encode.ImapEncoderFactory; import org.apache.james.imap.encode.LSubResponseEncoder; import org.apache.james.imap.encode.ListResponseEncoder; import org.apache.james.imap.encode.ListRightsResponseEncoder; +import org.apache.james.imap.encode.MailboxStatusResponseEncoder; import org.apache.james.imap.encode.MyRightsResponseEncoder; import org.apache.james.imap.encode.NamespaceResponseEncoder; +import org.apache.james.imap.encode.QuotaResponseEncoder; +import org.apache.james.imap.encode.QuotaRootResponseEncoder; import org.apache.james.imap.encode.RecentResponseEncoder; -import org.apache.james.imap.encode.MailboxStatusResponseEncoder; import org.apache.james.imap.encode.SearchResponseEncoder; import org.apache.james.imap.encode.StatusResponseEncoder; import org.apache.james.imap.encode.VanishedResponseEncoder; import org.apache.james.imap.encode.XListResponseEncoder; -import org.apache.james.imap.encode.QuotaResponseEncoder; -import org.apache.james.imap.encode.QuotaRootResponseEncoder; import org.apache.james.imap.encode.base.EndImapEncoder; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/main/java/org/apache/james/imap/main/ResponseEncoder.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/main/ResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/main/ResponseEncoder.java index 9f28fc1..e875533 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/main/ResponseEncoder.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/main/ResponseEncoder.java @@ -22,8 +22,8 @@ package org.apache.james.imap.main; import java.io.IOException; import org.apache.james.imap.api.message.response.ImapResponseMessage; -import org.apache.james.imap.api.process.ImapSession; import org.apache.james.imap.api.process.ImapProcessor.Responder; +import org.apache.james.imap.api.process.ImapSession; import org.apache.james.imap.encode.ImapEncoder; import org.apache.james.imap.encode.ImapResponseComposer; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/main/java/org/apache/james/imap/message/response/AbstactStatusResponseFactory.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/response/AbstactStatusResponseFactory.java b/protocols/imap/src/main/java/org/apache/james/imap/message/response/AbstactStatusResponseFactory.java index dbce016..062da0a 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/message/response/AbstactStatusResponseFactory.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/message/response/AbstactStatusResponseFactory.java @@ -22,8 +22,8 @@ package org.apache.james.imap.message.response; import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.display.HumanReadableText; import org.apache.james.imap.api.message.response.StatusResponse; -import org.apache.james.imap.api.message.response.StatusResponseFactory; import org.apache.james.imap.api.message.response.StatusResponse.ResponseCode; +import org.apache.james.imap.api.message.response.StatusResponseFactory; public abstract class AbstactStatusResponseFactory implements StatusResponseFactory { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/main/java/org/apache/james/imap/message/response/AnnotationResponse.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/response/AnnotationResponse.java b/protocols/imap/src/main/java/org/apache/james/imap/message/response/AnnotationResponse.java index bf83849..d1a2ae2 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/message/response/AnnotationResponse.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/message/response/AnnotationResponse.java @@ -21,12 +21,12 @@ package org.apache.james.imap.message.response; import java.util.List; -import com.google.common.base.MoreObjects; -import com.google.common.collect.ImmutableList; import org.apache.james.imap.api.message.response.ImapResponseMessage; import org.apache.james.mailbox.model.MailboxAnnotation; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; +import com.google.common.collect.ImmutableList; public class AnnotationResponse implements ImapResponseMessage { private final String mailboxName; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/main/java/org/apache/james/imap/message/response/QuotaResponse.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/response/QuotaResponse.java b/protocols/imap/src/main/java/org/apache/james/imap/message/response/QuotaResponse.java index 0540086..ccd2375 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/message/response/QuotaResponse.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/message/response/QuotaResponse.java @@ -19,11 +19,12 @@ package org.apache.james.imap.message.response; -import com.google.common.base.Objects; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.message.response.ImapResponseMessage; import org.apache.james.mailbox.model.Quota; +import com.google.common.base.Objects; + /** * Quota Response */ http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/main/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactory.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactory.java b/protocols/imap/src/main/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactory.java index 97e3548..9345781 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactory.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactory.java @@ -22,9 +22,9 @@ package org.apache.james.imap.message.response; import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.display.HumanReadableText; import org.apache.james.imap.api.message.response.StatusResponse; -import org.apache.james.imap.api.message.response.StatusResponseFactory; import org.apache.james.imap.api.message.response.StatusResponse.ResponseCode; import org.apache.james.imap.api.message.response.StatusResponse.Type; +import org.apache.james.imap.api.message.response.StatusResponseFactory; public class UnpooledStatusResponseFactory extends AbstactStatusResponseFactory implements StatusResponseFactory { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java index ff079e4..b538f9e 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java @@ -19,6 +19,8 @@ package org.apache.james.imap.processor; +import static org.apache.commons.io.output.NullOutputStream.NULL_OUTPUT_STREAM; + import java.io.Closeable; import java.io.IOException; import java.io.InputStream; @@ -52,8 +54,6 @@ import org.apache.james.util.MDCBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.commons.io.output.NullOutputStream.NULL_OUTPUT_STREAM; - public class AppendProcessor extends AbstractMailboxProcessor<AppendRequest> { private static final Logger LOGGER = LoggerFactory.getLogger(AppendProcessor.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/main/java/org/apache/james/imap/processor/CompressProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/CompressProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/CompressProcessor.java index 45d125e..4bf1d18 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/CompressProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/CompressProcessor.java @@ -18,9 +18,7 @@ ****************************************************************/ package org.apache.james.imap.processor; - import java.io.Closeable; - import java.util.Collections; import java.util.List; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java index 5e2fc78..57b8857 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java @@ -19,7 +19,6 @@ package org.apache.james.imap.processor; - import java.io.Closeable; import java.util.List; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/test/java/org/apache/james/imap/api/message/response/StatusResponseTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/api/message/response/StatusResponseTest.java b/protocols/imap/src/test/java/org/apache/james/imap/api/message/response/StatusResponseTest.java index 0b56900..ae7c6e4 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/api/message/response/StatusResponseTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/api/message/response/StatusResponseTest.java @@ -19,8 +19,8 @@ package org.apache.james.imap.api.message.response; -import static org.junit.Assert.assertEquals; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/test/java/org/apache/james/imap/decode/ImapRequestLineReaderTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/ImapRequestLineReaderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/ImapRequestLineReaderTest.java index 65ab599..0c0fc5f 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/ImapRequestLineReaderTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/ImapRequestLineReaderTest.java @@ -21,14 +21,14 @@ package org.apache.james.imap.decode; import static org.assertj.core.api.Assertions.assertThat; -import org.apache.james.protocols.imap.DecodingException; -import org.junit.Test; - import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.OutputStream; import java.nio.charset.StandardCharsets; +import org.apache.james.protocols.imap.DecodingException; +import org.junit.Test; + public class ImapRequestLineReaderTest { private final OutputStream outputStream = null; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/test/java/org/apache/james/imap/decode/main/OutputStreamImapResponseWriter.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/OutputStreamImapResponseWriter.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/main/OutputStreamImapResponseWriter.java index d9849c1..9b6d708 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/OutputStreamImapResponseWriter.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/main/OutputStreamImapResponseWriter.java @@ -22,6 +22,7 @@ package org.apache.james.imap.decode.main; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; + import org.apache.james.imap.encode.ImapResponseWriter; import org.apache.james.imap.message.response.Literal; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParserTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParserTest.java index 64c2135..6f7d729 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParserTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetAnnotationCommandParserTest.java @@ -33,7 +33,6 @@ import org.apache.james.imap.message.request.GetAnnotationRequest; import org.apache.james.imap.message.request.GetAnnotationRequest.Depth; import org.apache.james.mailbox.model.MailboxAnnotationKey; import org.apache.james.protocols.imap.DecodingException; - import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaParserTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaParserTest.java index 6f4550a..7f24aa6 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaParserTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaParserTest.java @@ -19,17 +19,17 @@ package org.apache.james.imap.decode.parser; +import static org.junit.Assert.assertEquals; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; + import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.imap.message.request.GetQuotaRequest; import org.apache.james.protocols.imap.DecodingException; import org.junit.Test; -import java.io.ByteArrayInputStream; -import java.io.InputStream; - -import static org.junit.Assert.assertEquals; - /** * GetQuotaRootParser Test */ http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaRootParserTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaRootParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaRootParserTest.java index 73f3dc3..53ea9eb 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaRootParserTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/GetQuotaRootParserTest.java @@ -19,17 +19,17 @@ package org.apache.james.imap.decode.parser; +import static org.junit.Assert.assertEquals; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; + import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.imap.message.request.GetQuotaRootRequest; import org.apache.james.protocols.imap.DecodingException; import org.junit.Test; -import java.io.ByteArrayInputStream; -import java.io.InputStream; - -import static org.junit.Assert.assertEquals; - /** * Tests for GetQuotaRootCommandParser */ http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParserTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParserTest.java index 67d91e9..5d40072 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParserTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetAnnotationCommandParserTest.java @@ -20,6 +20,7 @@ package org.apache.james.imap.decode.parser; import static org.assertj.core.api.Assertions.assertThat; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetQuotaCommandParserTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetQuotaCommandParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetQuotaCommandParserTest.java index f054bda..b3d7d20 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetQuotaCommandParserTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SetQuotaCommandParserTest.java @@ -19,17 +19,17 @@ package org.apache.james.imap.decode.parser; -import org.apache.james.imap.api.ImapCommand; -import org.apache.james.imap.decode.ImapRequestStreamLineReader; -import org.apache.james.imap.message.request.SetQuotaRequest; -import org.apache.james.protocols.imap.DecodingException; -import org.junit.Test; +import static org.junit.Assert.assertEquals; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.List; -import static org.junit.Assert.assertEquals; +import org.apache.james.imap.api.ImapCommand; +import org.apache.james.imap.decode.ImapRequestStreamLineReader; +import org.apache.james.imap.message.request.SetQuotaRequest; +import org.apache.james.protocols.imap.DecodingException; +import org.junit.Test; /** * SETQUOTA command parser test... http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/test/java/org/apache/james/imap/encode/QuotaResponseEncoderTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/QuotaResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/QuotaResponseEncoderTest.java index 77ffa4a..8bd49e9 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/QuotaResponseEncoderTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/QuotaResponseEncoderTest.java @@ -19,6 +19,8 @@ package org.apache.james.imap.encode; +import static org.junit.Assert.assertEquals; + import org.apache.james.imap.encode.base.ByteImapResponseWriter; import org.apache.james.imap.encode.base.EndImapEncoder; import org.apache.james.imap.encode.base.ImapResponseComposerImpl; @@ -26,8 +28,6 @@ import org.apache.james.imap.message.response.QuotaResponse; import org.apache.james.mailbox.store.quota.QuotaImpl; import org.junit.Test; -import static org.junit.Assert.assertEquals; - /** * QUOTA Response encoder test */ http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/test/java/org/apache/james/imap/encode/QuotaRootResponseEncoderTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/QuotaRootResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/QuotaRootResponseEncoderTest.java index a34b7b4..7dccd11 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/QuotaRootResponseEncoderTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/QuotaRootResponseEncoderTest.java @@ -19,14 +19,14 @@ package org.apache.james.imap.encode; +import static org.junit.Assert.assertEquals; + import org.apache.james.imap.encode.base.ByteImapResponseWriter; import org.apache.james.imap.encode.base.EndImapEncoder; import org.apache.james.imap.encode.base.ImapResponseComposerImpl; import org.apache.james.imap.message.response.QuotaRootResponse; import org.junit.Test; -import static org.junit.Assert.assertEquals; - /** * QUOTAROOT response encoder */ http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/test/java/org/apache/james/imap/processor/GetAnnotationProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetAnnotationProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetAnnotationProcessorTest.java index e8784d8..fa677c7 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetAnnotationProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetAnnotationProcessorTest.java @@ -28,6 +28,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; + import java.util.Optional; import java.util.Set; @@ -54,14 +55,14 @@ import org.apache.james.mailbox.model.MailboxAnnotation; import org.apache.james.mailbox.model.MailboxAnnotationKey; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.metrics.api.NoopMetricFactory; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.MockitoAnnotations; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; + public class GetAnnotationProcessorTest { private static final String TAG = "TAG"; private static final int FIRST_ELEMENT_INDEX = 0; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/imap/src/test/java/org/apache/james/imap/processor/base/UidMsnConverterTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/UidMsnConverterTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/UidMsnConverterTest.java index ae11940..e793adc 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/UidMsnConverterTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/UidMsnConverterTest.java @@ -20,16 +20,17 @@ package org.apache.james.imap.processor.base; import static org.assertj.core.api.Assertions.assertThat; + import java.util.Map; import java.util.concurrent.TimeUnit; import org.apache.james.mailbox.MessageUid; import org.apache.james.util.concurrency.ConcurrentTestRunner; +import org.junit.Before; +import org.junit.Test; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.junit.Before; -import org.junit.Test; public class UidMsnConverterTest { private UidMsnConverter testee; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/PlainAuthenticationProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/PlainAuthenticationProcessor.java b/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/PlainAuthenticationProcessor.java index fcd4c48..c2d1798 100644 --- a/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/PlainAuthenticationProcessor.java +++ b/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/PlainAuthenticationProcessor.java @@ -20,7 +20,8 @@ package org.apache.james.managesieve.core; -import com.google.common.base.Splitter; +import java.util.Iterator; + import org.apache.james.managesieve.api.AuthenticationException; import org.apache.james.managesieve.api.AuthenticationProcessor; import org.apache.james.managesieve.api.Session; @@ -29,7 +30,7 @@ import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; import org.apache.james.user.api.model.User; -import java.util.Iterator; +import com.google.common.base.Splitter; /** * See RFC-4616 : https://tools.ietf.org/html/rfc4616 http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ArgumentParser.java ---------------------------------------------------------------------- diff --git a/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ArgumentParser.java b/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ArgumentParser.java index 17508fe..eb8fa4e 100644 --- a/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ArgumentParser.java +++ b/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ArgumentParser.java @@ -20,17 +20,19 @@ package org.apache.james.managesieve.transcode; -import com.google.common.base.Joiner; -import com.google.common.base.Splitter; -import com.google.common.base.Strings; +import java.util.Iterator; + +import javax.inject.Inject; + import org.apache.james.managesieve.api.ArgumentException; import org.apache.james.managesieve.api.Session; import org.apache.james.managesieve.api.SessionTerminatedException; import org.apache.james.managesieve.api.commands.CoreCommands; import org.apache.james.managesieve.util.ParserUtils; -import javax.inject.Inject; -import java.util.Iterator; +import com.google.common.base.Joiner; +import com.google.common.base.Splitter; +import com.google.common.base.Strings; /** * Parses the user input and calls the underlying command processor http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java b/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java index 8f15658..85d00b6 100644 --- a/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java +++ b/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java @@ -20,13 +20,13 @@ package org.apache.james.managesieve.transcode; +import javax.inject.Inject; + import org.apache.james.managesieve.api.ManageSieveException; import org.apache.james.managesieve.api.Session; import org.apache.james.managesieve.api.SessionTerminatedException; import org.apache.james.sieverepository.api.exception.SieveRepositoryException; -import javax.inject.Inject; - public class ManageSieveProcessor { public static final String AUTHENTICATE = "AUTHENTICATE"; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/netty/src/main/java/org/apache/james/protocols/netty/LineHandlerUpstreamHandler.java ---------------------------------------------------------------------- diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/LineHandlerUpstreamHandler.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/LineHandlerUpstreamHandler.java index b1a58c6..dcccf7b 100644 --- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/LineHandlerUpstreamHandler.java +++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/LineHandlerUpstreamHandler.java @@ -18,8 +18,8 @@ ****************************************************************/ package org.apache.james.protocols.netty; -import org.apache.james.protocols.api.ProtocolSessionImpl; import org.apache.james.protocols.api.ProtocolSession; +import org.apache.james.protocols.api.ProtocolSessionImpl; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.LineHandler; import org.jboss.netty.buffer.ChannelBuffer; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyServer.java ---------------------------------------------------------------------- diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyServer.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyServer.java index 6b8e33c..faa4624 100644 --- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyServer.java +++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyServer.java @@ -18,21 +18,21 @@ ****************************************************************/ package org.apache.james.protocols.netty; - import java.util.Optional; + import javax.net.ssl.SSLContext; import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.api.Protocol; import org.apache.james.protocols.api.handler.ProtocolHandler; - -import com.google.common.base.Preconditions; import org.jboss.netty.channel.ChannelPipelineFactory; import org.jboss.netty.channel.ChannelUpstreamHandler; import org.jboss.netty.channel.group.ChannelGroup; import org.jboss.netty.handler.execution.ExecutionHandler; import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor; +import com.google.common.base.Preconditions; + /** * Generic NettyServer http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/core/AbstractInputStreamTest.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/core/AbstractInputStreamTest.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/core/AbstractInputStreamTest.java index 620ff83..38bd76b 100644 --- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/core/AbstractInputStreamTest.java +++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/core/AbstractInputStreamTest.java @@ -21,6 +21,7 @@ package org.apache.james.protocols.pop3.core; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; + import junit.framework.TestCase; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SeparatingDataLineFilter.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SeparatingDataLineFilter.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SeparatingDataLineFilter.java index d141392..c6131e2 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SeparatingDataLineFilter.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SeparatingDataLineFilter.java @@ -20,8 +20,8 @@ package org.apache.james.protocols.smtp.core; import java.nio.ByteBuffer; -import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.ProtocolSession.State; +import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.LineHandler; import org.apache.james.protocols.smtp.SMTPSession; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloExtension.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloExtension.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloExtension.java index 94c70b2..6803002 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloExtension.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloExtension.java @@ -19,10 +19,10 @@ package org.apache.james.protocols.smtp.core.esmtp; -import org.apache.james.protocols.smtp.SMTPSession; - import java.util.List; +import org.apache.james.protocols.smtp.SMTPSession; + /** * Must be implemented by handlers that add new ESMTP EHLO keyworkds */ http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java index 5a823f1..0390761 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java @@ -21,7 +21,6 @@ package org.apache.james.protocols.smtp.core.fastfail; - import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.james.core.MailAddress; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java index 2131f9a..5e33b6d 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java @@ -19,17 +19,21 @@ package org.apache.james.protocols.smtp.netty; import static org.assertj.core.api.Assertions.assertThat; + import java.net.InetSocketAddress; import java.net.Socket; import java.util.Arrays; import java.util.Locale; import java.util.Optional; import java.util.Properties; + import javax.mail.Message; import javax.mail.Session; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; +import org.apache.commons.net.smtp.SMTPReply; +import org.apache.commons.net.smtp.SMTPSClient; import org.apache.james.metrics.api.NoopMetricFactory; import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.api.Protocol; @@ -47,14 +51,12 @@ import org.apache.james.protocols.smtp.SMTPConfigurationImpl; import org.apache.james.protocols.smtp.SMTPProtocol; import org.apache.james.protocols.smtp.SMTPProtocolHandlerChain; import org.apache.james.protocols.smtp.utils.TestMessageHook; -import org.apache.commons.net.smtp.SMTPReply; -import org.apache.commons.net.smtp.SMTPSClient; - -import com.sun.mail.smtp.SMTPTransport; import org.assertj.core.api.AssertDelegateTarget; import org.junit.After; import org.junit.Test; +import com.sun.mail.smtp.SMTPTransport; + public class NettyStartTlsSMTPServerTest { private static final String LOCALHOST_IP = "127.0.0.1"; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/app/src/test/java/org/apache/james/app/spring/JamesSpringContextTest.java ---------------------------------------------------------------------- diff --git a/server/app/src/test/java/org/apache/james/app/spring/JamesSpringContextTest.java b/server/app/src/test/java/org/apache/james/app/spring/JamesSpringContextTest.java index a3743fd..9478de1 100644 --- a/server/app/src/test/java/org/apache/james/app/spring/JamesSpringContextTest.java +++ b/server/app/src/test/java/org/apache/james/app/spring/JamesSpringContextTest.java @@ -20,11 +20,11 @@ package org.apache.james.app.spring; import static org.assertj.core.api.Assertions.assertThat; + import org.apache.james.container.spring.context.JamesServerApplicationContext; import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.store.event.DefaultDelegatingMailboxListener; import org.apache.james.mailbox.store.quota.ListeningCurrentQuotaUpdater; - import org.assertj.core.api.Condition; import org.junit.After; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageCopyOnWriteProxy.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageCopyOnWriteProxy.java b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageCopyOnWriteProxy.java index 53483eb..9832659 100644 --- a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageCopyOnWriteProxy.java +++ b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageCopyOnWriteProxy.java @@ -19,27 +19,27 @@ package org.apache.james.server.core; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Date; +import java.util.Enumeration; + import javax.activation.DataHandler; import javax.mail.Address; import javax.mail.Flags; +import javax.mail.Flags.Flag; import javax.mail.Folder; import javax.mail.Message; import javax.mail.MessagingException; import javax.mail.Multipart; import javax.mail.Session; -import javax.mail.Flags.Flag; import javax.mail.internet.MimeMessage; import javax.mail.search.SearchTerm; import org.apache.james.lifecycle.api.Disposable; import org.apache.james.lifecycle.api.LifecycleUtil; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.Date; -import java.util.Enumeration; - /** * This object wraps a "possibly shared" MimeMessage tracking copies and * automatically cloning it (if shared) when a write operation is invoked. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/container/core/src/test/java/org/apache/james/server/core/MailHeadersTest.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/test/java/org/apache/james/server/core/MailHeadersTest.java b/server/container/core/src/test/java/org/apache/james/server/core/MailHeadersTest.java index 74b2431..c13e521 100644 --- a/server/container/core/src/test/java/org/apache/james/server/core/MailHeadersTest.java +++ b/server/container/core/src/test/java/org/apache/james/server/core/MailHeadersTest.java @@ -18,14 +18,16 @@ ****************************************************************/ package org.apache.james.server.core; +import static org.junit.Assert.assertEquals; + import java.io.ByteArrayInputStream; import java.util.Enumeration; + import javax.mail.MessagingException; + import org.apache.mailet.base.RFC2822Headers; import org.junit.Test; -import static org.junit.Assert.assertEquals; - public class MailHeadersTest { @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageCopyOnWriteProxyTest.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageCopyOnWriteProxyTest.java b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageCopyOnWriteProxyTest.java index 1253da1..9d49056 100644 --- a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageCopyOnWriteProxyTest.java +++ b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageCopyOnWriteProxyTest.java @@ -34,8 +34,8 @@ import javax.mail.Session; import javax.mail.internet.MimeMessage; import javax.mail.util.SharedByteArrayInputStream; -import org.apache.james.lifecycle.api.LifecycleUtil; import org.apache.james.core.MailAddress; +import org.apache.james.lifecycle.api.LifecycleUtil; import org.apache.mailet.Mail; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageFromSharedStreamTest.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageFromSharedStreamTest.java b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageFromSharedStreamTest.java index a11aedc..eb79ce0 100644 --- a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageFromSharedStreamTest.java +++ b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageFromSharedStreamTest.java @@ -19,12 +19,11 @@ package org.apache.james.server.core; -import javax.mail.util.SharedByteArrayInputStream; +import java.util.Properties; import javax.mail.Session; import javax.mail.internet.MimeMessage; - -import java.util.Properties; +import javax.mail.util.SharedByteArrayInputStream; public class MimeMessageFromSharedStreamTest extends MimeMessageFromStreamTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageFromStreamTest.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageFromStreamTest.java b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageFromStreamTest.java index 8b68c14..1c0c000 100644 --- a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageFromStreamTest.java +++ b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageFromStreamTest.java @@ -19,12 +19,12 @@ package org.apache.james.server.core; -import javax.mail.Session; -import javax.mail.internet.MimeMessage; - import java.io.ByteArrayInputStream; import java.util.Properties; +import javax.mail.Session; +import javax.mail.internet.MimeMessage; + public class MimeMessageFromStreamTest extends MimeMessageTest { protected MimeMessage getMessageFromSources(String sources) throws Exception { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageUtilTest.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageUtilTest.java b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageUtilTest.java index 0f023da..8a12390 100644 --- a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageUtilTest.java +++ b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageUtilTest.java @@ -19,14 +19,15 @@ package org.apache.james.server.core; -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.internet.MimeMessage; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Properties; + +import javax.mail.MessagingException; +import javax.mail.Session; +import javax.mail.internet.MimeMessage; + import org.junit.Test; public class MimeMessageUtilTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/container/core/src/test/java/org/apache/james/server/core/filesystem/FileSystemImplTest.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/test/java/org/apache/james/server/core/filesystem/FileSystemImplTest.java b/server/container/core/src/test/java/org/apache/james/server/core/filesystem/FileSystemImplTest.java index c32b65a..90aa5e3 100644 --- a/server/container/core/src/test/java/org/apache/james/server/core/filesystem/FileSystemImplTest.java +++ b/server/container/core/src/test/java/org/apache/james/server/core/filesystem/FileSystemImplTest.java @@ -18,9 +18,9 @@ ****************************************************************/ package org.apache.james.server.core.filesystem; -import org.apache.james.server.core.JamesServerResourceLoader; import org.apache.james.filesystem.api.AbstractFileSystemTest; import org.apache.james.filesystem.api.FileSystem; +import org.apache.james.server.core.JamesServerResourceLoader; public class FileSystemImplTest extends AbstractFileSystemTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/container/filesystem-api/src/main/java/org/apache/james/filesystem/api/FileSystem.java ---------------------------------------------------------------------- diff --git a/server/container/filesystem-api/src/main/java/org/apache/james/filesystem/api/FileSystem.java b/server/container/filesystem-api/src/main/java/org/apache/james/filesystem/api/FileSystem.java index 121dd2f..2221dfa 100644 --- a/server/container/filesystem-api/src/main/java/org/apache/james/filesystem/api/FileSystem.java +++ b/server/container/filesystem-api/src/main/java/org/apache/james/filesystem/api/FileSystem.java @@ -21,8 +21,8 @@ package org.apache.james.filesystem.api; import java.io.File; import java.io.FileNotFoundException; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; /** * This service is used by components that wants to lookup a File resource from http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/container/guice/custom-mailets/src/main/java/com/custom/matchers/AnotherMatcher.java ---------------------------------------------------------------------- diff --git a/server/container/guice/custom-mailets/src/main/java/com/custom/matchers/AnotherMatcher.java b/server/container/guice/custom-mailets/src/main/java/com/custom/matchers/AnotherMatcher.java index 1b9dd6c..6f3bd02 100644 --- a/server/container/guice/custom-mailets/src/main/java/com/custom/matchers/AnotherMatcher.java +++ b/server/container/guice/custom-mailets/src/main/java/com/custom/matchers/AnotherMatcher.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; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/container/guice/custom-mailets/src/main/java/org/apache/james/transport/matchers/CustomMatcher.java ---------------------------------------------------------------------- diff --git a/server/container/guice/custom-mailets/src/main/java/org/apache/james/transport/matchers/CustomMatcher.java b/server/container/guice/custom-mailets/src/main/java/org/apache/james/transport/matchers/CustomMatcher.java index eea805f..c3051cb 100644 --- a/server/container/guice/custom-mailets/src/main/java/org/apache/james/transport/matchers/CustomMatcher.java +++ b/server/container/guice/custom-mailets/src/main/java/org/apache/james/transport/matchers/CustomMatcher.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; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceProbeProvider.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceProbeProvider.java b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceProbeProvider.java index 237c537..f63e375 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceProbeProvider.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceProbeProvider.java @@ -19,14 +19,15 @@ package org.apache.james.utils; -import com.github.steveash.guavate.Guavate; -import com.google.common.base.Preconditions; - -import javax.inject.Inject; import java.util.Map; import java.util.Optional; import java.util.Set; +import javax.inject.Inject; + +import com.github.steveash.guavate.Guavate; +import com.google.common.base.Preconditions; + public class GuiceProbeProvider { private final Map<Class<GuiceProbe>, GuiceProbe> registry; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/container/guice/guice-common/src/test/java/org/apache/james/modules/TestFilesystemModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/modules/TestFilesystemModule.java b/server/container/guice/guice-common/src/test/java/org/apache/james/modules/TestFilesystemModule.java index 29486a1..78e1e6d 100644 --- a/server/container/guice/guice-common/src/test/java/org/apache/james/modules/TestFilesystemModule.java +++ b/server/container/guice/guice-common/src/test/java/org/apache/james/modules/TestFilesystemModule.java @@ -23,9 +23,9 @@ import java.io.File; import java.io.IOException; import java.util.function.Supplier; -import org.apache.james.server.core.JamesServerResourceLoader; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.filesystem.api.JamesDirectoriesProvider; +import org.apache.james.server.core.JamesServerResourceLoader; import org.junit.rules.TemporaryFolder; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/container/guice/guice-common/src/test/java/org/apache/james/utils/FileConfigurationProviderTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/FileConfigurationProviderTest.java b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/FileConfigurationProviderTest.java index e9b715b..70bb9d6 100644 --- a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/FileConfigurationProviderTest.java +++ b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/FileConfigurationProviderTest.java @@ -22,9 +22,9 @@ package org.apache.james.utils; import static org.assertj.core.api.Assertions.assertThat; import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.james.filesystem.api.FileSystem; import org.apache.james.server.core.JamesServerResourceLoader; import org.apache.james.server.core.filesystem.FileSystemImpl; -import org.apache.james.filesystem.api.FileSystem; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java index c601c44..d13d3eb 100644 --- a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java +++ b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java @@ -26,12 +26,12 @@ import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.james.jmap.JMAPConfiguration; import org.apache.james.jmap.JMAPModule; import org.apache.james.jmap.JMAPServer; -import org.apache.james.utils.MessageIdProbe; import org.apache.james.jmap.crypto.JamesSignatureHandler; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.utils.ConfigurationPerformer; import org.apache.james.utils.GuiceProbe; import org.apache.james.utils.JmapGuiceProbe; +import org.apache.james.utils.MessageIdProbe; import org.bouncycastle.jce.provider.BouncyCastleProvider; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/EventsConfigurationBeanFactoryPostProcessor.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/EventsConfigurationBeanFactoryPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/EventsConfigurationBeanFactoryPostProcessor.java index 28b9e60..8f25443 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/EventsConfigurationBeanFactoryPostProcessor.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/EventsConfigurationBeanFactoryPostProcessor.java @@ -19,7 +19,6 @@ package org.apache.james.container.spring.bean.factorypostprocessor; -import com.google.common.base.Strings; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.james.container.spring.lifecycle.ConfigurationProvider; @@ -28,6 +27,8 @@ import org.springframework.beans.FatalBeanException; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; +import com.google.common.base.Strings; + public class EventsConfigurationBeanFactoryPostProcessor implements BeanFactoryPostProcessor { @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java index 6c64b82..5daa4bf 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java @@ -22,14 +22,14 @@ package org.apache.james.container.spring.bean.factorypostprocessor; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.james.container.spring.lifecycle.ConfigurationProvider; - -import com.google.common.collect.ImmutableSet; import org.springframework.beans.BeansException; import org.springframework.beans.FatalBeanException; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.BeanDefinitionRegistry; +import com.google.common.collect.ImmutableSet; + /** * Read mailbox.xml file and register the right bean alias in the * {@link BeanDefinitionRegistry} depending on the configured provider. As http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/container/spring/src/main/java/org/apache/james/container/spring/filesystem/FileSystemImpl.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/filesystem/FileSystemImpl.java b/server/container/spring/src/main/java/org/apache/james/container/spring/filesystem/FileSystemImpl.java index eb30895..5b788c4 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/filesystem/FileSystemImpl.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/filesystem/FileSystemImpl.java @@ -18,17 +18,17 @@ ****************************************************************/ package org.apache.james.container.spring.filesystem; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; + import org.apache.james.container.spring.resource.JamesResourceLoader; import org.apache.james.filesystem.api.FileSystem; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; - /** * {@link FileSystem} implementation which use the {@link JamesResourceLoader} * to load all needed resources http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java b/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java index 1e49067..49ced35 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java @@ -27,7 +27,6 @@ import javax.inject.Named; import javax.mail.Flags; import javax.mail.MessagingException; -import org.apache.james.server.core.MimeMessageInputStream; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.mailbox.MailboxManager; @@ -39,6 +38,7 @@ import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailrepository.api.MailRepository; import org.apache.james.mailrepository.api.MailRepositoryStore; import org.apache.james.mailrepository.api.MailRepositoryStore.MailRepositoryStoreException; +import org.apache.james.server.core.MimeMessageInputStream; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; import org.apache.mailet.Mail; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/container/spring/src/test/java/org/apache/james/container/spring/filesystem/FileSystemImplTest.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/test/java/org/apache/james/container/spring/filesystem/FileSystemImplTest.java b/server/container/spring/src/test/java/org/apache/james/container/spring/filesystem/FileSystemImplTest.java index e878a02..f5b8cd1 100644 --- a/server/container/spring/src/test/java/org/apache/james/container/spring/filesystem/FileSystemImplTest.java +++ b/server/container/spring/src/test/java/org/apache/james/container/spring/filesystem/FileSystemImplTest.java @@ -21,9 +21,9 @@ package org.apache.james.container.spring.filesystem; import org.apache.james.container.spring.context.JamesServerApplicationContext; import org.apache.james.container.spring.resource.DefaultJamesResourceLoader; import org.apache.james.container.spring.resource.JamesResourceLoader; -import org.apache.james.server.core.JamesServerResourceLoader; import org.apache.james.filesystem.api.AbstractFileSystemTest; import org.apache.james.filesystem.api.FileSystem; +import org.apache.james.server.core.JamesServerResourceLoader; public class FileSystemImplTest extends AbstractFileSystemTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java b/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java index a399690..146a0eb 100644 --- a/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java @@ -19,17 +19,18 @@ */ package org.apache.james.util.retry.naming; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import javax.naming.Context; import javax.naming.NamingException; + import org.apache.james.util.retry.api.ExceptionRetryingProxy; import org.apache.james.util.retry.api.RetryHandler; import org.apache.james.util.retry.api.RetrySchedule; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - /** * <code>ExceptionRetryHandlerTest</code> */ http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-api/src/main/java/org/apache/james/mailrepository/api/MailRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-api/src/main/java/org/apache/james/mailrepository/api/MailRepository.java b/server/data/data-api/src/main/java/org/apache/james/mailrepository/api/MailRepository.java index cedc156..aa2ff34 100644 --- a/server/data/data-api/src/main/java/org/apache/james/mailrepository/api/MailRepository.java +++ b/server/data/data-api/src/main/java/org/apache/james/mailrepository/api/MailRepository.java @@ -19,12 +19,12 @@ package org.apache.james.mailrepository.api; -import org.apache.mailet.Mail; +import java.util.Collection; +import java.util.Iterator; import javax.mail.MessagingException; -import java.util.Collection; -import java.util.Iterator; +import org.apache.mailet.Mail; /** * Interface for a Repository to store Mails. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
