JAMES-2277 fix missing whitespaces
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fe712f1a Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fe712f1a Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fe712f1a Branch: refs/heads/master Commit: fe712f1a3bb698135485590427f643da25680e4e Parents: a65ec2c Author: Matthieu Baechler <[email protected]> Authored: Tue Dec 26 16:30:35 2017 +0100 Committer: Raphael Ouazana <[email protected]> Committed: Wed Jan 10 10:45:39 2018 +0100 ---------------------------------------------------------------------- .../cassandra/utils/CassandraAsyncExecutor.java | 2 +- .../backends/cassandra/CassandraCluster.java | 2 +- .../cassandra/CassandraWaitStrategy.java | 2 +- .../backends/cassandra/DockerCassandraRule.java | 2 +- .../james/backends/es/IndexCreationFactory.java | 2 +- .../es/ClientProviderImplConnectionTest.java | 2 +- .../backends/es/ElasticSearchIndexerTest.java | 12 +- .../backends/es/IndexCreationFactoryTest.java | 2 +- .../backends/es/search/ScrollIterableTest.java | 2 +- .../james/backends/jpa/JpaTestCluster.java | 2 +- .../mailbox/exception/OverQuotaException.java | 2 +- .../mailbox/exception/ReadOnlyException.java | 2 +- .../exception/UnsupportedRightException.java | 2 +- .../org/apache/james/mailbox/model/Headers.java | 2 +- .../james/mailbox/model/MessageRange.java | 14 +- .../james/mailbox/model/MimeDescriptor.java | 2 +- .../james/mailbox/model/UpdatedFlags.java | 2 +- .../mailbox/manager/ManagerTestResources.java | 2 +- .../manager/QuotaMessageManagerTest.java | 8 +- .../james/mailbox/mock/MockMailboxManager.java | 10 +- .../james/mailbox/model/MailboxACLTest.java | 2 +- .../mailbox/model/MessageAttachmentTest.java | 4 +- .../model/MultimailboxesSearchQueryTest.java | 2 +- .../james/mailbox/model/Rfc4314RightsTest.java | 2 +- .../mailbox/model/search/MailboxQueryTest.java | 4 +- .../cassandra/mail/AttachmentLoader.java | 2 +- .../cassandra/mail/CassandraACLMapper.java | 6 +- .../cassandra/mail/CassandraBlobsDAO.java | 2 +- .../cassandra/mail/CassandraMailboxMapper.java | 4 +- .../cassandra/CassandraTestSystemFixture.java | 2 +- ...MessageAttachmentRepresentationByIdTest.java | 4 +- .../query/DateResolutionFormater.java | 2 +- .../elasticsearch/query/SortConverter.java | 2 +- .../ElasticSearchIntegrationTest.java | 2 +- .../mailbox/hbase/HBaseClusterSingleton.java | 2 +- .../mailbox/jcr/AbstractJCRScalingMapper.java | 6 +- .../jcr/GlobalMailboxSessionJCRRepository.java | 2 +- .../james/mailbox/jcr/JCRMailboxManager.java | 2 +- .../jcr/JCRMailboxSessionMapperFactory.java | 2 +- .../james/mailbox/jcr/JCRMessageManager.java | 2 +- .../mailbox/jcr/JCRRepositoryAuthenticator.java | 2 +- .../org/apache/james/mailbox/jcr/JCRUtils.java | 2 +- .../mailbox/jcr/mail/JCRMailboxMapper.java | 6 +- .../mailbox/jcr/mail/JCRModSeqProvider.java | 2 +- .../mailbox/jcr/mail/model/JCRMailbox.java | 2 +- .../mailbox/jcr/user/JCRSubscriptionMapper.java | 2 +- .../mailbox/jcr/user/model/JCRSubscription.java | 4 +- .../james/mailbox/jpa/JPAMessageManager.java | 2 +- .../mailbox/jpa/mail/JPAMailboxMapper.java | 4 +- .../mailbox/jpa/mail/model/JPAMailbox.java | 48 +-- .../jpa/mail/model/JPAMailboxAnnotation.java | 6 +- .../mailbox/jpa/mail/model/JPAUserFlag.java | 4 +- .../openjpa/JPAEncryptedMailboxMessage.java | 6 +- .../mail/model/openjpa/JPAMailboxMessage.java | 6 +- .../openjpa/JPAStreamingMailboxMessage.java | 6 +- .../jpa/quota/model/MaxDefaultStorage.java | 6 +- .../jpa/quota/model/MaxUserMessageCount.java | 4 +- .../mailbox/jpa/user/model/JPASubscription.java | 2 +- .../mailbox/jpa/JPASubscriptionManagerTest.java | 2 +- .../mailbox/kafka/KafkaMessageConsumer.java | 4 +- .../search/LenientImapSearchAnalyzer.java | 2 +- .../lucene/search/LuceneMessageSearchIndex.java | 80 ++--- .../james/mailbox/maildir/MaildirFolder.java | 21 +- .../mailbox/maildir/MaildirMessageName.java | 8 +- .../maildir/mail/MaildirMailboxMapper.java | 12 +- .../maildir/mail/MaildirMessageMapper.java | 7 +- .../maildir/MaildirSubscriptionManagerTest.java | 2 +- .../inmemory/mail/InMemoryMailboxMapper.java | 2 +- .../inmemory/mail/InMemoryUidProvider.java | 2 +- .../mail/InMemoryMessageIdMapperTest.java | 2 +- .../store/AbstractMailboxPathLocker.java | 2 +- .../james/mailbox/store/FakeAuthenticator.java | 2 +- .../james/mailbox/store/LazyMimeDescriptor.java | 2 +- .../store/MailboxSessionMapperFactory.java | 8 +- .../james/mailbox/store/MessageResultImpl.java | 2 +- .../james/mailbox/store/MimeDescriptorImpl.java | 4 +- .../mailbox/store/SimpleMessageMetaData.java | 4 +- .../mailbox/store/StoreMessageManager.java | 6 +- .../store/event/SynchronousEventDelivery.java | 2 +- .../distributed/DistantMailboxPathRegister.java | 2 +- .../store/json/event/EventConverter.java | 6 +- .../mailbox/store/json/event/dto/EventType.java | 2 +- .../json/event/dto/FlagsDataTransferObject.java | 14 +- .../dto/MailboxSessionDataTransferObject.java | 4 +- .../dto/MessageMetaDataDataTransferObject.java | 2 +- .../mail/AbstractLockingModSeqProvider.java | 2 +- .../store/mail/AbstractLockingUidProvider.java | 2 +- .../store/mail/AbstractMessageMapper.java | 4 +- .../james/mailbox/store/mail/MessageUtils.java | 2 +- .../store/mail/model/impl/PropertyBuilder.java | 16 +- .../mailbox/store/publisher/Publisher.java | 2 +- .../store/quota/CurrentQuotaCalculator.java | 2 +- .../store/quota/DefaultQuotaRootResolver.java | 2 +- .../quota/ListeningCurrentQuotaUpdater.java | 2 +- .../james/mailbox/store/quota/QuotaImpl.java | 2 +- .../mailbox/store/quota/StoreQuotaManager.java | 4 +- .../store/search/LazyMessageSearchIndex.java | 2 +- .../mailbox/store/search/MessageSearches.java | 2 +- .../james/mailbox/store/search/SearchUtil.java | 8 +- .../store/search/SimpleMessageSearchIndex.java | 6 +- .../comparator/AbstractHeaderComparator.java | 8 +- .../comparator/BaseSubjectComparator.java | 2 +- .../search/comparator/CombinedComparator.java | 2 +- .../comparator/HeaderDisplayComparator.java | 2 +- .../comparator/HeaderMailboxComparator.java | 2 +- .../comparator/InternalDateComparator.java | 2 +- .../search/comparator/ReverseComparator.java | 2 +- .../store/search/comparator/SizeComparator.java | 2 +- .../store/search/comparator/UidComparator.java | 2 +- .../store/streaming/BodyOffsetInputStream.java | 6 +- .../store/streaming/CountingInputStream.java | 2 +- .../store/streaming/FullByteContent.java | 2 +- .../store/streaming/InputStreamContent.java | 4 +- .../streaming/LimitingFileInputStream.java | 2 +- .../store/MailboxMessageResultImplTest.java | 4 +- .../StoreMailboxManagerAnnotationTest.java | 2 +- .../StoreMailboxMessageResultIteratorTest.java | 2 +- .../store/StoreMessageIdManagerTestSystem.java | 2 +- .../event/MailboxAnnotationListenerTest.java | 4 +- .../DistantMailboxPathRegisterTest.java | 2 +- .../model/DelegatingMailboxMessageTest.java | 4 +- .../store/mail/model/MailboxAssertTests.java | 18 +- .../store/mail/model/MailboxMapperTest.java | 26 +- .../store/mail/model/MessageIdMapperTest.java | 10 +- .../store/mail/model/MessageMapperTest.java | 16 +- .../store/mail/model/MessageMoveTest.java | 2 +- .../model/MessageWithAttachmentMapperTest.java | 16 +- .../store/mail/model/MetadataMapAssert.java | 4 +- .../mailbox/store/search/SearchUtilTest.java | 8 +- .../james/mailbox/copier/MailboxCopierImpl.java | 12 +- .../james/mailbox/indexer/ReIndexerImpl.java | 2 +- .../command/IMAP168JpaMigrateCommand.java | 3 +- .../command/IMAP180JpaMigrateCommand.java | 8 +- .../registrations/MailboxRegistrationTest.java | 2 +- .../apache/mailet/base/FlowedMessageUtils.java | 10 +- .../java/org/apache/mailet/base/MailetUtil.java | 10 +- .../org/apache/mailet/base/StringUtils.java | 4 +- .../base/mail/AbstractDataContentHandler.java | 37 +- .../mailet/base/mail/MimeMultipartReport.java | 18 +- .../mail/message_disposition_notification.java | 67 ++-- .../mailet/base/mail/multipart_report.java | 22 +- .../org/apache/mailet/base/StringUtilsTest.java | 2 +- .../mailet/base/test/MimeMessageBuilder.java | 6 +- .../apache/james/transport/KeyStoreHolder.java | 2 +- .../apache/james/transport/SMIMEKeyHolder.java | 4 +- .../james/transport/mailets/AbstractSign.java | 4 +- .../transport/mailets/SMIMECheckSignature.java | 2 +- .../james/transport/mailets/SMIMEDecrypt.java | 2 +- .../matcher/IsX509CertificateSubject.java | 4 +- .../mailets/ICALToJsonAttributeTest.java | 16 +- .../transport/mailets/ContentReplacer.java | 3 +- .../james/transport/mailets/HeadersToHTTP.java | 14 +- .../transport/mailets/PatternExtractor.java | 4 +- .../transport/mailets/RecipientToLowerCase.java | 2 +- .../mailets/RemoveMimeHeaderByPrefix.java | 2 +- .../transport/mailets/SerialiseToHTTP.java | 14 +- .../james/transport/mailets/UnwrapText.java | 3 +- .../matchers/AbstractQuotaMatcher.java | 3 +- .../matchers/AttachmentFileNameIs.java | 2 +- .../matchers/CompareNumericHeaderValue.java | 30 +- .../transport/matchers/FileRegexMatcher.java | 13 +- .../transport/matchers/HasMailAttribute.java | 13 +- .../matchers/HasMailAttributeWithValue.java | 21 +- .../HasMailAttributeWithValueRegex.java | 15 +- .../james/transport/matchers/NESSpamCheck.java | 114 +++---- .../transport/matchers/RecipientIsRegex.java | 2 +- .../james/transport/matchers/SenderIsRegex.java | 2 +- .../transport/mailets/StripAttachmentTest.java | 2 +- .../HasMailAttributeWithValueRegexTest.java | 2 +- .../transport/matchers/HostIsLocalTest.java | 4 +- .../transport/matchers/RelayLimitTest.java | 1 + .../matchers/SMTPAuthSuccessfulTest.java | 4 +- .../transport/matchers/SentByMailetTest.java | 4 +- .../matchers/TooManyRecipientsTest.java | 2 +- .../apache/james/mdn/fields/ExtensionField.java | 2 +- .../james/mpt/ant/MailProtocolTestTask.java | 4 +- .../apache/james/mpt/ant/TestRunScripts.java | 6 +- .../james/mpt/host/ExternalHostSystem.java | 3 +- .../protocol/FileProtocolSessionBuilder.java | 36 +- .../james/mpt/protocol/ProtocolSession.java | 17 +- .../mpt/protocol/ProtocolSessionBuilder.java | 2 +- .../GenericSimpleScriptedTestProtocol.java | 6 +- .../james/mpt/session/ExternalSession.java | 12 +- .../org/apache/james/mpt/DiscardProtocol.java | 8 +- .../apache/james/mpt/api/ImapFeaturesTest.java | 8 +- .../mpt/imapmailbox/suite/ACLIntegration.java | 12 +- .../suite/ListingWithSharingTest.java | 4 +- .../mpt/imapmailbox/jcr/host/JCRHostSystem.java | 4 +- .../james/mpt/maven/MailProtocolTest.java | 2 +- .../james/mpt/maven/MailProtocolTestMojo.java | 2 +- .../api/AbstractProtocolTransport.java | 6 +- .../james/protocols/api/AbstractResponse.java | 2 +- .../apache/james/protocols/api/BaseRequest.java | 2 +- .../protocols/api/CombinedInputStream.java | 2 +- .../james/protocols/api/ProtocolImpl.java | 2 +- .../james/protocols/api/StreamResponse.java | 2 +- .../protocols/api/future/FutureResponse.java | 2 +- .../api/future/FutureResponseImpl.java | 2 +- .../api/future/FutureStartTlsResponse.java | 2 +- .../api/future/FutureStreamResponseImpl.java | 2 +- .../handler/AbstractProtocolHandlerChain.java | 2 +- .../api/handler/CommandDispatcher.java | 4 +- .../protocols/api/handler/CommandHandler.java | 2 +- .../protocols/api/handler/ConnectHandler.java | 2 +- .../api/handler/DisconnectHandler.java | 2 +- .../protocols/api/handler/LineHandler.java | 2 +- .../protocols/api/handler/MultiLineHandler.java | 2 +- .../handler/ProtocolHandlerResultHandler.java | 2 +- .../api/handler/UnknownCommandHandler.java | 4 +- .../james/protocols/api/utils/TestUtils.java | 2 +- .../james/imap/api/display/CharsetUtil.java | 2 +- .../apache/james/imap/api/message/IdRange.java | 2 +- .../imap/api/message/request/DayMonthYear.java | 2 +- .../parser/AbstractSelectionCommandParser.java | 2 +- .../decode/parser/SetQuotaCommandParser.java | 4 +- .../imap/encode/CapabilityResponseEncoder.java | 4 +- .../james/imap/encode/QuotaResponseEncoder.java | 4 +- .../encode/base/ImapResponseComposerImpl.java | 4 +- .../imap/message/request/EnableRequest.java | 2 +- .../message/request/IRAuthenticateRequest.java | 2 +- .../imap/message/response/ESearchResponse.java | 2 +- .../imap/message/response/EnableResponse.java | 2 +- .../message/response/QuotaRootResponse.java | 2 +- .../imap/message/response/VanishedResponse.java | 2 +- .../imap/processor/AbstractAuthProcessor.java | 2 +- .../processor/AbstractMailboxProcessor.java | 8 +- .../processor/AbstractSelectionProcessor.java | 6 +- .../imap/processor/AuthenticateProcessor.java | 2 +- .../imap/processor/DeleteACLProcessor.java | 8 +- .../james/imap/processor/EnableProcessor.java | 2 +- .../james/imap/processor/GetACLProcessor.java | 8 +- .../james/imap/processor/GetQuotaProcessor.java | 8 +- .../imap/processor/GetQuotaRootProcessor.java | 2 +- .../james/imap/processor/ListProcessor.java | 3 +- .../imap/processor/ListRightsProcessor.java | 8 +- .../james/imap/processor/LoginProcessor.java | 2 +- .../PermitEnableCapabilityProcessor.java | 2 +- .../james/imap/processor/SearchProcessor.java | 4 +- .../james/imap/processor/SetACLProcessor.java | 8 +- .../james/imap/processor/StoreProcessor.java | 6 +- .../processor/base/SelectedMailboxImpl.java | 2 +- .../imap/processor/fetch/EmptyContent.java | 2 +- .../processor/fetch/HeadersBodyElement.java | 2 +- .../james/protocols/imap/IMAPRequest.java | 2 +- .../protocols/imap/IMAPRequestLineReader.java | 2 +- .../james/protocols/imap/IMAPSession.java | 2 +- .../imap/core/IMAPCommandDispatcher.java | 2 +- .../protocols/imap/utils/DecoderUtils.java | 2 +- .../parser/SearchCommandParserNotTest.java | 2 +- .../FetchResponseEncoderNoExtensionsTest.java | 2 +- .../imap/encode/QuotaResponseEncoderTest.java | 2 +- .../imap/processor/NamespaceProcessorTest.java | 2 +- .../imap/processor/SearchProcessorTest.java | 2 +- .../processor/base/SelectedMailboxImplTest.java | 2 +- .../james/protocols/lmtp/LMTPConfiguration.java | 2 +- .../protocols/lmtp/LMTPConfigurationImpl.java | 2 +- .../lmtp/LMTPProtocolHandlerChain.java | 2 +- .../lmtp/core/DataLineMessageHookHandler.java | 2 +- .../protocols/lmtp/AbstractLMTPSServerTest.java | 4 +- .../protocols/lmtp/AbstractLMTPServerTest.java | 22 +- .../lmtp/netty/NettyLMTPSServerTest.java | 2 +- .../james/managesieve/core/CoreProcessor.java | 4 +- .../managesieve/transcode/ArgumentParser.java | 2 +- .../transcode/ManageSieveProcessor.java | 4 +- .../protocols/netty/AbstractAsyncServer.java | 2 +- .../netty/AbstractChannelPipelineFactory.java | 2 +- .../AbstractSSLAwareChannelPipelineFactory.java | 2 +- .../protocols/netty/ChannelGroupHandler.java | 2 +- .../netty/ConnectionLimitUpstreamHandler.java | 2 +- .../ConnectionPerIpLimitUpstreamHandler.java | 2 +- .../protocols/netty/NettyProtocolTransport.java | 2 +- .../james/protocols/netty/TimeoutHandler.java | 2 +- .../james/protocols/pop3/POP3Protocol.java | 2 +- .../pop3/POP3ProtocolHandlerChain.java | 2 +- .../james/protocols/pop3/POP3Response.java | 2 +- .../protocols/pop3/POP3StartTlsResponse.java | 2 +- .../pop3/core/AbstractApopCmdHandler.java | 2 +- .../pop3/core/MessageMetaDataUtils.java | 2 +- .../protocols/pop3/mailbox/ImapMailbox.java | 2 +- .../protocols/pop3/mailbox/MessageMetaData.java | 6 +- .../pop3/core/AbstractInputStreamTest.java | 2 +- .../pop3/netty/NettyPOP3ServerTest.java | 2 +- .../pop3/netty/NettyStartTlsPOP3ServerTest.java | 2 +- .../pop3/utils/TestPassCmdHandler.java | 2 +- .../protocols/smtp/MailAddressException.java | 2 +- .../james/protocols/smtp/MailEnvelopeImpl.java | 2 +- .../james/protocols/smtp/SMTPConfiguration.java | 2 +- .../protocols/smtp/SMTPConfigurationImpl.java | 2 +- .../james/protocols/smtp/SMTPSession.java | 2 +- .../protocols/smtp/SMTPStartTlsResponse.java | 2 +- .../smtp/core/AbstractAddHeadersFilter.java | 4 +- .../smtp/core/AbstractHookableCmdHandler.java | 2 +- ...tSenderAuthIdentifyVerificationRcptHook.java | 3 +- .../protocols/smtp/core/DataCmdHandler.java | 6 +- .../protocols/smtp/core/DataLineFilter.java | 2 +- .../smtp/core/DataLineMessageHookHandler.java | 8 +- .../protocols/smtp/core/ExpnCmdHandler.java | 2 +- .../protocols/smtp/core/HelpCmdHandler.java | 6 +- .../protocols/smtp/core/NoopCmdHandler.java | 2 +- .../smtp/core/ReceivedDataLineFilter.java | 2 +- .../protocols/smtp/core/RsetCmdHandler.java | 4 +- .../smtp/core/SeparatingDataLineFilter.java | 2 +- .../protocols/smtp/core/UnknownCmdHandler.java | 2 +- .../protocols/smtp/core/VrfyCmdHandler.java | 2 +- .../smtp/core/esmtp/AuthCmdHandler.java | 12 +- .../smtp/core/esmtp/EhloCmdHandler.java | 2 +- .../smtp/core/esmtp/MailSizeEsmtpExtension.java | 2 +- .../smtp/core/esmtp/StartTlsCmdHandler.java | 6 +- .../core/fastfail/AbstractGreylistHandler.java | 1 + .../core/fastfail/AbstractValidRcptHandler.java | 2 +- .../core/fastfail/MaxUnknownCmdHandler.java | 2 +- .../fastfail/ResolvableEhloHeloHandler.java | 6 +- .../smtp/core/fastfail/SpamTrapHandler.java | 6 +- .../fastfail/SupressDuplicateRcptHandler.java | 2 +- .../core/fastfail/ValidSenderDomainHandler.java | 2 +- .../smtp/core/log/HookResultLogger.java | 2 +- .../james/protocols/smtp/hook/AuthHook.java | 2 +- .../james/protocols/smtp/hook/HeloHook.java | 2 +- .../protocols/smtp/hook/HookResultHook.java | 2 +- .../james/protocols/smtp/hook/MailHook.java | 2 +- .../protocols/smtp/hook/MailParametersHook.java | 2 +- .../james/protocols/smtp/hook/MessageHook.java | 2 +- .../james/protocols/smtp/hook/QuitHook.java | 2 +- .../james/protocols/smtp/hook/RcptHook.java | 2 +- .../james/protocols/smtp/hook/UnknownHook.java | 2 +- .../protocols/smtp/AbstractSMTPSServerTest.java | 2 +- .../protocols/smtp/AbstractSMTPServerTest.java | 150 ++++---- .../smtp/core/fastfail/DNSRBLHandlerTest.java | 2 +- .../core/fastfail/MaxUnknownCmdHandlerTest.java | 5 +- .../smtp/core/fastfail/SpamTrapHandlerTest.java | 2 +- .../smtp/netty/NettySMTPSServerTest.java | 2 +- .../smtp/netty/NettySMTPServerTest.java | 2 +- .../smtp/netty/NettyStartTlsSMTPServerTest.java | 2 +- .../james/cli/exceptions/JamesCliException.java | 2 +- .../java/org/apache/james/cli/type/CmdType.java | 2 +- .../apache/james/cli/utils/ValueWithUnit.java | 16 +- .../org/apache/james/cli/ServerCmdTest.java | 2 +- .../core/MimeMessageInputStreamSourceTest.java | 4 +- .../server/core/filesystem/SimpleUrlTest.java | 4 +- .../org/apache/james/GuiceModuleTestRule.java | 1 + .../modules/TestESMetricReporterModule.java | 2 +- .../james/modules/TestElasticSearchModule.java | 2 +- .../apache/james/modules/TestTikaModule.java | 2 +- .../apache/james/modules/server/JMXServer.java | 2 +- .../james/modules/mailbox/JPAMailboxModule.java | 2 +- .../james/TestJPAConfigurationModule.java | 2 +- .../james/TestJPAConfigurationModule.java | 2 +- .../server/MemoryMailQueueFactoryTest.java | 8 +- .../java/org/apache/james/jmap/JMAPModule.java | 2 +- .../james/modules/TestJMAPServerModule.java | 23 +- .../ProtocolHandlerLoaderBeanFactory.java | 2 +- .../filesystem/ResourceLoaderFileSystem.java | 2 +- .../lifecycle/ConfigurationProviderImpl.java | 6 +- ...AbstractOSGIAnnotationBeanPostProcessor.java | 10 +- .../osgi/OSGIConfigurationProvider.java | 2 +- ...sistenceUnitAnnotationBeanPostProcessor.java | 2 +- ...OSGIResourceAnnotationBeanPostProcessor.java | 5 +- .../mailbox/MaxQuotaConfigurationReader.java | 2 +- .../spring/osgi/AbstractBundleTracker.java | 2 +- .../spring/osgi/DomainListTracker.java | 2 +- .../osgi/RecipientRewriteTableTracker.java | 2 +- .../spring/osgi/UsersRepositoryTracker.java | 2 +- .../james/util/date/ImapDateTimeFormatter.java | 4 +- .../util/mime/MessageContentExtractor.java | 4 +- .../util/bayesian/JDBCBayesianAnalyzer.java | 4 +- .../util/retry/naming/RetryingContext.java | 2 +- .../retry/naming/ldap/RetryingLdapContext.java | 12 +- .../concurrency/ConcurrentTestRunnerTest.java | 2 +- .../cassandra/CassandraSieveRepository.java | 2 +- .../cassandra/CassandraUsersRepository.java | 4 +- .../file/SieveFileRepository.java | 2 +- .../user/jdbc/JamesUsersJdbcRepository.java | 5 +- .../james/jmap/api/access/AccessTokenTest.java | 2 +- .../james/rrt/jpa/JPARecipientRewriteTable.java | 2 +- .../james/user/jpa/JPAUsersRepository.java | 2 +- .../domainlist/lib/AbstractDomainList.java | 2 +- .../domainlist/lib/DomainListManagement.java | 15 +- .../apache/james/rrt/lib/MappingImplTest.java | 12 +- .../apache/james/rrt/lib/MappingsImplTest.java | 10 +- .../user/lib/AbstractUsersRepositoryTest.java | 2 +- .../dnsservice/api/InMemoryDNSService.java | 4 +- .../james/karaf/features/Mime4jTestLive.java | 2 +- .../mailets/TemporaryFilesystemModule.java | 2 +- .../transport/mailets/GroupMappingTest.java | 10 +- .../mailets/ICSAttachmentWorkflowTest.java | 46 +-- .../mailets/RecipientRewriteTableProcessor.java | 2 +- .../apache/james/transport/mailets/Sieve.java | 2 +- .../mailets/jsieve/FileIntoAction.java | 3 +- .../mailets/jsieve/SieveMailAdapter.java | 6 +- .../mailets/managesieve/ManageSieveMailet.java | 3 +- .../EnhancedMessagingException.java | 2 +- .../mailets/remoteDelivery/MailDelivrer.java | 2 +- .../remoteDelivery/MailDelivrerToHost.java | 2 +- .../mailets/remoteDelivery/MessageComposer.java | 2 +- .../RemoteDeliveryConfiguration.java | 2 +- .../matchers/AbstractStorageQuota.java | 9 +- .../mailets/delivery/MailDispatcherTest.java | 2 +- .../managesieve/ManageSieveMailetTestCase.java | 2 +- .../mailets/redirect/AddressExtractorTest.java | 16 +- .../redirect/NotifyMailetsMessageTest.java | 2 +- .../remoteDelivery/RemoteDeliveryTest.java | 14 +- .../transport/matchers/IsOverQuotaTest.java | 8 +- .../transport/util/RecipientsUtilsTest.java | 2 +- .../james/transport/util/SizeUtilsTest.java | 10 +- .../util/SpecialAddressesUtilsTest.java | 4 +- .../james/transport/util/TosUtilsTest.java | 2 +- .../apache/james/fetchmail/FolderProcessor.java | 7 +- .../cucumber/CassandraDownloadCucumberTest.java | 4 +- .../CassandraGetMessagesMethodTest.java | 4 +- ...assandraIMAPKeywordsInconsistenciesTest.java | 4 +- ...ssandraIMAPSetMessagesCompatibilityTest.java | 4 +- ...CassandraSetMailboxesMethodCucumberTest.java | 4 +- .../CassandraSetMessagesMethodCucumberTest.java | 4 +- .../cucumber/CassandraSharingTest.java | 4 +- .../cucumber/CassandraUploadCucumberTest.java | 4 +- .../james/jmap/VacationIntegrationTest.java | 4 +- .../integration/GetMailboxesMethodTest.java | 6 +- .../integration/SetMailboxesMethodTest.java | 2 +- .../integration/SetMessagesMethodTest.java | 338 +++++++++---------- .../integration/cucumber/MainStepdefs.java | 2 +- .../cucumber/SetMailboxesMethodStepdefs.java | 2 +- .../cucumber/SetMessagesMethodStepdefs.java | 18 +- .../cucumber/MemoryDownloadCucumberTest.java | 4 +- .../cucumber/MemoryGetMessagesMethodTest.java | 4 +- .../MemoryIMAPKeywordsInconsistenciesTest.java | 4 +- .../MemoryIMAPSetMessagesCompatibilityTest.java | 4 +- .../MemorySetMailboxesMethodCucumberTest.java | 4 +- .../MemorySetMessagesMethodCucumberTest.java | 4 +- .../jmap/memory/cucumber/MemorySharingTest.java | 4 +- .../cucumber/MemoryUploadCucumberTest.java | 4 +- .../jmap/methods/MIMEMessageConverter.java | 3 +- .../methods/SetMailboxesUpdateProcessor.java | 2 +- .../methods/SetMessagesUpdateProcessor.java | 4 +- .../methods/UpdateMessagePatchValidator.java | 2 +- .../james/jmap/model/AccessTokenRequest.java | 2 +- .../james/jmap/model/ContinuationToken.java | 2 +- .../jmap/model/ContinuationTokenRequest.java | 4 +- .../org/apache/james/jmap/model/Keywords.java | 2 +- .../james/jmap/model/SetMessagesResponse.java | 6 +- .../apache/james/jmap/utils/SortConverter.java | 2 +- .../james/jmap/AuthenticationFilterTest.java | 4 +- .../jmap/crypto/AccessTokenManagerImplTest.java | 12 +- .../jmap/json/MultipleObjectMapperTest.java | 4 +- .../json/OperatorSerializeDeserializeTest.java | 2 +- .../james/jmap/mailet/SentByJmapTest.java | 4 +- .../jmap/methods/JmapRequestParserImplTest.java | 2 +- .../methods/JmapResponseWriterImplTest.java | 2 +- .../james/jmap/methods/RequestHandlerTest.java | 6 +- .../apache/james/jmap/model/AttachmentTest.java | 10 +- .../james/jmap/model/CreationMessageTest.java | 2 +- .../apache/james/jmap/model/EmailerTest.java | 10 +- .../james/jmap/model/FilterOperatorTest.java | 6 +- .../GetMailboxMessageListResponseTest.java | 14 +- .../jmap/model/GetMailboxesRequestTest.java | 2 +- .../jmap/model/GetMessageListRequestTest.java | 14 +- .../apache/james/jmap/model/MessageTest.java | 26 +- .../james/jmap/model/ProtocolRequestTest.java | 10 +- .../james/jmap/model/ProtocolResponseTest.java | 8 +- .../jmap/model/SetMailboxesRequestTest.java | 4 +- .../james/jmap/model/SubMailboxMessageTest.java | 10 +- .../james/jmap/model/mailbox/MailboxTest.java | 10 +- .../apache/james/jmap/send/MailFactoryTest.java | 4 +- .../james/jmap/send/MailMetadataTest.java | 4 +- .../jmap/send/PostDequeueDecoratorTest.java | 2 +- .../james/jmap/utils/DependencyGraphTest.java | 4 +- .../james/jmap/utils/DownloadPathTest.java | 12 +- .../SortingHierarchicalCollectionsTest.java | 4 +- .../james/imapserver/netty/IMAPServer.java | 2 +- .../netty/ImapChannelUpstreamHandler.java | 2 +- .../imapserver/netty/ImapHeartbeatHandler.java | 2 +- .../SwitchableDelimiterBasedFrameDecoder.java | 6 +- .../protocols/lib/handler/HandlersPackage.java | 2 +- ...ractExecutorAwareChannelPipelineFactory.java | 2 +- .../lib/netty/AbstractProtocolAsyncServer.java | 4 +- ...ledOrderedMemoryAwareThreadPoolExecutor.java | 2 +- .../lib/mock/MockProtocolHandlerLoader.java | 4 +- .../lmtpserver/netty/LMTPServerFactory.java | 4 +- .../lmtpserver/netty/OioLMTPServerFactory.java | 2 +- .../pop3server/netty/OioPOP3ServerFactory.java | 2 +- .../pop3server/netty/POP3ServerFactory.java | 4 +- .../smtpserver/netty/OioSMTPServerFactory.java | 2 +- .../smtpserver/netty/SMTPServerFactory.java | 2 +- .../apache/james/webadmin/TlsConfiguration.java | 4 +- .../org/apache/james/webadmin/dto/QuotaDTO.java | 2 +- .../webadmin/routes/GlobalQuotaRoutesTest.java | 4 +- .../routes/UserMailboxesRoutesTest.java | 8 +- .../james/queue/api/mock/MockMailQueue.java | 2 +- .../apache/james/task/MemoryTaskManager.java | 2 +- .../java/org/apache/james/task/TaskTest.java | 8 +- .../apache/james/utils/IMAPMessageReader.java | 14 +- 490 files changed, 1416 insertions(+), 1581 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraAsyncExecutor.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraAsyncExecutor.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraAsyncExecutor.java index a7515f5..a137c66 100644 --- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraAsyncExecutor.java +++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraAsyncExecutor.java @@ -53,7 +53,7 @@ public class CassandraAsyncExecutor { public CompletableFuture<Void> executeVoid(Statement statement) { return FutureConverter.toCompletableFuture(session.executeAsync(statement)) - .thenAccept(result -> {}); + .thenAccept(result -> { }); } public CompletableFuture<Optional<Row>> executeSingleRow(Statement statement) { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java index 27ababf..caaea05 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java @@ -118,7 +118,7 @@ public final class CassandraCluster implements AutoCloseable { private void sleep(long sleepMs) { try { Thread.sleep(sleepMs); - } catch(InterruptedException interruptedException) { + } catch (InterruptedException interruptedException) { Throwables.propagate(interruptedException); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraWaitStrategy.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraWaitStrategy.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraWaitStrategy.java index 6695a07..d6f71ff 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraWaitStrategy.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraWaitStrategy.java @@ -50,7 +50,7 @@ public class CassandraWaitStrategy implements WaitStrategy { .execInContainer("cqlsh", "-e", "show host") .getStdout() .contains("Connected to Test Cluster"); - } catch (IOException|InterruptedException e) { + } catch (IOException | InterruptedException e) { return false; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java index beab426..126d31f 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java @@ -87,7 +87,7 @@ public class DockerCassandraRule implements TestRule { .run("echo \"-Xmx1500M\" >> " + JVM_OPTIONS) .build())) .withCreateContainerCmdModifier(cmd -> cmd.getHostConfig().withBinds(new Binds(new Bind(tmpFsName, new Volume("/var/lib/cassandra"))))) - .withCreateContainerCmdModifier(cmd -> cmd.withMemory(2000*1024*1024L)) + .withCreateContainerCmdModifier(cmd -> cmd.withMemory(2000 * 1024 * 1024L)) .withExposedPorts(CASSANDRA_PORT) .withLogConsumer(this::displayDockerLog) .waitingFor(new CassandraWaitStrategy()); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/IndexCreationFactory.java ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/IndexCreationFactory.java b/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/IndexCreationFactory.java index 0727f23..22c4943 100644 --- a/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/IndexCreationFactory.java +++ b/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/IndexCreationFactory.java @@ -95,7 +95,7 @@ public class IndexCreationFactory { if (!aliasExist(client, aliasName)) { client.admin() .indices() - .aliases( new IndicesAliasesRequest() + .aliases(new IndicesAliasesRequest() .addAlias(aliasName.getValue(), indexName.getValue())) .actionGet(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java index 4fbe271..7ff3b74 100644 --- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java +++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java @@ -61,7 +61,7 @@ public class ClientProviderImplConnectionTest { Awaitility.await() .atMost(1, TimeUnit.MINUTES) .pollInterval(5, TimeUnit.SECONDS) - .until(() ->isConnected( + .until(() -> isConnected( ClientProviderImpl.fromHostsString( es1.getContainerIp() + ":" + ES_APPLICATIVE_PORT + "," + es2.getContainerIp() + ":" + ES_APPLICATIVE_PORT))); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java index 1b7a3e3..db53ccd 100644 --- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java +++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java @@ -46,7 +46,7 @@ public class ElasticSearchIndexerTest { private static final AliasName ALIAS_NAME = new AliasName("alias_name"); private static final TypeName TYPE_NAME = new TypeName("type_name"); private TemporaryFolder temporaryFolder = new TemporaryFolder(); - private EmbeddedElasticSearch embeddedElasticSearch= new EmbeddedElasticSearch(temporaryFolder, INDEX_NAME); + private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, INDEX_NAME); @Rule public RuleChain ruleChain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch); @@ -92,7 +92,7 @@ public class ElasticSearchIndexerTest { } } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void indexMessageShouldThrowWhenJsonIsNull() throws InterruptedException { testee.indexMessage("1", null); } @@ -125,22 +125,22 @@ public class ElasticSearchIndexerTest { } } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void updateMessageShouldThrowWhenJsonIsNull() throws InterruptedException { testee.updateMessages(Lists.newArrayList(new ElasticSearchIndexer.UpdatedRepresentation("1", null))); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void updateMessageShouldThrowWhenIdIsNull() throws InterruptedException { testee.updateMessages(Lists.newArrayList(new ElasticSearchIndexer.UpdatedRepresentation(null, "{\"message\": \"mastering out Elasticsearch\"}"))); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void updateMessageShouldThrowWhenJsonIsEmpty() throws InterruptedException { testee.updateMessages(Lists.newArrayList(new ElasticSearchIndexer.UpdatedRepresentation("1", ""))); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void updateMessageShouldThrowWhenIdIsEmpty() throws InterruptedException { testee.updateMessages(Lists.newArrayList(new ElasticSearchIndexer.UpdatedRepresentation("", "{\"message\": \"mastering out Elasticsearch\"}"))); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/IndexCreationFactoryTest.java ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/IndexCreationFactoryTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/IndexCreationFactoryTest.java index f02048d..e0b3271 100644 --- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/IndexCreationFactoryTest.java +++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/IndexCreationFactoryTest.java @@ -33,7 +33,7 @@ public class IndexCreationFactoryTest { public static final AliasName ALIAS_NAME = new AliasName("alias"); private TemporaryFolder temporaryFolder = new TemporaryFolder(); - private EmbeddedElasticSearch embeddedElasticSearch= new EmbeddedElasticSearch(temporaryFolder, INDEX_NAME); + private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, INDEX_NAME); @Rule public RuleChain ruleChain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/search/ScrollIterableTest.java ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/search/ScrollIterableTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/search/ScrollIterableTest.java index dbba300..f23a059 100644 --- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/search/ScrollIterableTest.java +++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/search/ScrollIterableTest.java @@ -57,7 +57,7 @@ public class ScrollIterableTest { public static final TypeName TYPE_NAME = new TypeName("messages"); private TemporaryFolder temporaryFolder = new TemporaryFolder(); - private EmbeddedElasticSearch embeddedElasticSearch= new EmbeddedElasticSearch(temporaryFolder, INDEX_NAME); + private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, INDEX_NAME); @Rule public RuleChain ruleChain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/backends-common/jpa/src/test/java/org/apache/james/backends/jpa/JpaTestCluster.java ---------------------------------------------------------------------- diff --git a/backends-common/jpa/src/test/java/org/apache/james/backends/jpa/JpaTestCluster.java b/backends-common/jpa/src/test/java/org/apache/james/backends/jpa/JpaTestCluster.java index 42604dc..e845801 100644 --- a/backends-common/jpa/src/test/java/org/apache/james/backends/jpa/JpaTestCluster.java +++ b/backends-common/jpa/src/test/java/org/apache/james/backends/jpa/JpaTestCluster.java @@ -71,7 +71,7 @@ public class JpaTestCluster { public void clear(List<String> tables) { EntityManager entityManager = entityManagerFactory.createEntityManager(); entityManager.getTransaction().begin(); - for(String tableName: tables) { + for (String tableName: tables) { entityManager.createNativeQuery("DELETE FROM " + tableName).executeUpdate(); } entityManager.getTransaction().commit(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/api/src/main/java/org/apache/james/mailbox/exception/OverQuotaException.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/exception/OverQuotaException.java b/mailbox/api/src/main/java/org/apache/james/mailbox/exception/OverQuotaException.java index e1ad77b..7568300 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/exception/OverQuotaException.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/exception/OverQuotaException.java @@ -24,7 +24,7 @@ package org.apache.james.mailbox.exception; * * */ -public class OverQuotaException extends MailboxException{ +public class OverQuotaException extends MailboxException { /** * http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/api/src/main/java/org/apache/james/mailbox/exception/ReadOnlyException.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/exception/ReadOnlyException.java b/mailbox/api/src/main/java/org/apache/james/mailbox/exception/ReadOnlyException.java index 0db3c1c..eb9ba00 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/exception/ReadOnlyException.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/exception/ReadOnlyException.java @@ -26,7 +26,7 @@ import org.apache.james.mailbox.model.MailboxPath; * * */ -public class ReadOnlyException extends MailboxException{ +public class ReadOnlyException extends MailboxException { /** http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedRightException.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedRightException.java b/mailbox/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedRightException.java index 26b711c..fae0a38 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedRightException.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedRightException.java @@ -37,7 +37,7 @@ public class UnsupportedRightException extends MailboxSecurityException { } public UnsupportedRightException(char right) { - super("Unsupported right flag '"+ right +"'."); + super("Unsupported right flag '" + right + "'."); this.unsupportedRight = right; } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/api/src/main/java/org/apache/james/mailbox/model/Headers.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/Headers.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/Headers.java index 6eebb9d..12e6007 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/Headers.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/Headers.java @@ -25,7 +25,7 @@ import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MessageResult.FetchGroup; import org.apache.james.mailbox.model.MessageResult.Header; -public interface Headers extends Content{ +public interface Headers extends Content { /** * Gets headers for the message. * http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java index 1749dbc..e21b3d5 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java @@ -34,7 +34,7 @@ import com.google.common.base.Objects; * Used to define a range of messages by uid.<br> * The type of the set should be defined by using an appropriate constructor. */ -public class MessageRange implements Iterable<MessageUid>{ +public class MessageRange implements Iterable<MessageUid> { public enum Type { /** All messages */ @@ -174,19 +174,19 @@ public class MessageRange implements Iterable<MessageUid>{ ranges.add(MessageUid.of(firstUid).toRange()); } } else { - if ((firstUid + a +1) != u) { + if ((firstUid + a + 1) != u) { ranges.add(MessageRange.range(MessageUid.of(firstUid), MessageUid.of(firstUid + a))); // set the next first uid and reset the counter firstUid = u; a = 0; - if (uids.size() <= i +1) { + if (uids.size() <= i + 1) { ranges.add(MessageUid.of(firstUid).toRange()); } } else { a++; // Handle uids which are in sequence. See MAILBOX-56 - if (uids.size() <= i +1) { + if (uids.size() <= i + 1) { ranges.add(MessageRange.range(MessageUid.of(firstUid), MessageUid.of(firstUid + a))); break; } @@ -248,9 +248,9 @@ public class MessageRange implements Iterable<MessageUid>{ long from = getUidFrom().asLong(); long to = getUidTo().asLong(); long realTo = to; - while(from <= realTo) { - if (from + maxItems -1 < realTo) { - to = from + maxItems -1; + while (from <= realTo) { + if (from + maxItems - 1 < realTo) { + to = from + maxItems - 1; } else { to = realTo; } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MimeDescriptor.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MimeDescriptor.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MimeDescriptor.java index 6c58ab0..d3470cc 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MimeDescriptor.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MimeDescriptor.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; -public interface MimeDescriptor extends Headers{ +public interface MimeDescriptor extends Headers { /** * Gets the top level MIME content media type. http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/api/src/main/java/org/apache/james/mailbox/model/UpdatedFlags.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/UpdatedFlags.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/UpdatedFlags.java index 11b94af..7d30c0b 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/UpdatedFlags.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/UpdatedFlags.java @@ -99,7 +99,7 @@ public class UpdatedFlags { if (isChanged(oldFlags, newFlags, Flags.Flag.ANSWERED)) { modifiedFlags.add(Flags.Flag.ANSWERED); } - if(isChanged(oldFlags, newFlags, Flags.Flag.DELETED)) { + if (isChanged(oldFlags, newFlags, Flags.Flag.DELETED)) { modifiedFlags.add(Flags.Flag.DELETED); } if (isChanged(oldFlags, newFlags, Flags.Flag.DRAFT)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java index 4a7bc0b..05613a0 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java @@ -126,7 +126,7 @@ public class ManagerTestResources<T extends MailboxManager> { } public void fillMailbox() throws MailboxException, UnsupportedEncodingException { - for(int i = 0; i < 4; i++) { + for (int i = 0; i < 4; i++) { provideSomeMessages(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 1f3ff12..d220f70 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 @@ -90,7 +90,7 @@ public abstract class QuotaMessageManagerTest<T extends MailboxManager> { public void testCopyOverQuotaMessages() throws Exception { try { resources.fillMailbox(); - } catch(OverQuotaException overQuotaException) { + } catch (OverQuotaException overQuotaException) { // Silent these exception as we don't want it to disturb the test } maxQuotaManager.setMaxMessage(quotaRootResolver.getQuotaRoot(inbox), 20L); @@ -102,7 +102,7 @@ public abstract class QuotaMessageManagerTest<T extends MailboxManager> { maxQuotaManager.setMaxStorage(quotaRootResolver.getQuotaRoot(inbox), 20L * MockMail.MAIL_TEXT_PLAIN.length()); try { resources.fillMailbox(); - } catch(OverQuotaException overQuotaException) { + } catch (OverQuotaException overQuotaException) { // Silent these exception as we don't want it to disturb the test } mailboxManager.copyMessages(MessageRange.all(), inbox, subFolder, session); @@ -113,7 +113,7 @@ public abstract class QuotaMessageManagerTest<T extends MailboxManager> { maxQuotaManager.setMaxMessage(quotaRootResolver.getQuotaRoot(inbox), 8L); try { resources.fillMailbox(); - } catch(OverQuotaException overQuotaException) { + } catch (OverQuotaException overQuotaException) { // We are here over quota } messageManager.expunge(MessageRange.all(), session); @@ -126,7 +126,7 @@ public abstract class QuotaMessageManagerTest<T extends MailboxManager> { maxQuotaManager.setMaxStorage(quotaRootResolver.getQuotaRoot(inbox), 8 * MockMail.MAIL_TEXT_PLAIN.length() + 1); try { resources.fillMailbox(); - } catch(OverQuotaException overQuotaException) { + } catch (OverQuotaException overQuotaException) { // We are here over quota } messageManager.expunge(MessageRange.all(), session); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java index b4b5d39..da8a360 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java @@ -105,9 +105,9 @@ public class MockMailboxManager { MailboxPath mailboxPath = null; - for (int i=0; i < DOMAIN_COUNT; i++) { + for (int i = 0; i < DOMAIN_COUNT; i++) { - for (int j=0; j < USER_COUNT; j++) { + for (int j = 0; j < USER_COUNT; j++) { String user = "user" + j + "@localhost" + i; @@ -117,13 +117,13 @@ public class MockMailboxManager { mailboxPath = MailboxPath.forUser(user, folderName); createMailbox(mailboxSession, mailboxPath); - for (int k=0; k < SUB_MAILBOXES_COUNT; k++) { + for (int k = 0; k < SUB_MAILBOXES_COUNT; k++) { String subFolderName = folderName + ".SUB_FOLDER_" + k; mailboxPath = MailboxPath.forUser(user, subFolderName); createMailbox(mailboxSession, mailboxPath); - for (int l=0; l < SUB_SUB_MAILBOXES_COUNT; l++) { + for (int l = 0; l < SUB_SUB_MAILBOXES_COUNT; l++) { String subSubfolderName = subFolderName + ".SUBSUB_FOLDER_" + l; mailboxPath = MailboxPath.forUser(user, subSubfolderName); @@ -151,7 +151,7 @@ public class MockMailboxManager { getMockMailboxManager().startProcessingRequest(mailboxSession); getMockMailboxManager().createMailbox(mailboxPath, mailboxSession); MessageManager messageManager = getMockMailboxManager().getMailbox(mailboxPath, mailboxSession); - for (int j=0; j < MESSAGE_PER_MAILBOX_COUNT; j++) { + for (int j = 0; j < MESSAGE_PER_MAILBOX_COUNT; j++) { messageManager.appendMessage(new ByteArrayInputStream(MockMail.MAIL_TEXT_PLAIN.getBytes("UTF-8")), Calendar.getInstance().getTime(), mailboxSession, http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxACLTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxACLTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxACLTest.java index fccabd0..5804932 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxACLTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxACLTest.java @@ -223,7 +223,7 @@ public class MailboxACLTest { } @Test - public void applyShouldNotThrowWhenRemovingANonExistingEntry() throws Exception{ + public void applyShouldNotThrowWhenRemovingANonExistingEntry() throws Exception { assertThat(MailboxACL.EMPTY .apply(MailboxACL.command().forUser("bob").noRights().asReplacement())) .isEqualTo(MailboxACL.EMPTY); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 45933e2..f434253 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 @@ -26,13 +26,13 @@ import org.junit.Test; public class MessageAttachmentTest { - @Test(expected=IllegalStateException.class) + @Test(expected = IllegalStateException.class) public void buildShouldThrowWhenAttachmentIsNotGiven() { MessageAttachment.builder() .build(); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void builderShouldThrowWhenAttachmentIsNull() { MessageAttachment.builder() .attachment(null); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MultimailboxesSearchQueryTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MultimailboxesSearchQueryTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MultimailboxesSearchQueryTest.java index 121ba84..8430f08 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MultimailboxesSearchQueryTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MultimailboxesSearchQueryTest.java @@ -31,7 +31,7 @@ public class MultimailboxesSearchQueryTest { private static final MailboxId ID_1 = FACTORY.fromString("1"); private static final MailboxId ID_2 = FACTORY.fromString("2"); - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void buildShouldThrowWhenQueryIsNull() { MultimailboxesSearchQuery.from(null); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/api/src/test/java/org/apache/james/mailbox/model/Rfc4314RightsTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/Rfc4314RightsTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/Rfc4314RightsTest.java index 24e8c2b..5d09abc 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/Rfc4314RightsTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/Rfc4314RightsTest.java @@ -59,7 +59,7 @@ public class Rfc4314RightsTest { none = MailboxACL.NO_RIGHTS; } - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void newInstanceShouldThrowWhenNullString() throws UnsupportedRightException { Rfc4314Rights.fromSerializedRfc4314Rights((String) null); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/MailboxQueryTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/MailboxQueryTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/MailboxQueryTest.java index 5159209..7ae9041 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/MailboxQueryTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/MailboxQueryTest.java @@ -81,7 +81,7 @@ public class MailboxQueryTest { testee.build(); } - @Test(expected=IllegalStateException.class) + @Test(expected = IllegalStateException.class) public void builderShouldThrowWhenBaseAndUsernameGiven() throws Exception { Builder testee = MailboxQuery.builder() .userAndNamespaceFrom(mailboxPath) @@ -90,7 +90,7 @@ public class MailboxQueryTest { testee.build(); } - @Test(expected=IllegalStateException.class) + @Test(expected = IllegalStateException.class) public void builderShouldThrowWhenBaseGiven() throws Exception { Builder testee = MailboxQuery.builder() .userAndNamespaceFrom(mailboxPath) http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 c7eeb46..d33bcec 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 @@ -50,7 +50,7 @@ public class AttachmentLoader { Stream<MessageAttachmentRepresentation>>> messageRepresentations, MessageMapper.FetchType fetchType) { if (fetchType == MessageMapper.FetchType.Body || fetchType == MessageMapper.FetchType.Full) { - return FluentFutureStream.<SimpleMailboxMessage> of( + return FluentFutureStream.<SimpleMailboxMessage>of( messageRepresentations .map(pair -> getAttachments(pair.getRight().collect(Guavate.toImmutableList())) .thenApply(attachments -> pair.getLeft().toMailboxMessage(attachments)))) http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapper.java index 5503f4b..9d497ee 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapper.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapper.java @@ -75,7 +75,7 @@ public class CassandraACLMapper { @Inject public CassandraACLMapper(Session session, CassandraUserMailboxRightsDAO userMailboxRightsDAO, CassandraConfiguration cassandraConfiguration) { - this(session, userMailboxRightsDAO, cassandraConfiguration, () -> {}); + this(session, userMailboxRightsDAO, cassandraConfiguration, () -> { }); } public CassandraACLMapper(Session session, CassandraUserMailboxRightsDAO userMailboxRightsDAO, CassandraConfiguration cassandraConfiguration, CodeInjector codeInjector) { @@ -215,7 +215,7 @@ public class CassandraACLMapper { private MailboxACL deserializeACL(CassandraId cassandraId, String serializedACL) { try { return MailboxACLJsonConverter.toACL(serializedACL); - } catch(IOException exception) { + } catch (IOException exception) { LOG.error("Unable to read stored ACL. " + "We will use empty ACL instead." + "Mailbox is {} ." + @@ -236,7 +236,7 @@ public class CassandraACLMapper { public ACLWithVersion apply(MailboxACL.ACLCommand command) { try { return new ACLWithVersion(version, mailboxACL.apply(command)); - } catch(UnsupportedRightException exception) { + } catch (UnsupportedRightException exception) { throw Throwables.propagate(exception); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAO.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAO.java index 7cd3718..c7eabf7 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAO.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAO.java @@ -111,7 +111,7 @@ public class CassandraBlobsDAO { BlobId blobId = BlobId.forPayload(data); return saveBlobParts(data, blobId) - .thenCompose(numberOfChunk-> saveBlobPartsReferences(blobId, numberOfChunk)) + .thenCompose(numberOfChunk -> saveBlobPartsReferences(blobId, numberOfChunk)) .thenApply(any -> blobId); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java index c9566f6..865938b 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java @@ -100,8 +100,8 @@ public class CassandraMailboxMapper implements MailboxMapper { } catch (CompletionException e) { if (e.getCause() instanceof InvalidQueryException) { String errorMessage = e.getCause().getMessage(); - if (StringUtils.containsIgnoreCase(errorMessage, VALUES_MAY_NOT_BE_LARGER_THAN_64_K)|| - StringUtils.containsIgnoreCase(errorMessage, CLUSTERING_COLUMNS_IS_TOO_LONG)) { + if (StringUtils.containsIgnoreCase(errorMessage, VALUES_MAY_NOT_BE_LARGER_THAN_64_K) + || StringUtils.containsIgnoreCase(errorMessage, CLUSTERING_COLUMNS_IS_TOO_LONG)) { throw new TooLongMailboxNameException("too long mailbox name"); } throw new MailboxException("It has error with cassandra storage", e.getCause()); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java index a736f30..5662941 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java @@ -55,7 +55,7 @@ public class CassandraTestSystemFixture { messageIdFactory); } - public static CassandraMailboxManager createMailboxManager(CassandraMailboxSessionMapperFactory mapperFactory) throws Exception{ + public static CassandraMailboxManager createMailboxManager(CassandraMailboxSessionMapperFactory mapperFactory) throws Exception { DefaultDelegatingMailboxListener delegatingMailboxListener = new DefaultDelegatingMailboxListener(); MailboxEventDispatcher mailboxEventDispatcher = new MailboxEventDispatcher(delegatingMailboxListener); StoreRightManager storeRightManager = new StoreRightManager(mapperFactory, new UnionMailboxACLResolver(), new SimpleGroupMembershipResolver(), mailboxEventDispatcher); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/MessageAttachmentRepresentationByIdTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/MessageAttachmentRepresentationByIdTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/MessageAttachmentRepresentationByIdTest.java index 5a292ec..4026300 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/MessageAttachmentRepresentationByIdTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/MessageAttachmentRepresentationByIdTest.java @@ -31,13 +31,13 @@ import org.junit.Test; public class MessageAttachmentRepresentationByIdTest { - @Test(expected=IllegalStateException.class) + @Test(expected = IllegalStateException.class) public void buildShouldThrowWhenAttachmentIsNotGiven() { org.apache.james.mailbox.model.MessageAttachment.builder() .build(); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void builderShouldThrowWhenAttachmentIsNull() { org.apache.james.mailbox.model.MessageAttachment.builder() .attachment(null); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 70746b5..421c631 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 @@ -49,7 +49,7 @@ public class DateResolutionFormater { } private static TemporalUnit convertDateResolutionField(SearchQuery.DateResolution resolution) { - switch(resolution) { + switch (resolution) { case Year: return ChronoUnit.YEARS; case Month: http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/SortConverter.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/SortConverter.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/SortConverter.java index 6daa1a8..ebcc557 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/SortConverter.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/SortConverter.java @@ -72,7 +72,7 @@ public class SortConverter { } private static SortOrder getOrder(SearchQuery.Sort sort) { - if(sort.isReverse()) { + if (sort.isReverse()) { return SortOrder.DESC; } else { return SortOrder.ASC; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java index 94d7d11..f18225b 100644 --- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java +++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java @@ -70,7 +70,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest private static final boolean IS_RECENT = true; private TemporaryFolder temporaryFolder = new TemporaryFolder(); - private EmbeddedElasticSearch embeddedElasticSearch= new EmbeddedElasticSearch(temporaryFolder, MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX); + private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX); @Rule public RuleChain ruleChain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseClusterSingleton.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseClusterSingleton.java b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseClusterSingleton.java index 7fd2419..a7986a5 100644 --- a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseClusterSingleton.java +++ b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseClusterSingleton.java @@ -71,7 +71,7 @@ public final class HBaseClusterSingleton { Process process = Runtime.getRuntime().exec("/bin/sh -c umask"); BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream())); int rc = process.waitFor(); - if(rc == 0) { + if (rc == 0) { String umask = br.readLine(); int umaskBits = Integer.parseInt(umask, 8); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java index 9638b33..31bc7da 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java @@ -40,7 +40,7 @@ public abstract class AbstractJCRScalingMapper extends TransactionalMapper imple private final int scaling; private final MailboxSession mSession; - private static final char PAD ='_'; + private static final char PAD = '_'; public AbstractJCRScalingMapper(MailboxSessionJCRRepository repository, MailboxSession mSession, int scaling) { this.scaling = scaling; @@ -54,7 +54,7 @@ public abstract class AbstractJCRScalingMapper extends TransactionalMapper imple * * @return session */ - protected Session getSession() throws RepositoryException{ + protected Session getSession() throws RepositoryException { return repository.login(mSession); } @@ -124,7 +124,7 @@ public abstract class AbstractJCRScalingMapper extends TransactionalMapper imple StringBuffer sb = new StringBuffer(); for (int i = 0; i < scaling; i++) { if (username.length() > i) { - sb.append(username.substring(0,i+1)); + sb.append(username.substring(0,i + 1)); } else { sb.append(username); int a = i - username.length(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/GlobalMailboxSessionJCRRepository.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/GlobalMailboxSessionJCRRepository.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/GlobalMailboxSessionJCRRepository.java index 0f47c86..9f839ae 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/GlobalMailboxSessionJCRRepository.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/GlobalMailboxSessionJCRRepository.java @@ -30,7 +30,7 @@ import org.apache.james.mailbox.MailboxSession; * Manage JCR {@link Session}. It will use one user and password for all * */ -public class GlobalMailboxSessionJCRRepository extends MailboxSessionJCRRepository{ +public class GlobalMailboxSessionJCRRepository extends MailboxSessionJCRRepository { private final String username; private final char[] pass; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java index 9a1b935..42acd3d 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java @@ -63,7 +63,7 @@ public class JCRMailboxManager extends StoreMailboxManager implements JCRImapCon } @Override - protected StoreMessageManager createMessageManager(Mailbox mailboxEntity, MailboxSession session) throws MailboxException{ + protected StoreMessageManager createMessageManager(Mailbox mailboxEntity, MailboxSession session) throws MailboxException { return new JCRMessageManager(getMapperFactory(), getMessageSearchIndex(), getEventDispatcher(), http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java index 7c56c93..51a8880 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java @@ -56,7 +56,7 @@ public class JCRMailboxSessionMapperFactory extends MailboxSessionMapperFactory this.repository = repository; this.scaling = scaling; this.messageScaling = messageScaling; - this.uidProvider= uidProvider; + this.uidProvider = uidProvider; this.modSeqProvider = modSeqProvider; } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java index 46e81a9..00012c5 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java @@ -69,7 +69,7 @@ public class JCRMessageManager extends StoreMessageManager { @Override - protected MailboxMessage createMessage(Date internalDate, int size, int bodyStartOctet, SharedInputStream content, Flags flags, PropertyBuilder propertyBuilder, List<MessageAttachment> attachments) throws MailboxException{ + protected MailboxMessage createMessage(Date internalDate, int size, int bodyStartOctet, SharedInputStream content, Flags flags, PropertyBuilder propertyBuilder, List<MessageAttachment> attachments) throws MailboxException { JCRId mailboxId = (JCRId) getMailboxEntity().getMailboxId(); return new JCRMailboxMessage(mailboxId, getMessageIdFactory().generate(), internalDate, size, flags, content, bodyStartOctet, propertyBuilder); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRRepositoryAuthenticator.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRRepositoryAuthenticator.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRRepositoryAuthenticator.java index d687266..83c3786 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRRepositoryAuthenticator.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRRepositoryAuthenticator.java @@ -33,7 +33,7 @@ import org.apache.james.mailbox.store.Authenticator; * real sense in conjunction with the direct {@link MailboxSessionJCRRepository} implementation (not a subclass). * */ -public class JCRRepositoryAuthenticator implements Authenticator{ +public class JCRRepositoryAuthenticator implements Authenticator { private final MailboxSessionJCRRepository repository; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRUtils.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRUtils.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRUtils.java index eb00f24..8c50d68 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRUtils.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRUtils.java @@ -31,7 +31,7 @@ import org.apache.jackrabbit.commons.cnd.CndImporter; * Utilities used for JCR * */ -public class JCRUtils implements JCRImapConstants{ +public class JCRUtils implements JCRImapConstants { /** * Register the imap CND file in the workspace http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java index 94f719b..9aac65d 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java @@ -99,7 +99,7 @@ public class JCRMailboxMapper extends AbstractJCRScalingMapper implements Mailbo QueryManager manager = getSession().getWorkspace().getQueryManager(); - String queryString = "/jcr:root/" + MAILBOXES_PATH + "/" + ISO9075.encodePath(path.getNamespace()) + "//element(*,jamesMailbox:mailbox)[@" + JCRMailbox.NAME_PROPERTY + "='" + name+ "' and @" + JCRMailbox.NAMESPACE_PROPERTY +"='" + namespace + "' and @" + JCRMailbox.USER_PROPERTY + "='" + user + "']"; + String queryString = "/jcr:root/" + MAILBOXES_PATH + "/" + ISO9075.encodePath(path.getNamespace()) + "//element(*,jamesMailbox:mailbox)[@" + JCRMailbox.NAME_PROPERTY + "='" + name + "' and @" + JCRMailbox.NAMESPACE_PROPERTY + "='" + namespace + "' and @" + JCRMailbox.USER_PROPERTY + "='" + user + "']"; QueryResult result = manager.createQuery(queryString, XPATH_LANGUAGE).execute(); NodeIterator it = result.getNodes(); if (it.hasNext()) { @@ -142,7 +142,7 @@ public class JCRMailboxMapper extends AbstractJCRScalingMapper implements Mailbo String namespace = Text.escapeIllegalXpathSearchChars(path.getNamespace()); QueryManager manager = getSession().getWorkspace().getQueryManager(); - String queryString = "/jcr:root/" + MAILBOXES_PATH + "/" + ISO9075.encodePath(path.getNamespace()) + "//element(*,jamesMailbox:mailbox)[jcr:like(@" + JCRMailbox.NAME_PROPERTY + ",'%" + name + "%') and @" + JCRMailbox.NAMESPACE_PROPERTY +"='" + namespace + "' and @" + JCRMailbox.USER_PROPERTY + "='" + user + "']"; + String queryString = "/jcr:root/" + MAILBOXES_PATH + "/" + ISO9075.encodePath(path.getNamespace()) + "//element(*,jamesMailbox:mailbox)[jcr:like(@" + JCRMailbox.NAME_PROPERTY + ",'%" + name + "%') and @" + JCRMailbox.NAMESPACE_PROPERTY + "='" + namespace + "' and @" + JCRMailbox.USER_PROPERTY + "='" + user + "']"; QueryResult result = manager.createQuery(queryString, XPATH_LANGUAGE).execute(); NodeIterator it = result.getNodes(); while (it.hasNext()) { @@ -223,7 +223,7 @@ public class JCRMailboxMapper extends AbstractJCRScalingMapper implements Mailbo .getQueryManager(); String queryString = "/jcr:root/" + MAILBOXES_PATH + "/" + ISO9075.encodePath(mailbox.getNamespace()) + "//element(*,jamesMailbox:mailbox)[jcr:like(@" - + JCRMailbox.NAME_PROPERTY + ",'" + name + delimiter + "%') and @" + JCRMailbox.NAMESPACE_PROPERTY +"='" + namespace + "' and @" + JCRMailbox.USER_PROPERTY + "='" + user + "']"; + + JCRMailbox.NAME_PROPERTY + ",'" + name + delimiter + "%') and @" + JCRMailbox.NAMESPACE_PROPERTY + "='" + namespace + "' and @" + JCRMailbox.USER_PROPERTY + "='" + user + "']"; QueryResult result = manager.createQuery(queryString, XPATH_LANGUAGE) .execute(); NodeIterator it = result.getNodes(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRModSeqProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRModSeqProvider.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRModSeqProvider.java index 2490f0a..db4ec9e 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRModSeqProvider.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRModSeqProvider.java @@ -32,7 +32,7 @@ import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.store.mail.AbstractLockingModSeqProvider; import org.apache.james.mailbox.store.mail.model.Mailbox; -public class JCRModSeqProvider extends AbstractLockingModSeqProvider{ +public class JCRModSeqProvider extends AbstractLockingModSeqProvider { private final MailboxSessionJCRRepository repository; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java index efdb607..0829bd0 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; /** * JCR implementation of a {@link Mailbox} */ -public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent{ +public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent { private static final Logger LOGGER = LoggerFactory.getLogger(JCRMailbox.class); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
