JAMES-2277 reorder imports to match eclipse rules
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/43fdedc3 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/43fdedc3 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/43fdedc3 Branch: refs/heads/master Commit: 43fdedc3fffa07f43a596cc1a9543a7ebaa1d47c Parents: 0c39fda Author: Matthieu Baechler <[email protected]> Authored: Tue Dec 26 17:48:19 2017 +0100 Committer: Raphael Ouazana <[email protected]> Committed: Wed Jan 10 10:45:40 2018 +0100 ---------------------------------------------------------------------- .../cassandra/init/CassandraTableManager.java | 3 ++- .../cassandra/init/CassandraTypesCreator.java | 5 ++-- .../init/QueryLoggerConfiguration.java | 3 ++- .../james/mailbox/model/AttachmentId.java | 1 - .../org/apache/james/mailbox/model/Cid.java | 1 - .../james/mailbox/model/ComposedMessageId.java | 1 - .../model/ComposedMessageIdWithMetaData.java | 1 - .../james/mailbox/quota/QuotaRootResolver.java | 4 +-- .../mailbox/ApplicableFlagBuilderTest.java | 1 + .../acl/UnionMailboxACLResolverTest.java | 4 +-- .../manager/QuotaMessageManagerTest.java | 6 ++--- .../org/apache/james/mailbox/model/CidTest.java | 1 + .../ComposedMessageIdWithMetaDataTest.java | 1 - .../mailbox/model/MailboxAnnotationKeyTest.java | 4 +-- .../mailbox/model/MessageAttachmentTest.java | 1 + .../CassandraMailboxPathRegisterMapper.java | 11 ++++---- .../cassandra/mail/AttachmentLoader.java | 2 +- .../mail/CassandraDeletedMessageDAO.java | 7 +++-- .../cassandra/mail/CassandraModSeqProvider.java | 2 ++ .../cassandra/mail/CassandraUidProvider.java | 2 ++ .../mailbox/cassandra/mail/utils/Limit.java | 4 +-- .../quota/CassandraCurrentQuotaManager.java | 13 ++++----- .../quota/CassandraPerUserMaxQuotaManager.java | 11 ++++---- .../cassandra/mail/AttachmentLoaderTest.java | 7 ++--- .../CassandraMessageIdToImapUidDAOTest.java | 1 - .../mailbox/cassandra/mail/utils/LimitTest.java | 15 +++++------ .../elasticsearch/json/MessageUpdateJson.java | 1 + .../query/DateResolutionFormater.java | 6 ++--- .../search/ElasticSearchSearcher.java | 2 +- .../mailbox/elasticsearch/json/FieldImpl.java | 4 +-- .../query/DateResolutionFormaterTest.java | 8 +++--- .../james/mailbox/hbase/FlagConvertor.java | 1 + .../mailbox/hbase/io/ChunkInputStream.java | 5 ++-- .../mailbox/hbase/io/ChunkOutputStream.java | 1 + .../mailbox/hbase/mail/HBaseMessageMapper.java | 28 +++++++++++--------- .../mailbox/hbase/mail/HBaseUidProvider.java | 11 ++++---- .../hbase/HBaseMailboxIdDeserializerTest.java | 4 +-- .../mail/HBaseUidAndModSeqProviderTest.java | 3 ++- .../mailbox/jcr/user/model/JCRSubscription.java | 1 - .../jcr/JCRMailboxManagerStressTest.java | 5 ++-- .../mailbox/jcr/JCRMailboxManagerTest.java | 5 ++-- .../jpa/mail/model/JPAMailboxAnnotationId.java | 4 +-- .../jpa/openjpa/OpenJPAMailboxManager.java | 1 - .../mailbox/kafka/KafkaMessageConsumer.java | 26 +++++++++--------- .../james/mailbox/kafka/KafkaPublisher.java | 14 +++++----- .../search/LenientImapSearchAnalyzer.java | 1 - .../mailbox/inmemory/JsoupTextExtractor.java | 1 - .../apache/james/mailbox/store/BatchSizes.java | 1 - .../james/mailbox/store/LazyMimeDescriptor.java | 2 +- .../event/DefaultDelegatingMailboxListener.java | 7 ++--- .../store/event/MailboxAnnotationListener.java | 4 +-- .../DistantMailboxPathRegisterMapper.java | 4 +-- .../event/distributed/MailboxPathRegister.java | 4 +-- .../json/event/dto/EventDataTransferObject.java | 5 ++-- .../json/event/dto/FlagsDataTransferObject.java | 4 +-- .../event/dto/LocaleDataTransferObject.java | 4 +-- .../dto/MailboxPathDataTransferObject.java | 3 ++- .../store/mail/model/SerializableQuota.java | 4 +-- .../store/mail/model/impl/PropertyBuilder.java | 1 + .../store/quota/FixedMaxQuotaManager.java | 2 +- .../james/mailbox/store/quota/QuotaImpl.java | 4 +-- .../mailbox/store/quota/QuotaRootImpl.java | 3 ++- .../mailbox/store/quota/StoreQuotaManager.java | 10 +++---- .../store/search/SimpleMessageSearchIndex.java | 2 +- .../store/streaming/FullByteContent.java | 10 +++---- .../AbstractMessageIdManagerSideEffectTest.java | 3 +-- .../event/distributed/PublisherReceiver.java | 5 ++-- .../store/mail/model/ListMailboxAssert.java | 1 + .../mail/model/ListMessagePropertiesAssert.java | 1 + .../store/mail/model/MailboxMapperACLTest.java | 1 + .../store/quota/GenericMaxQuotaManagerTest.java | 4 +-- .../indexer/events/FlagsMessageEvent.java | 4 +-- .../indexer/events/MessageDeletedEvent.java | 4 +-- .../james/ai/classic/BayesianAnalysis.java | 2 +- .../james/ai/classic/JDBCBayesianAnalyzer.java | 1 - .../src/main/java/org/apache/mailet/Mail.java | 10 +++---- .../base/AutomaticallySentMailDetectorImpl.java | 2 +- .../apache/mailet/base/FlowedMessageUtils.java | 4 +-- .../org/apache/mailet/base/GenericMatcher.java | 2 +- .../mailet/base/GenericRecipientMatcher.java | 2 +- .../org/apache/mailet/base/MatcherInverter.java | 2 +- .../org/apache/mailet/base/MailetUtilTest.java | 1 + .../apache/mailet/base/MatcherInverterTest.java | 2 +- .../org/apache/mailet/base/test/MailUtil.java | 2 +- .../james/transport/mailets/AbstractSign.java | 2 +- .../transport/matcher/IsSMIMEEncrypted.java | 4 +-- .../james/transport/matcher/IsSMIMESigned.java | 4 +-- .../matcher/IsX509CertificateSubject.java | 2 +- .../transport/mailets/ICALToJsonAttribute.java | 2 +- .../transport/mailets/AddDeliveredToHeader.java | 2 +- .../james/transport/mailets/ClamAVScan.java | 2 +- .../apache/james/transport/mailets/Null.java | 2 +- .../transport/mailets/RecipientToLowerCase.java | 3 ++- .../transport/mailets/RemoveMailAttribute.java | 11 ++++---- .../james/transport/mailets/ServerTime.java | 6 ++--- .../transport/mailets/StripAttachment.java | 5 ++-- .../transport/mailets/UseHeaderRecipients.java | 3 ++- .../mailets/debug/ExceptionThrowingMailet.java | 6 ++--- .../james/transport/mailets/debug/Identity.java | 2 +- .../matchers/AbstractQuotaMatcher.java | 2 +- .../apache/james/transport/matchers/All.java | 8 +++--- .../matchers/AttachmentFileNameIs.java | 2 +- .../transport/matchers/CommandForListserv.java | 6 ++--- .../matchers/CommandListservMatcher.java | 6 ++--- .../matchers/CompareNumericHeaderValue.java | 14 +++++----- .../transport/matchers/GenericRegexMatcher.java | 2 +- .../james/transport/matchers/HasAttachment.java | 9 ++++--- .../matchers/HasHabeasWarrantMark.java | 2 +- .../james/transport/matchers/HasHeader.java | 2 +- .../transport/matchers/HasHeaderWithPrefix.java | 2 +- .../transport/matchers/HasMailAttribute.java | 3 +-- .../matchers/HasMailAttributeWithValue.java | 2 +- .../HasMailAttributeWithValueRegex.java | 12 ++++----- .../james/transport/matchers/HasMimeType.java | 22 ++++++++------- .../james/transport/matchers/HostIsLocal.java | 2 +- .../transport/matchers/IsSingleRecipient.java | 8 +++--- .../james/transport/matchers/RecipientIs.java | 2 +- .../transport/matchers/RecipientIsLocal.java | 2 +- .../transport/matchers/RecipientIsRegex.java | 6 ++--- .../james/transport/matchers/RelayLimit.java | 14 +++++----- .../transport/matchers/SMTPAuthSuccessful.java | 9 ++++--- .../transport/matchers/SMTPAuthUserIs.java | 2 +- .../james/transport/matchers/SenderHostIs.java | 2 +- .../transport/matchers/SenderHostIsLocal.java | 2 +- .../james/transport/matchers/SenderIs.java | 2 +- .../james/transport/matchers/SenderIsLocal.java | 2 +- .../james/transport/matchers/SenderIsNull.java | 8 +++--- .../james/transport/matchers/SenderIsRegex.java | 8 +++--- .../james/transport/matchers/SentByMailet.java | 5 ++-- .../transport/matchers/SizeGreaterThan.java | 11 ++++---- .../james/transport/matchers/SubjectIs.java | 9 ++++--- .../transport/matchers/SubjectStartsWith.java | 9 ++++--- .../james/transport/matchers/TooManyLines.java | 2 +- .../transport/matchers/TooManyRecipients.java | 2 +- .../MailAttributesListToMimeHeadersTest.java | 1 - .../transport/mailets/ToProcessorTest.java | 2 +- .../mailets/utils/MimeMessageModifierTest.java | 2 ++ .../mailets/utils/MimeMessageUtilsTest.java | 2 ++ .../matchers/RecipientIsLocalTest.java | 2 +- .../matchers/SMTPAuthSuccessfulTest.java | 2 +- .../transport/matchers/SMTPAuthUserIsTest.java | 2 +- .../matchers/SenderHostIsLocalTest.java | 2 +- .../transport/matchers/SenderHostIsTest.java | 2 +- .../transport/matchers/SenderIsLocalTest.java | 4 +-- .../transport/matchers/SentByMailetTest.java | 2 +- .../james/transport/matchers/UserIsTest.java | 1 - .../util/MailAddressCollectionReaderTest.java | 2 +- .../metrics/logger/DefaultMetricFactory.java | 4 +-- .../mpt/helper/ByteBufferOutputStream.java | 4 +-- .../apache/james/mpt/api/ImapFeaturesTest.java | 4 +-- .../cyrus/CyrusMailboxTestModule.java | 4 +-- .../external/james/ExternalJamesModule.java | 3 ++- .../james/host/ExternalJamesHostSystem.java | 2 +- .../james/host/ExternalJamesUserAdder.java | 3 ++- .../james/mpt/host/ManageSieveSession.java | 4 +-- .../james/mpt/managesieve/file/FileModule.java | 3 ++- .../apache/james/mpt/smtp/SmtpHostSystem.java | 2 +- .../protocols/api/handler/CommandHandler.java | 1 - .../api/utils/BogusSslContextFactory.java | 1 - .../james/imap/encode/QuotaResponseEncoder.java | 4 +-- .../imap/encode/QuotaRootResponseEncoder.java | 4 +-- .../james/imap/encode/XListResponseEncoder.java | 7 +++-- .../encode/main/DefaultImapEncoderFactory.java | 6 ++--- .../apache/james/imap/main/ResponseEncoder.java | 2 +- .../response/AbstactStatusResponseFactory.java | 2 +- .../message/response/AnnotationResponse.java | 4 +-- .../imap/message/response/QuotaResponse.java | 3 ++- .../response/UnpooledStatusResponseFactory.java | 2 +- .../james/imap/processor/AppendProcessor.java | 4 +-- .../james/imap/processor/CompressProcessor.java | 2 -- .../imap/processor/DeleteACLProcessor.java | 1 - .../message/response/StatusResponseTest.java | 2 +- .../imap/decode/ImapRequestLineReaderTest.java | 6 ++--- .../main/OutputStreamImapResponseWriter.java | 1 + .../parser/GetAnnotationCommandParserTest.java | 1 - .../imap/decode/parser/GetQuotaParserTest.java | 10 +++---- .../decode/parser/GetQuotaRootParserTest.java | 10 +++---- .../parser/SetAnnotationCommandParserTest.java | 1 + .../parser/SetQuotaCommandParserTest.java | 12 ++++----- .../imap/encode/QuotaResponseEncoderTest.java | 4 +-- .../encode/QuotaRootResponseEncoderTest.java | 4 +-- .../processor/GetAnnotationProcessorTest.java | 7 ++--- .../processor/base/UidMsnConverterTest.java | 5 ++-- .../core/PlainAuthenticationProcessor.java | 5 ++-- .../managesieve/transcode/ArgumentParser.java | 12 +++++---- .../transcode/ManageSieveProcessor.java | 4 +-- .../netty/LineHandlerUpstreamHandler.java | 2 +- .../james/protocols/netty/NettyServer.java | 6 ++--- .../pop3/core/AbstractInputStreamTest.java | 1 + .../smtp/core/SeparatingDataLineFilter.java | 2 +- .../smtp/core/esmtp/EhloExtension.java | 4 +-- .../smtp/core/fastfail/MaxRcptHandler.java | 1 - .../smtp/netty/NettyStartTlsSMTPServerTest.java | 10 ++++--- .../app/spring/JamesSpringContextTest.java | 2 +- .../core/MimeMessageCopyOnWriteProxy.java | 14 +++++----- .../james/server/core/MailHeadersTest.java | 6 +++-- .../core/MimeMessageCopyOnWriteProxyTest.java | 2 +- .../core/MimeMessageFromSharedStreamTest.java | 5 ++-- .../server/core/MimeMessageFromStreamTest.java | 6 ++--- .../james/server/core/MimeMessageUtilTest.java | 9 ++++--- .../core/filesystem/FileSystemImplTest.java | 2 +- .../apache/james/filesystem/api/FileSystem.java | 2 +- .../com/custom/matchers/AnotherMatcher.java | 2 +- .../james/transport/matchers/CustomMatcher.java | 2 +- .../apache/james/utils/GuiceProbeProvider.java | 9 ++++--- .../james/modules/TestFilesystemModule.java | 2 +- .../utils/FileConfigurationProviderTest.java | 2 +- .../modules/protocols/JMAPServerModule.java | 2 +- ...tsConfigurationBeanFactoryPostProcessor.java | 3 ++- ...oxConfigurationBeanFactoryPostProcessor.java | 4 +-- .../spring/filesystem/FileSystemImpl.java | 10 +++---- .../container/spring/tool/James23Importer.java | 2 +- .../spring/filesystem/FileSystemImplTest.java | 2 +- .../naming/NamingExceptionRetryHandlerTest.java | 7 ++--- .../mailrepository/api/MailRepository.java | 6 ++--- .../apache/james/user/api/UsersRepository.java | 2 +- .../CassandraRecipientRewriteTable.java | 2 ++ .../cassandra/CassandraActiveScriptDAO.java | 3 +-- .../mailrepository/file/FileMailRepository.java | 4 +-- .../file/MimeMessageStreamRepositorySource.java | 6 ++--- .../file/SieveFileRepositoryTest.java | 12 ++++----- .../mailrepository/jcr/JCRMailRepository.java | 4 +-- .../mailrepository/jdbc/JDBCMailRepository.java | 8 +++--- .../mailrepository/jdbc/MessageInputStream.java | 2 +- .../jdbc/MimeMessageJDBCSource.java | 2 +- .../user/jdbc/JamesUsersJdbcRepository.java | 10 +++---- .../vacation/CassandraVacationRepository.java | 2 +- .../james/jmap/api/access/AccessToken.java | 4 +-- .../vacation/MemoryVacationRepository.java | 2 +- .../AbstractNotificationRegistryTest.java | 2 +- .../rrt/jpa/model/JPARecipientRewrite.java | 4 +-- .../user/ldap/ReadOnlyUsersLDAPRepository.java | 11 ++++---- .../rrt/lib/AbstractRecipientRewriteTable.java | 2 +- .../rrt/lib/RecipientRewriteTableUtil.java | 2 +- .../lib/SieveRepositoryManagement.java | 8 +++--- .../james/user/lib/AbstractUsersRepository.java | 7 ++--- .../james/user/lib/model/DefaultJamesUser.java | 2 +- .../james/user/lib/model/DefaultUser.java | 6 ++--- .../AbstractMailRepositoryTest.java | 6 ++--- .../apache/james/rrt/lib/MappingsImplTest.java | 1 + .../rrt/lib/RecipientRewriteTableUtilTest.java | 5 ++-- .../user/lib/AbstractUsersRepositoryTest.java | 3 ++- .../user/memory/MemoryUsersRepository.java | 4 +-- .../dnsservice/api/AbstractDNSServiceTest.java | 13 ++++----- .../james/dnsservice/api/mock/DNSFixture.java | 3 ++- .../library/inetnetwork/model/Inet6Network.java | 4 +-- .../inetnetwork/InetNetworkBuilderTest.java | 5 ++-- .../inetnetwork/model/InetNetworkTest.java | 7 ++--- .../library/netmatcher/NetMatcherTest.java | 5 ++-- .../karaf/features/KarafLiveTestSupport.java | 25 +++++++++-------- .../james/mailetcontainer/api/MailetLoader.java | 4 +-- .../mailetcontainer/api/MatcherLoader.java | 4 +-- .../api/mock/ExceptionThrowingMailet.java | 1 + .../api/mock/ExceptionThrowingMatcher.java | 4 ++- .../api/mock/MockMailProcessor.java | 1 + .../mailetcontainer/api/mock/MockMailet.java | 1 + .../api/mock/MockMailetLoader.java | 1 + .../mailetcontainer/api/mock/MockMatcher.java | 2 +- .../api/mock/MockMatcherLoader.java | 1 + .../mailetcontainer/impl/ProcessorUtil.java | 2 +- .../mailetcontainer/impl/matchers/And.java | 2 +- .../mailetcontainer/impl/matchers/Not.java | 3 ++- .../james/mailetcontainer/impl/matchers/Or.java | 2 +- .../mailetcontainer/impl/matchers/Xor.java | 3 ++- .../lib/AbstractStateMailetProcessor.java | 2 +- .../mailetcontainer/impl/matchers/AndTest.java | 4 +-- .../mailetcontainer/impl/matchers/NotTest.java | 2 +- .../mailetcontainer/impl/matchers/OrTest.java | 4 +-- .../mailetcontainer/impl/matchers/XorTest.java | 4 +-- .../AbstractStateCompositeProcessorTest.java | 2 +- .../mailets/AbstractRecipientRewriteTable.java | 4 +-- .../transport/mailets/BayesianAnalysis.java | 2 +- .../apache/james/transport/mailets/Bounce.java | 3 ++- .../james/transport/mailets/DSNBounce.java | 5 ++-- .../james/transport/mailets/JDBCAlias.java | 2 +- .../mailets/JDBCRecipientRewriteTable.java | 2 +- .../transport/mailets/NotifyPostmaster.java | 3 ++- .../james/transport/mailets/NotifySender.java | 3 ++- .../mailets/RecipientRewriteTableProcessor.java | 3 ++- .../james/transport/mailets/Redirect.java | 3 ++- .../james/transport/mailets/RemoteDelivery.java | 2 +- .../apache/james/transport/mailets/Resend.java | 3 ++- .../org/apache/james/transport/mailets/SPF.java | 2 +- .../james/transport/mailets/ToSenderFolder.java | 2 +- .../transport/mailets/WhiteListManager.java | 2 +- .../mailets/XMLRecipientRewriteTable.java | 2 +- .../mailets/delivery/MailDispatcher.java | 3 ++- .../transport/mailets/delivery/MailStore.java | 2 +- .../mailets/delivery/SimpleMailStore.java | 2 +- .../transport/mailets/jsieve/ActionContext.java | 2 +- .../transport/mailets/jsieve/ActionUtils.java | 2 +- .../mailets/jsieve/FileIntoAction.java | 2 +- .../mailets/jsieve/RedirectAction.java | 2 +- .../transport/mailets/jsieve/RejectAction.java | 2 +- .../mailets/jsieve/ResourceLocator.java | 6 ++--- .../mailets/jsieve/SieveMailAdapter.java | 2 +- .../mailets/jsieve/VacationAction.java | 2 +- .../transport/mailets/jsieve/VacationReply.java | 3 ++- .../mailets/jsieve/delivery/SieveExecutor.java | 2 +- .../mailets/jsieve/delivery/SievePoster.java | 2 +- .../mailets/redirect/MailModifier.java | 5 ++-- .../mailets/redirect/RedirectNotify.java | 3 ++- ...ddressesArrayToMailAddressListConverter.java | 3 ++- .../mailets/remoteDelivery/MailDelivrer.java | 2 +- .../RemoteDeliverySocketFactory.java | 4 +-- .../matchers/AbstractSQLWhitelistMatcher.java | 2 +- .../transport/matchers/InSpammerBlacklist.java | 2 +- .../james/transport/matchers/IsInWhiteList.java | 2 +- .../james/transport/matchers/IsOverQuota.java | 2 +- .../transport/matchers/MailboxQuotaFixed.java | 6 ++--- .../matchers/NetworkIsInWhitelist.java | 2 +- .../transport/matchers/RemoteAddrInNetwork.java | 6 ++--- .../matchers/RemoteAddrNotInNetwork.java | 6 ++--- .../transport/matchers/SenderInFakeDomain.java | 2 +- .../james/transport/util/MailAddressUtils.java | 3 ++- .../apache/james/transport/util/Patterns.java | 4 +-- .../james/transport/util/RecipientsUtils.java | 2 +- .../james/transport/util/ReplyToUtils.java | 3 ++- .../james/transport/util/SenderUtils.java | 3 ++- .../transport/util/SpecialAddressesUtils.java | 3 ++- .../apache/james/transport/util/TosUtils.java | 2 +- .../samples/mailets/InstrumentationMailet.java | 2 +- .../james/transport/mailets/BounceTest.java | 2 +- .../james/transport/mailets/ForwardTest.java | 4 ++- .../transport/mailets/NotifyPostmasterTest.java | 2 +- .../transport/mailets/NotifySenderTest.java | 2 +- .../RecipientRewriteTableProcessorTest.java | 2 +- .../james/transport/mailets/RedirectTest.java | 4 ++- .../james/transport/mailets/ResendTest.java | 2 +- .../transport/mailets/ResourceLocatorTest.java | 8 +++--- .../mailets/redirect/AddressExtractorTest.java | 2 ++ .../redirect/LoadedOnceInitParametersTest.java | 1 + .../mailets/redirect/MailModifierTest.java | 2 +- .../NotifyMailetInitParametersTest.java | 2 ++ .../redirect/NotifyMailetsMessageTest.java | 1 - .../RedirectMailetInitParametersTest.java | 2 ++ ...ssesArrayToMailAddressListConverterTest.java | 1 + .../mailets/remoteDelivery/BouncerTest.java | 2 ++ .../remoteDelivery/DeliveryRunnableTest.java | 1 + .../remoteDelivery/HeloNameProviderTest.java | 2 +- .../matchers/RemoteAddrInNetworkTest.java | 2 +- .../matchers/RemoteAddrNotInNetworkTest.java | 2 +- .../transport/util/MailAddressUtilsTest.java | 2 +- .../transport/util/RecipientsUtilsTest.java | 2 +- .../james/transport/util/ReplyToUtilsTest.java | 3 ++- .../james/transport/util/SenderUtilsTest.java | 3 ++- .../james/transport/util/SizeUtilsTest.java | 4 +-- .../util/SpecialAddressesUtilsTest.java | 4 ++- .../james/transport/util/TosUtilsTest.java | 2 +- .../james/fetchmail/MessageProcessor.java | 4 +-- .../james/fetchmail/ParsedConfiguration.java | 2 +- .../james/fetchmail/ProcessorAbstract.java | 2 +- .../jmap/UserProvisionningConcurrencyTest.java | 2 +- .../james/jmap/VacationIntegrationTest.java | 2 +- .../integration/GetVacationResponseTest.java | 2 +- .../integration/SetVacationResponseTest.java | 2 +- .../jmap/memory/cucumber/MemorySharingTest.java | 3 ++- .../james/jmap/UserProvisioningFilter.java | 2 +- .../jmap/json/FieldNamePropertyFilter.java | 1 - .../apache/james/jmap/mailet/SentByJmap.java | 2 +- .../james/jmap/mailet/VacationMailet.java | 2 +- .../apache/james/jmap/mailet/VacationReply.java | 2 +- .../james/jmap/mailet/SentByJmapTest.java | 2 +- .../james/jmap/mailet/VacationReplyTest.java | 2 +- .../SetMailboxesUpdateProcessorTest.java | 1 - .../james/imapserver/netty/IMAPServerTest.java | 8 +++--- .../james/lmtpserver/netty/LMTPServer.java | 1 - .../jmx/CommandHandlerResultJMXMonitor.java | 1 - .../james/smtpserver/JamesDataCmdHandler.java | 4 +-- .../james/smtpserver/MailPriorityHandler.java | 2 +- .../smtpserver/fastfail/SpamTrapHandler.java | 4 +-- .../smtpserver/POP3BeforeSMTPHandlerTest.java | 7 ++--- .../apache/james/smtpserver/SMTPServerTest.java | 2 +- .../smtpserver/SetMimeHeaderHandlerTest.java | 5 ++-- .../java/org/apache/james/smtpserver/Util.java | 4 ++- .../james/smtpserver/mock/mailet/MockMail.java | 2 +- .../mock/mailet/MockMailetConfig.java | 1 + .../webadmin/authentication/JwtFilter.java | 2 +- .../webadmin/swagger/routes/SwaggerRoutes.java | 3 +-- .../james/queue/activemq/ActiveMQMailQueue.java | 6 ++--- .../james/queue/api/mock/MockMailQueue.java | 2 +- .../apache/james/queue/file/FileMailQueue.java | 4 +-- .../apache/james/queue/jms/JMSMailQueue.java | 6 ++--- .../jms/MimeMessageObjectMessageSource.java | 2 +- .../queue/library/MailQueueManagement.java | 2 +- .../james/queue/jms/JMSMailQueueTest.java | 4 +-- 386 files changed, 798 insertions(+), 697 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTableManager.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTableManager.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTableManager.java index 95db5d9..66d8ba2 100644 --- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTableManager.java +++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTableManager.java @@ -19,9 +19,10 @@ package org.apache.james.backends.cassandra.init; +import org.apache.james.backends.cassandra.components.CassandraModule; + import com.datastax.driver.core.Session; import com.datastax.driver.core.querybuilder.QueryBuilder; -import org.apache.james.backends.cassandra.components.CassandraModule; public class CassandraTableManager { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTypesCreator.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTypesCreator.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTypesCreator.java index db85376..27179bc 100644 --- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTypesCreator.java +++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTypesCreator.java @@ -19,11 +19,12 @@ package org.apache.james.backends.cassandra.init; -import com.datastax.driver.core.Session; -import com.google.common.collect.ImmutableList; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraType; +import com.datastax.driver.core.Session; +import com.google.common.collect.ImmutableList; + public class CassandraTypesCreator { private final ImmutableList<CassandraType> types; private final Session session; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/QueryLoggerConfiguration.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/QueryLoggerConfiguration.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/QueryLoggerConfiguration.java index 08f17fd..b519ca7 100644 --- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/QueryLoggerConfiguration.java +++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/QueryLoggerConfiguration.java @@ -19,10 +19,11 @@ package org.apache.james.backends.cassandra.init; +import java.util.Optional; + import com.datastax.driver.core.PerHostPercentileTracker; import com.datastax.driver.core.QueryLogger; import com.google.common.base.Preconditions; -import java.util.Optional; public class QueryLoggerConfiguration { private final Optional<Long> constantThreshold; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/api/src/main/java/org/apache/james/mailbox/model/AttachmentId.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/AttachmentId.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/AttachmentId.java index 38aee93..21b94a7 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/AttachmentId.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/AttachmentId.java @@ -18,7 +18,6 @@ ****************************************************************/ package org.apache.james.mailbox.model; - import java.nio.charset.StandardCharsets; import java.util.Optional; import java.util.UUID; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/api/src/main/java/org/apache/james/mailbox/model/Cid.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/Cid.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/Cid.java index 24eaa5e..ba6c5d7 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/Cid.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/Cid.java @@ -19,7 +19,6 @@ package org.apache.james.mailbox.model; - import java.util.Optional; import org.apache.commons.lang3.StringUtils; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/api/src/main/java/org/apache/james/mailbox/model/ComposedMessageId.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/ComposedMessageId.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/ComposedMessageId.java index 1c0c83a..45a5cee 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/ComposedMessageId.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/ComposedMessageId.java @@ -19,7 +19,6 @@ package org.apache.james.mailbox.model; - import org.apache.james.mailbox.MessageUid; import com.google.common.base.MoreObjects; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/api/src/main/java/org/apache/james/mailbox/model/ComposedMessageIdWithMetaData.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/ComposedMessageIdWithMetaData.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/ComposedMessageIdWithMetaData.java index f24c5a9..fc5923e 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/ComposedMessageIdWithMetaData.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/ComposedMessageIdWithMetaData.java @@ -19,7 +19,6 @@ package org.apache.james.mailbox.model; - import javax.mail.Flags; import com.google.common.base.MoreObjects; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/api/src/main/java/org/apache/james/mailbox/quota/QuotaRootResolver.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/quota/QuotaRootResolver.java b/mailbox/api/src/main/java/org/apache/james/mailbox/quota/QuotaRootResolver.java index ebee47f..0a8ad75 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/quota/QuotaRootResolver.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/quota/QuotaRootResolver.java @@ -19,13 +19,13 @@ package org.apache.james.mailbox.quota; +import java.util.List; + import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.QuotaRoot; -import java.util.List; - public interface QuotaRootResolver { QuotaRoot createQuotaRoot(String quotaRootString); http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/api/src/test/java/org/apache/james/mailbox/ApplicableFlagBuilderTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/ApplicableFlagBuilderTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/ApplicableFlagBuilderTest.java index 5f91136..520e7e5 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/ApplicableFlagBuilderTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/ApplicableFlagBuilderTest.java @@ -19,6 +19,7 @@ package org.apache.james.mailbox; import static org.assertj.core.api.Assertions.assertThat; + import javax.mail.Flags; import org.assertj.core.api.JUnitSoftAssertions; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/api/src/test/java/org/apache/james/mailbox/acl/UnionMailboxACLResolverTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/acl/UnionMailboxACLResolverTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/acl/UnionMailboxACLResolverTest.java index 7cea75f..76d2b48 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/acl/UnionMailboxACLResolverTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/acl/UnionMailboxACLResolverTest.java @@ -20,6 +20,8 @@ package org.apache.james.mailbox.acl; +import static org.assertj.core.api.Assertions.assertThat; + import org.apache.james.mailbox.exception.UnsupportedRightException; import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxACL.Entry; @@ -30,8 +32,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import static org.assertj.core.api.Assertions.assertThat; - /** * @author Peter Palaga */ http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerTest.java index d220f70..3b12343 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerTest.java @@ -19,22 +19,22 @@ package org.apache.james.mailbox.manager; +import javax.mail.Flags; + import org.apache.james.mailbox.FlagsBuilder; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; -import org.apache.james.mailbox.quota.MaxQuotaManager; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.exception.OverQuotaException; import org.apache.james.mailbox.mock.MockMail; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageRange; +import org.apache.james.mailbox.quota.MaxQuotaManager; import org.apache.james.mailbox.quota.QuotaRootResolver; import org.junit.After; import org.junit.Before; import org.junit.Test; -import javax.mail.Flags; - /** * Test for quota support upon basic Message manager operation. * http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/api/src/test/java/org/apache/james/mailbox/model/CidTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/CidTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/CidTest.java index 81643ef..3939a39 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/CidTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/CidTest.java @@ -20,6 +20,7 @@ package org.apache.james.mailbox.model; import static org.assertj.core.api.Assertions.assertThat; + import java.util.Optional; import org.junit.Rule; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/api/src/test/java/org/apache/james/mailbox/model/ComposedMessageIdWithMetaDataTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/ComposedMessageIdWithMetaDataTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/ComposedMessageIdWithMetaDataTest.java index ce6ec68..62b6cd2 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/ComposedMessageIdWithMetaDataTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/ComposedMessageIdWithMetaDataTest.java @@ -18,7 +18,6 @@ ****************************************************************/ package org.apache.james.mailbox.model; - import static org.assertj.core.api.Assertions.assertThat; import javax.mail.Flags; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAnnotationKeyTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAnnotationKeyTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAnnotationKeyTest.java index d4b6342..a2e8b6b 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAnnotationKeyTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAnnotationKeyTest.java @@ -19,10 +19,10 @@ package org.apache.james.mailbox.model; -import org.junit.Test; - import static org.assertj.core.api.Assertions.assertThat; +import org.junit.Test; + public class MailboxAnnotationKeyTest { @Test(expected = IllegalArgumentException.class) public void newInstanceShouldThrowsExceptionWhenKeyDoesNotStartWithSlash() throws Exception { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/api/src/test/java/org/apache/james/mailbox/model/MessageAttachmentTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MessageAttachmentTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MessageAttachmentTest.java index f434253..16828ae 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MessageAttachmentTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MessageAttachmentTest.java @@ -20,6 +20,7 @@ package org.apache.james.mailbox.model; import static org.assertj.core.api.Assertions.assertThat; + import java.util.Optional; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraMailboxPathRegisterMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraMailboxPathRegisterMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraMailboxPathRegisterMapper.java index d1b83ef..30fa3cb 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraMailboxPathRegisterMapper.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraMailboxPathRegisterMapper.java @@ -26,9 +26,9 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.insertInto; import static com.datastax.driver.core.querybuilder.QueryBuilder.select; import static com.datastax.driver.core.querybuilder.QueryBuilder.ttl; -import com.datastax.driver.core.PreparedStatement; -import com.datastax.driver.core.Session; -import com.datastax.driver.core.UDTValue; +import java.util.Set; +import java.util.stream.Collectors; + import org.apache.james.backends.cassandra.init.CassandraTypesProvider; import org.apache.james.backends.cassandra.utils.CassandraUtils; import org.apache.james.mailbox.cassandra.table.CassandraMailboxPathRegisterTable; @@ -36,8 +36,9 @@ import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.store.event.distributed.DistantMailboxPathRegisterMapper; import org.apache.james.mailbox.store.publisher.Topic; -import java.util.Set; -import java.util.stream.Collectors; +import com.datastax.driver.core.PreparedStatement; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.UDTValue; public class CassandraMailboxPathRegisterMapper implements DistantMailboxPathRegisterMapper { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/AttachmentLoader.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/AttachmentLoader.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/AttachmentLoader.java index d33bcec..bf486ed 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/AttachmentLoader.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/AttachmentLoader.java @@ -25,13 +25,13 @@ import java.util.concurrent.CompletableFuture; import java.util.function.Function; import java.util.stream.Stream; +import org.apache.commons.lang3.tuple.Pair; import org.apache.james.mailbox.model.Attachment; import org.apache.james.mailbox.model.AttachmentId; import org.apache.james.mailbox.model.MessageAttachment; import org.apache.james.mailbox.store.mail.MessageMapper; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage; import org.apache.james.util.FluentFutureStream; -import org.apache.commons.lang3.tuple.Pair; import com.github.steveash.guavate.Guavate; import com.google.common.annotations.VisibleForTesting; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAO.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAO.java index 0ac87ba..4c6ebd9 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAO.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAO.java @@ -23,8 +23,8 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker; import static com.datastax.driver.core.querybuilder.QueryBuilder.delete; import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; import static com.datastax.driver.core.querybuilder.QueryBuilder.gte; -import static com.datastax.driver.core.querybuilder.QueryBuilder.lte; import static com.datastax.driver.core.querybuilder.QueryBuilder.insertInto; +import static com.datastax.driver.core.querybuilder.QueryBuilder.lte; import static com.datastax.driver.core.querybuilder.QueryBuilder.select; import static org.apache.james.mailbox.cassandra.table.CassandraDeletedMessageTable.MAILBOX_ID; import static org.apache.james.mailbox.cassandra.table.CassandraDeletedMessageTable.TABLE_NAME; @@ -35,18 +35,17 @@ import java.util.stream.Stream; import javax.inject.Inject; -import com.datastax.driver.core.ResultSet; import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor; import org.apache.james.backends.cassandra.utils.CassandraUtils; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.cassandra.ids.CassandraId; +import org.apache.james.mailbox.model.MessageRange; import com.datastax.driver.core.PreparedStatement; +import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Session; import com.google.common.annotations.VisibleForTesting; -import org.apache.james.mailbox.model.MessageRange; - public class CassandraDeletedMessageDAO { private static final String UID_TO = "uid_to"; private static final String UID_FROM = "uid_from"; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProvider.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProvider.java index 0cbfa3f..beca954 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProvider.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProvider.java @@ -28,10 +28,12 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.update; import static org.apache.james.mailbox.cassandra.table.CassandraMessageModseqTable.MAILBOX_ID; import static org.apache.james.mailbox.cassandra.table.CassandraMessageModseqTable.NEXT_MODSEQ; import static org.apache.james.mailbox.cassandra.table.CassandraMessageModseqTable.TABLE_NAME; + import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; import java.util.function.Supplier; + import javax.inject.Inject; import org.apache.james.backends.cassandra.init.CassandraConfiguration; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProvider.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProvider.java index c90a278..0c8c0dd 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProvider.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProvider.java @@ -28,8 +28,10 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.update; import static org.apache.james.mailbox.cassandra.table.CassandraMessageUidTable.MAILBOX_ID; import static org.apache.james.mailbox.cassandra.table.CassandraMessageUidTable.NEXT_UID; import static org.apache.james.mailbox.cassandra.table.CassandraMessageUidTable.TABLE_NAME; + import java.util.Optional; import java.util.concurrent.CompletableFuture; + import javax.inject.Inject; import org.apache.james.backends.cassandra.init.CassandraConfiguration; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/Limit.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/Limit.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/Limit.java index 68343dd..3b8bb90 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/Limit.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/Limit.java @@ -19,12 +19,12 @@ package org.apache.james.mailbox.cassandra.mail.utils; -import com.google.common.base.Preconditions; - import java.util.Objects; import java.util.Optional; import java.util.stream.Stream; +import com.google.common.base.Preconditions; + public class Limit { public static Limit from(int limit) { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManager.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManager.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManager.java index 9ce4dee..963477a 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManager.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManager.java @@ -23,20 +23,21 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker; import static com.datastax.driver.core.querybuilder.QueryBuilder.decr; import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; import static com.datastax.driver.core.querybuilder.QueryBuilder.incr; -import static com.datastax.driver.core.querybuilder.QueryBuilder.update; import static com.datastax.driver.core.querybuilder.QueryBuilder.select; +import static com.datastax.driver.core.querybuilder.QueryBuilder.update; + +import javax.inject.Inject; -import com.datastax.driver.core.PreparedStatement; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.Session; -import com.google.common.base.Preconditions; import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.cassandra.table.CassandraCurrentQuota; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.QuotaRoot; import org.apache.james.mailbox.store.quota.StoreCurrentQuotaManager; -import javax.inject.Inject; +import com.datastax.driver.core.PreparedStatement; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Session; +import com.google.common.base.Preconditions; public class CassandraCurrentQuotaManager implements StoreCurrentQuotaManager { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/quota/CassandraPerUserMaxQuotaManager.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/quota/CassandraPerUserMaxQuotaManager.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/quota/CassandraPerUserMaxQuotaManager.java index 347227e..c5b5e7f 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/quota/CassandraPerUserMaxQuotaManager.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/quota/CassandraPerUserMaxQuotaManager.java @@ -24,10 +24,8 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; import static com.datastax.driver.core.querybuilder.QueryBuilder.insertInto; import static com.datastax.driver.core.querybuilder.QueryBuilder.select; -import com.datastax.driver.core.PreparedStatement; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.Session; -import com.datastax.driver.core.Statement; +import javax.inject.Inject; + import org.apache.james.mailbox.cassandra.table.CassandraDefaultMaxQuota; import org.apache.james.mailbox.cassandra.table.CassandraMaxQuota; import org.apache.james.mailbox.exception.MailboxException; @@ -35,7 +33,10 @@ import org.apache.james.mailbox.model.Quota; import org.apache.james.mailbox.model.QuotaRoot; import org.apache.james.mailbox.quota.MaxQuotaManager; -import javax.inject.Inject; +import com.datastax.driver.core.PreparedStatement; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.Statement; public class CassandraPerUserMaxQuotaManager implements MaxQuotaManager { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/AttachmentLoaderTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/AttachmentLoaderTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/AttachmentLoaderTest.java index f667729..d4b073d 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/AttachmentLoaderTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/AttachmentLoaderTest.java @@ -21,6 +21,7 @@ package org.apache.james.mailbox.cassandra.mail; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; + import java.util.Collection; import java.util.Map; import java.util.Optional; @@ -31,13 +32,13 @@ import org.apache.james.mailbox.model.Attachment; import org.apache.james.mailbox.model.AttachmentId; import org.apache.james.mailbox.model.Cid; import org.apache.james.mailbox.model.MessageAttachment; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import org.assertj.core.data.MapEntry; import org.junit.Before; import org.junit.Test; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; + public class AttachmentLoaderTest { private CassandraAttachmentMapper attachmentMapper; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAOTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAOTest.java index 05c461c..dc37b7f 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAOTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAOTest.java @@ -18,7 +18,6 @@ ****************************************************************/ package org.apache.james.mailbox.cassandra.mail; - import static org.assertj.core.api.Assertions.assertThat; import java.util.Optional; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/LimitTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/LimitTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/LimitTest.java index 0cd8d9b..81536f1 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/LimitTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/LimitTest.java @@ -19,20 +19,19 @@ package org.apache.james.mailbox.cassandra.mail.utils; -import com.github.steveash.guavate.Guavate; -import com.google.common.collect.ImmutableList; -import nl.jqno.equalsverifier.EqualsVerifier; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.List; +import java.util.Optional; -import org.apache.james.mailbox.cassandra.mail.utils.Limit; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import com.github.steveash.guavate.Guavate; +import com.google.common.collect.ImmutableList; -import java.util.List; -import java.util.Optional; - -import static org.assertj.core.api.Assertions.assertThat; +import nl.jqno.equalsverifier.EqualsVerifier; public class LimitTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MessageUpdateJson.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MessageUpdateJson.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MessageUpdateJson.java index bd1cc9a..d0b7faf 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MessageUpdateJson.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MessageUpdateJson.java @@ -3,6 +3,7 @@ package org.apache.james.mailbox.elasticsearch.json; import javax.mail.Flags; + import com.fasterxml.jackson.annotation.JsonProperty; public class MessageUpdateJson { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormater.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormater.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormater.java index 421c631..830086f 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormater.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormater.java @@ -19,16 +19,16 @@ package org.apache.james.mailbox.elasticsearch.query; -import org.apache.james.mailbox.model.SearchQuery; - import java.time.Instant; import java.time.ZoneId; import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.time.temporal.TemporalUnit; -import java.time.format.DateTimeFormatter; import java.util.Date; +import org.apache.james.mailbox.model.SearchQuery; + public class DateResolutionFormater { public static DateTimeFormatter DATE_TIME_FOMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssZ"); http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java index e4d8c76..cab7a53 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java @@ -26,8 +26,8 @@ import java.util.stream.Stream; import javax.inject.Inject; import javax.inject.Named; -import org.apache.james.backends.es.ElasticSearchConstants; import org.apache.james.backends.es.AliasName; +import org.apache.james.backends.es.ElasticSearchConstants; import org.apache.james.backends.es.TypeName; import org.apache.james.backends.es.search.ScrollIterable; import org.apache.james.mailbox.MessageUid; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/FieldImpl.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/FieldImpl.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/FieldImpl.java index 59dfcd6..211e481 100644 --- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/FieldImpl.java +++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/FieldImpl.java @@ -19,11 +19,11 @@ package org.apache.james.mailbox.elasticsearch.json; +import java.util.Objects; + import org.apache.james.mime4j.stream.Field; import org.apache.james.mime4j.util.ByteSequence; -import java.util.Objects; - public class FieldImpl implements Field { private final String name; private final String body; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormaterTest.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormaterTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormaterTest.java index 07cbe4f..3366161 100644 --- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormaterTest.java +++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/query/DateResolutionFormaterTest.java @@ -19,15 +19,15 @@ package org.apache.james.mailbox.elasticsearch.query; -import static org.assertj.core.api.Assertions.assertThat; import static java.time.format.DateTimeFormatter.ISO_OFFSET_DATE_TIME; - -import org.apache.james.mailbox.model.SearchQuery; -import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; import java.text.ParseException; import java.time.ZonedDateTime; +import org.apache.james.mailbox.model.SearchQuery; +import org.junit.Test; + public class DateResolutionFormaterTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/FlagConvertor.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/FlagConvertor.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/FlagConvertor.java index 0e6611b..5165c4a 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/FlagConvertor.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/FlagConvertor.java @@ -20,6 +20,7 @@ package org.apache.james.mailbox.hbase; import javax.mail.Flags; import javax.mail.Flags.Flag; + import org.apache.hadoop.hbase.util.Bytes; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/io/ChunkInputStream.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/io/ChunkInputStream.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/io/ChunkInputStream.java index 53ffcf6..900757a 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/io/ChunkInputStream.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/io/ChunkInputStream.java @@ -20,11 +20,12 @@ package org.apache.james.mailbox.hbase.io; import java.io.IOException; import java.io.InputStream; -import org.apache.hadoop.hbase.client.HTable; -import org.apache.hadoop.hbase.util.Bytes; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Result; +import org.apache.hadoop.hbase.util.Bytes; /** * Return an InputStream which retrieve columns from a row which stores chunk of http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/io/ChunkOutputStream.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/io/ChunkOutputStream.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/io/ChunkOutputStream.java index 7755798..f236dab 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/io/ChunkOutputStream.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/io/ChunkOutputStream.java @@ -20,6 +20,7 @@ package org.apache.james.mailbox.hbase.io; import java.io.IOException; import java.io.OutputStream; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java index 67f1e2c..1da15b6 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java @@ -38,6 +38,7 @@ import static org.apache.james.mailbox.hbase.HBaseUtils.messageMetaFromResult; import static org.apache.james.mailbox.hbase.HBaseUtils.messageRowKey; import static org.apache.james.mailbox.hbase.HBaseUtils.metadataToPut; import static org.apache.james.mailbox.hbase.HBaseUtils.minMessageRowKey; + import java.io.BufferedInputStream; import java.io.IOException; import java.util.ArrayList; @@ -47,8 +48,22 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Optional; + import javax.mail.Flags; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.client.Delete; +import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.client.Put; +import org.apache.hadoop.hbase.client.Result; +import org.apache.hadoop.hbase.client.ResultScanner; +import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; +import org.apache.hadoop.hbase.filter.PrefixFilter; +import org.apache.hadoop.hbase.filter.SingleColumnValueExcludeFilter; +import org.apache.hadoop.hbase.filter.SingleColumnValueFilter; +import org.apache.hadoop.hbase.util.Bytes; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; @@ -70,19 +85,6 @@ import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.apache.james.mailbox.store.mail.utils.ApplicableFlagCalculator; import org.apache.james.mailbox.store.transaction.NonTransactionalMapper; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.client.Delete; -import org.apache.hadoop.hbase.client.Get; -import org.apache.hadoop.hbase.client.HTable; -import org.apache.hadoop.hbase.client.Put; -import org.apache.hadoop.hbase.client.Result; -import org.apache.hadoop.hbase.client.ResultScanner; -import org.apache.hadoop.hbase.client.Scan; -import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; -import org.apache.hadoop.hbase.filter.PrefixFilter; -import org.apache.hadoop.hbase.filter.SingleColumnValueExcludeFilter; -import org.apache.hadoop.hbase.filter.SingleColumnValueFilter; -import org.apache.hadoop.hbase.util.Bytes; import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseUidProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseUidProvider.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseUidProvider.java index 67da3b0..ab37b28 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseUidProvider.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseUidProvider.java @@ -21,9 +21,15 @@ package org.apache.james.mailbox.hbase.mail; import static org.apache.james.mailbox.hbase.HBaseNames.MAILBOXES_TABLE; import static org.apache.james.mailbox.hbase.HBaseNames.MAILBOX_CF; import static org.apache.james.mailbox.hbase.HBaseNames.MAILBOX_LASTUID; + import java.io.IOException; import java.util.Optional; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.client.Result; +import org.apache.hadoop.hbase.util.Bytes; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; @@ -31,11 +37,6 @@ import org.apache.james.mailbox.hbase.HBaseId; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.store.mail.UidProvider; import org.apache.james.mailbox.store.mail.model.Mailbox; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.client.Get; -import org.apache.hadoop.hbase.client.HTable; -import org.apache.hadoop.hbase.client.Result; -import org.apache.hadoop.hbase.util.Bytes; /** * Message UidProvider for HBase. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseMailboxIdDeserializerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseMailboxIdDeserializerTest.java b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseMailboxIdDeserializerTest.java index 38ae526..9dbe5aa 100644 --- a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseMailboxIdDeserializerTest.java +++ b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseMailboxIdDeserializerTest.java @@ -21,12 +21,12 @@ package org.apache.james.mailbox.hbase; import static org.assertj.core.api.Assertions.assertThat; +import java.util.UUID; + import org.apache.james.mailbox.store.mail.model.MailboxIdDeserialisationException; import org.junit.Before; import org.junit.Test; -import java.util.UUID; - public class HBaseMailboxIdDeserializerTest { private static final String UUID_STRING = "5530370f-44c6-4647-990e-7768ce5131d4"; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseUidAndModSeqProviderTest.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseUidAndModSeqProviderTest.java b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseUidAndModSeqProviderTest.java index 3ff0103..09d371e 100644 --- a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseUidAndModSeqProviderTest.java +++ b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseUidAndModSeqProviderTest.java @@ -30,17 +30,18 @@ import static org.apache.james.mailbox.hbase.HBaseNames.SUBSCRIPTIONS; import static org.apache.james.mailbox.hbase.HBaseNames.SUBSCRIPTIONS_TABLE; import static org.apache.james.mailbox.hbase.HBaseNames.SUBSCRIPTION_CF; import static org.junit.Assert.assertEquals; + import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Optional; +import org.apache.hadoop.conf.Configuration; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.hbase.HBaseClusterSingleton; import org.apache.james.mailbox.hbase.mail.model.HBaseMailbox; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.hadoop.conf.Configuration; import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java index b30d795..b7807b1 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java @@ -19,7 +19,6 @@ package org.apache.james.mailbox.jcr.user.model; - import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerStressTest.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerStressTest.java b/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerStressTest.java index 1ad8662..eb9877b 100644 --- a/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerStressTest.java +++ b/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerStressTest.java @@ -20,14 +20,15 @@ package org.apache.james.mailbox.jcr; import static org.apache.james.mailbox.jcr.JCRMailboxManagerProvider.JACKRABBIT_HOME; + import java.io.File; import java.io.IOException; import java.util.Optional; -import org.apache.james.mailbox.MailboxManager; -import org.apache.james.mailbox.MailboxManagerStressTest; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.core.RepositoryImpl; +import org.apache.james.mailbox.MailboxManager; +import org.apache.james.mailbox.MailboxManagerStressTest; import org.junit.After; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java b/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java index 01c63ea..067afbd 100644 --- a/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java +++ b/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java @@ -19,14 +19,15 @@ package org.apache.james.mailbox.jcr; import static org.apache.james.mailbox.jcr.JCRMailboxManagerProvider.JACKRABBIT_HOME; + import java.io.File; import java.io.IOException; import java.util.Optional; -import org.apache.james.mailbox.MailboxManager; -import org.apache.james.mailbox.MailboxManagerTest; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.core.RepositoryImpl; +import org.apache.james.mailbox.MailboxManager; +import org.apache.james.mailbox.MailboxManagerTest; import org.junit.After; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailboxAnnotationId.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailboxAnnotationId.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailboxAnnotationId.java index 74ce438..6bbdbd2 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailboxAnnotationId.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailboxAnnotationId.java @@ -19,10 +19,10 @@ package org.apache.james.mailbox.jpa.mail.model; -import com.google.common.base.Objects; - import javax.persistence.Embeddable; +import com.google.common.base.Objects; + @Embeddable public final class JPAMailboxAnnotationId { private long mailboxId; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java index 5f7421d..fcfde56 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java @@ -19,7 +19,6 @@ package org.apache.james.mailbox.jpa.openjpa; - import javax.inject.Inject; import org.apache.james.mailbox.MailboxSession; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java ---------------------------------------------------------------------- diff --git a/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java b/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java index 4d7cf99..4c8bf83 100644 --- a/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java +++ b/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java @@ -19,18 +19,6 @@ package org.apache.james.mailbox.kafka; -import kafka.consumer.ConsumerConfig; -import kafka.consumer.KafkaStream; -import kafka.javaapi.consumer.ConsumerConnector; -import kafka.message.MessageAndMetadata; -import org.apache.james.mailbox.store.publisher.MessageConsumer; -import org.apache.james.mailbox.store.publisher.MessageReceiver; -import org.apache.james.mailbox.store.publisher.Topic; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -38,6 +26,20 @@ import java.util.Properties; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; + +import org.apache.james.mailbox.store.publisher.MessageConsumer; +import org.apache.james.mailbox.store.publisher.MessageReceiver; +import org.apache.james.mailbox.store.publisher.Topic; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import kafka.consumer.ConsumerConfig; +import kafka.consumer.KafkaStream; +import kafka.javaapi.consumer.ConsumerConnector; +import kafka.message.MessageAndMetadata; + public class KafkaMessageConsumer implements MessageConsumer { private class Consumer implements Runnable { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaPublisher.java ---------------------------------------------------------------------- diff --git a/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaPublisher.java b/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaPublisher.java index 3ebcda0..4363e12 100644 --- a/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaPublisher.java +++ b/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaPublisher.java @@ -19,17 +19,19 @@ package org.apache.james.mailbox.kafka; -import kafka.javaapi.producer.Producer; -import kafka.producer.KeyedMessage; -import kafka.producer.ProducerConfig; +import java.util.Properties; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; + import org.apache.james.mailbox.store.publisher.Publisher; import org.apache.james.mailbox.store.publisher.Topic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import java.util.Properties; +import kafka.javaapi.producer.Producer; +import kafka.producer.KeyedMessage; +import kafka.producer.ProducerConfig; public class KafkaPublisher implements Publisher { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LenientImapSearchAnalyzer.java ---------------------------------------------------------------------- diff --git a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LenientImapSearchAnalyzer.java b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LenientImapSearchAnalyzer.java index 519ed95..51ec70c 100644 --- a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LenientImapSearchAnalyzer.java +++ b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LenientImapSearchAnalyzer.java @@ -20,7 +20,6 @@ package org.apache.james.mailbox.lucene.search; import java.io.Reader; - import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.WhitespaceTokenizer; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/JsoupTextExtractor.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/JsoupTextExtractor.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/JsoupTextExtractor.java index 13253e0..1860cd5 100644 --- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/JsoupTextExtractor.java +++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/JsoupTextExtractor.java @@ -27,7 +27,6 @@ import java.util.Map; import org.apache.commons.io.IOUtils; import org.apache.james.mailbox.extractor.ParsedContent; import org.apache.james.mailbox.extractor.TextExtractor; - import org.jsoup.Jsoup; import org.jsoup.nodes.Document; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/main/java/org/apache/james/mailbox/store/BatchSizes.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/BatchSizes.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/BatchSizes.java index ec07b52..1d6efde 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/BatchSizes.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/BatchSizes.java @@ -18,7 +18,6 @@ ****************************************************************/ package org.apache.james.mailbox.store; - import java.util.Optional; import com.google.common.base.MoreObjects; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/main/java/org/apache/james/mailbox/store/LazyMimeDescriptor.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/LazyMimeDescriptor.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/LazyMimeDescriptor.java index c77c8a9..6305c9b 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/LazyMimeDescriptor.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/LazyMimeDescriptor.java @@ -28,8 +28,8 @@ import java.util.Map; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MessageResult; -import org.apache.james.mailbox.model.MimeDescriptor; import org.apache.james.mailbox.model.MessageResult.Header; +import org.apache.james.mailbox.model.MimeDescriptor; import org.apache.james.mailbox.store.mail.model.Message; import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListener.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListener.java index b4faef1..820ad3d 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListener.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListener.java @@ -19,14 +19,15 @@ package org.apache.james.mailbox.store.event; +import java.util.Collection; + +import javax.inject.Inject; + import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxPath; -import javax.inject.Inject; -import java.util.Collection; - /** * Receive a {@link org.apache.james.mailbox.MailboxListener.Event} and delegate it to an other * {@link MailboxListener} depending on the registered name http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java index a7af41f..89acfb7 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java @@ -18,6 +18,8 @@ ****************************************************************/ package org.apache.james.mailbox.store.event; +import java.util.List; + import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxAnnotation; @@ -27,8 +29,6 @@ import org.apache.james.mailbox.store.mail.AnnotationMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.List; - public class MailboxAnnotationListener implements MailboxListener { private static final Logger logger = LoggerFactory.getLogger(MailboxAnnotationListener.class); private MailboxSessionMapperFactory mailboxSessionMapperFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/DistantMailboxPathRegisterMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/DistantMailboxPathRegisterMapper.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/DistantMailboxPathRegisterMapper.java index 8c5f645..c672b50 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/DistantMailboxPathRegisterMapper.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/DistantMailboxPathRegisterMapper.java @@ -19,11 +19,11 @@ package org.apache.james.mailbox.store.event.distributed; +import java.util.Set; + import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.store.publisher.Topic; -import java.util.Set; - public interface DistantMailboxPathRegisterMapper { Set<Topic> getTopics(MailboxPath mailboxPath); http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/MailboxPathRegister.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/MailboxPathRegister.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/MailboxPathRegister.java index a27c908..49a7627 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/MailboxPathRegister.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/MailboxPathRegister.java @@ -19,12 +19,12 @@ package org.apache.james.mailbox.store.event.distributed; +import java.util.Set; + import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.store.publisher.Topic; -import java.util.Set; - /** * The TopicDispatcher allow you to : * 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/EventDataTransferObject.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/EventDataTransferObject.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/EventDataTransferObject.java index ac2ba0c..e007f9d 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/EventDataTransferObject.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/EventDataTransferObject.java @@ -19,13 +19,14 @@ package org.apache.james.mailbox.store.json.event.dto; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; import java.util.Map; import org.apache.james.mailbox.MessageUid; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; + public class EventDataTransferObject { public static class Builder { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
