JAMES-2352 use @Override instead of javadoc comments
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f209526e Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f209526e Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f209526e Branch: refs/heads/master Commit: f209526e923bcd2b6fde95004de06d0aab11a234 Parents: 10ba38a Author: Matthieu Baechler <matth...@apache.org> Authored: Wed Mar 14 11:44:24 2018 +0100 Committer: Matthieu Baechler <matth...@apache.org> Committed: Fri Mar 16 11:12:47 2018 +0100 ---------------------------------------------------------------------- .../james/backends/es/ClientProviderImpl.java | 1 + .../apache/james/mailbox/MailboxListener.java | 3 + .../StandardMailboxMetaDataComparator.java | 4 +- .../mailbox/acl/UnionMailboxACLResolver.java | 10 -- .../james/mailbox/model/FetchGroupImpl.java | 8 +- .../james/mailbox/model/MessageResult.java | 1 + .../model/PartContentDescriptorImpl.java | 2 + .../james/mailbox/mock/MockMailboxSession.java | 13 ++ .../james/mailbox/quota/QuotaCountTest.java | 2 + .../james/mailbox/quota/QuotaSizeTest.java | 2 + .../james/mailbox/util/EventCollector.java | 1 + .../CassandraMailboxSessionMapperFactory.java | 2 + .../cassandra/CassandraSubscriptionManager.java | 5 +- .../mail/CassandraAnnotationMapper.java | 6 + .../CassandraCombinationManagerTest.java | 1 + .../cassandra/CassandraMailboxManagerTest.java | 1 + .../CassandraMessageIdManagerQuotaTest.java | 1 + ...CassandraMessageIdManagerSideEffectTest.java | 1 + .../CassandraMessageIdManagerStorageTest.java | 1 + .../mail/CassandraAnnotationMapperTest.java | 1 + .../mail/CassandraAttachmentMapperTest.java | 1 + .../mail/CassandraGenericMailboxMapperTest.java | 1 + .../mail/CassandraMailboxMapperAclTest.java | 1 + .../mail/CassandraMessageIdMapperTest.java | 1 + .../mail/CassandraMessageMapperTest.java | 1 + .../mail/CassandraMessageMoveTest.java | 1 + ...assandraMessageWithAttachmentMapperTest.java | 1 + .../mailbox/elasticsearch/json/FieldImpl.java | 3 + .../hbase/HBaseMailboxSessionMapperFactory.java | 10 +- .../mailbox/hbase/HBaseMessageManager.java | 3 - .../hbase/HBaseNonTransactionalMapper.java | 3 - .../mailbox/hbase/io/ChunkInputStream.java | 8 -- .../mailbox/hbase/io/ChunkOutputStream.java | 5 - .../mailbox/hbase/mail/HBaseMessageMapper.java | 8 -- .../mailbox/hbase/mail/HBaseUidProvider.java | 14 --- .../mailbox/hbase/mail/model/HBaseMailbox.java | 30 ----- .../hbase/user/HBaseSubscriptionMapper.java | 16 --- .../mailbox/hbase/HBaseMailboxManagerTest.java | 1 + .../mailbox/jcr/AbstractJCRScalingMapper.java | 6 +- .../mailbox/jcr/JCRRepositoryAuthenticator.java | 5 +- .../mailbox/jcr/mail/JCRMailboxMapper.java | 38 +----- .../mailbox/jcr/mail/JCRMessageMapper.java | 39 ++---- .../mailbox/jcr/mail/model/JCRMailbox.java | 54 ++------- .../mailbox/jcr/mail/model/JCRProperty.java | 31 +---- .../mailbox/jcr/user/JCRSubscriptionMapper.java | 31 +---- .../mailbox/jcr/user/model/JCRSubscription.java | 28 +---- .../jcr/JCRMailboxManagerStressTest.java | 1 + .../mailbox/jcr/JCRMailboxManagerTest.java | 2 + .../mailbox/jpa/JPASubscriptionManager.java | 4 +- .../mailbox/jpa/JPATransactionalMapper.java | 10 +- .../mailbox/jpa/mail/JPAMailboxMapper.java | 24 +--- .../mailbox/jpa/mail/JPAMessageMapper.java | 26 +--- .../mailbox/jpa/mail/model/JPAMailbox.java | 29 ++--- .../mailbox/jpa/mail/model/JPAProperty.java | 3 + .../openjpa/AbstractJPAMailboxMessage.java | 35 ++---- .../mailbox/jpa/user/JPASubscriptionMapper.java | 19 +-- .../mailbox/jpa/user/model/JPASubscription.java | 8 +- .../mailbox/jpa/JPAMailboxManagerTest.java | 2 + .../mailbox/jpa/JPASubscriptionManagerTest.java | 1 + .../jpa/JpaMailboxManagerStressTest.java | 1 + .../jpa/mail/JpaAnnotationMapperTest.java | 1 + .../mailbox/jpa/mail/JpaMailboxMapperTest.java | 1 + .../mailbox/jpa/mail/JpaMessageMapperTest.java | 1 + .../mailbox/kafka/KafkaMessageConsumer.java | 3 + .../lucene/search/LuceneMessageSearchIndex.java | 6 - .../lucene/search/StrictImapSearchAnalyzer.java | 1 + .../LuceneMailboxMessageSearchIndexTest.java | 9 ++ .../maildir/mail/MaildirMailboxMapper.java | 21 ---- .../maildir/mail/MaildirMessageMapper.java | 27 ----- .../maildir/user/MaildirSubscriptionMapper.java | 15 --- ...mainUserMaildirMailboxManagerStressTest.java | 1 + .../DomainUserMaildirMailboxManagerTest.java | 1 + ...FullUserMaildirMailboxManagerStressTest.java | 1 + .../FullUserMaildirMailboxManagerTest.java | 1 + .../UserMaildirMailboxManagerStressTest.java | 1 + .../inmemory/mail/InMemoryMailboxMapper.java | 30 ++--- .../user/InMemorySubscriptionMapper.java | 5 + .../InMemoryCombinationManagerTest.java | 1 + .../InMemoryMessageIdManagerStorageTest.java | 1 + .../inmemory/InMemoryMessageManagerTest.java | 1 + .../MemoryMailboxManagerStressTest.java | 1 + .../inmemory/MemoryMailboxManagerTest.java | 1 + .../InMemoryMailboxManagerAttachmentTest.java | 1 + .../mail/InMemoryMessageIdMapperTest.java | 1 + .../mail/MemoryAnnotationMapperTest.java | 1 + .../mail/MemoryAttachmentMapperTest.java | 1 + .../mail/MemoryMailboxMapperAclTest.java | 1 + .../inmemory/mail/MemoryMailboxMapperTest.java | 1 + .../inmemory/mail/MemoryMessageMapperTest.java | 1 + .../inmemory/mail/MemoryMessageMoveTest.java | 1 + .../MemoryMessageWithAttachmentMapperTest.java | 1 + .../InMemoryPerUserMaxQuotaManagerTest.java | 1 + .../james/mailbox/store/FakeAuthenticator.java | 1 + .../mailbox/store/ImmutableMailboxMessage.java | 21 ++++ .../james/mailbox/store/LazyMimeDescriptor.java | 3 - .../store/MailboxSessionMapperFactory.java | 15 +-- .../james/mailbox/store/MessageResultImpl.java | 49 ++------ .../james/mailbox/store/MimeDescriptorImpl.java | 16 +++ .../james/mailbox/store/ResultHeader.java | 16 +-- .../mailbox/store/SimpleMailboxMetaData.java | 14 +-- .../mailbox/store/SimpleMailboxSession.java | 43 ++----- .../mailbox/store/StoreMailboxManager.java | 1 + .../mailbox/store/StoreMessageManager.java | 23 +--- .../store/StoreMessageResultIterator.java | 14 +++ .../mailbox/store/StoreSubscriptionManager.java | 20 +-- .../james/mailbox/store/event/EventFactory.java | 12 ++ .../BroadcastDelegatingMailboxListener.java | 1 + .../RegisteredDelegatingMailboxListener.java | 1 + .../store/json/JacksonEventSerializer.java | 2 + .../store/mail/model/impl/SimpleMailbox.java | 40 ++---- .../mail/model/impl/SimpleMailboxMessage.java | 12 ++ .../store/mail/model/impl/SimpleProperty.java | 12 +- .../mailbox/store/quota/StoreQuotaManager.java | 2 + .../mailbox/store/streaming/ByteContent.java | 4 +- .../store/streaming/CountingInputStream.java | 4 +- .../store/streaming/InputStreamContent.java | 8 +- .../transaction/NonTransactionalMapper.java | 4 +- .../store/transaction/TransactionalMapper.java | 4 +- .../user/model/impl/SimpleSubscription.java | 2 + .../mailbox/store/SimpleMailboxMembership.java | 22 ++++ .../james/mailbox/store/SimpleProperty.java | 3 + .../StoreMessageIdManagerSideEffectTest.java | 1 + .../mailbox/store/StringBuilderChannel.java | 3 + .../james/mailbox/copier/MailboxCopierImpl.java | 4 +- .../james/mailbox/indexer/ReIndexerImpl.java | 2 + .../command/IMAP165JpaMigrateCommand.java | 4 +- .../command/IMAP168JpaMigrateCommand.java | 4 +- .../command/IMAP172JpaMigrateCommand.java | 4 +- .../command/IMAP176JpaMigrateCommand.java | 4 +- .../command/IMAP180JpaMigrateCommand.java | 4 +- .../command/IMAP184JpaMigrateCommand.java | 4 +- .../james/ai/classic/BayesianAnalysis.java | 3 + .../ai/classic/BayesianAnalysisFeeder.java | 3 + .../james/ai/classic/CorpusLoaderThread.java | 1 + .../ai/classic/TokenProbabilityStrength.java | 1 + .../base/AutomaticallySentMailDetectorImpl.java | 4 + .../org/apache/mailet/base/GenericMailet.java | 9 ++ .../org/apache/mailet/base/GenericMatcher.java | 8 ++ .../mailet/base/GenericRecipientMatcher.java | 1 + .../org/apache/mailet/base/MatcherInverter.java | 17 +-- .../base/mail/AbstractDataContentHandler.java | 13 +- .../mail/MessageDispositionNotification.java | 13 +- .../mailet/base/mail/MultipartReport.java | 13 +- .../apache/mailet/base/MatcherInverterTest.java | 3 + .../mailet/base/test/FakeMailContext.java | 23 ++++ .../mailet/base/test/FakeMailetConfig.java | 4 + .../apache/james/transport/SMIMEKeyHolder.java | 5 + .../james/transport/mailets/AbstractSign.java | 5 +- .../transport/mailets/SMIMECheckSignature.java | 2 + .../james/transport/mailets/SMIMEDecrypt.java | 5 +- .../james/transport/mailets/SMIMESign.java | 10 +- .../apache/james/transport/mailets/Sign.java | 9 +- .../transport/matcher/IsSMIMEEncrypted.java | 4 +- .../james/transport/matcher/IsSMIMESigned.java | 4 +- .../matcher/IsX509CertificateSubject.java | 2 + .../james/mailet/AbstractMailetdocsReport.java | 8 ++ .../james/mailet/AggregateMailetdocsReport.java | 1 + .../james/mailet/MailetMatcherDescriptor.java | 4 +- .../apache/james/mailet/MailetdocsReport.java | 1 + .../transport/mailets/AddHabeasWarrantMark.java | 2 + .../james/transport/mailets/ClamAVScan.java | 11 +- .../james/transport/mailets/ClassifyBounce.java | 11 +- .../james/transport/mailets/HeadersToHTTP.java | 11 +- .../james/transport/mailets/OnlyText.java | 8 +- .../transport/mailets/PostmasterAlias.java | 7 +- .../transport/mailets/RecoverAttachment.java | 13 +- .../transport/mailets/RemoveMailAttribute.java | 1 + .../transport/mailets/SerialiseToHTTP.java | 11 +- .../james/transport/mailets/ServerTime.java | 7 +- .../transport/mailets/StripAttachment.java | 5 - .../james/transport/mailets/UnwrapText.java | 8 +- .../transport/mailets/UseHeaderRecipients.java | 8 +- .../james/transport/mailets/WrapText.java | 8 +- .../james/transport/mailets/debug/Counter.java | 2 + .../transport/mailets/debug/DumpSystemErr.java | 7 +- .../mailets/debug/ExceptionThrowingMailet.java | 7 +- .../james/transport/mailets/debug/Identity.java | 12 +- .../matchers/AbstractQuotaMatcher.java | 1 + .../apache/james/transport/matchers/All.java | 5 +- .../matchers/AttachmentFileNameIs.java | 6 +- .../transport/matchers/CommandForListserv.java | 10 +- .../matchers/CommandListservMatcher.java | 6 +- .../matchers/CompareNumericHeaderValue.java | 10 +- .../james/transport/matchers/FetchedFrom.java | 1 + .../transport/matchers/FileRegexMatcher.java | 4 +- .../transport/matchers/GenericRegexMatcher.java | 8 +- .../james/transport/matchers/HasAttachment.java | 1 + .../matchers/HasHabeasWarrantMark.java | 2 + .../james/transport/matchers/HasHeader.java | 2 + .../transport/matchers/HasHeaderWithPrefix.java | 1 + .../transport/matchers/HasMailAttribute.java | 8 +- .../matchers/HasMailAttributeWithValue.java | 12 +- .../HasMailAttributeWithValueRegex.java | 8 +- .../james/transport/matchers/HasMimeType.java | 2 + .../apache/james/transport/matchers/HostIs.java | 10 +- .../james/transport/matchers/HostIsLocal.java | 5 +- .../transport/matchers/IsSingleRecipient.java | 1 + .../james/transport/matchers/NESSpamCheck.java | 1 + .../james/transport/matchers/RecipientIs.java | 2 + .../transport/matchers/RecipientIsLocal.java | 1 + .../transport/matchers/RecipientIsRegex.java | 2 + .../james/transport/matchers/RelayLimit.java | 2 + .../transport/matchers/SMTPAuthSuccessful.java | 1 + .../transport/matchers/SMTPAuthUserIs.java | 2 + .../transport/matchers/SMTPIsAuthNetwork.java | 1 + .../james/transport/matchers/SenderHostIs.java | 2 + .../transport/matchers/SenderHostIsLocal.java | 1 + .../james/transport/matchers/SenderIs.java | 2 + .../james/transport/matchers/SenderIsLocal.java | 1 + .../james/transport/matchers/SenderIsNull.java | 1 + .../james/transport/matchers/SenderIsRegex.java | 2 + .../james/transport/matchers/SentByMailet.java | 1 + .../transport/matchers/SizeGreaterThan.java | 10 +- .../james/transport/matchers/SubjectIs.java | 1 + .../transport/matchers/SubjectStartsWith.java | 1 + .../apache/james/transport/matchers/UserIs.java | 2 + .../matchers/HasMailAttributeTest.java | 3 + .../HasMailAttributeWithValueRegexTest.java | 4 + .../matchers/HasMailAttributeWithValueTest.java | 3 + .../transport/matchers/SMTPAuthUserIsTest.java | 5 + .../james/mpt/ant/MailProtocolTestTask.java | 3 + .../org/apache/james/mpt/ant/TestAddUser.java | 2 + .../apache/james/mpt/ant/TestRunScripts.java | 3 + .../main/java/org/apache/james/mpt/Runner.java | 1 + .../org/apache/james/mpt/api/HostSystem.java | 1 + .../james/mpt/helper/ByteBufferInputStream.java | 1 + .../mpt/helper/ByteBufferOutputStream.java | 1 + .../apache/james/mpt/helper/ScriptBuilder.java | 1 + .../james/mpt/host/ExternalHostSystem.java | 4 + .../apache/james/mpt/monitor/NullMonitor.java | 3 + .../james/mpt/monitor/SystemLoggingMonitor.java | 3 + .../protocol/FileProtocolSessionBuilder.java | 1 + .../james/mpt/protocol/ProtocolSession.java | 16 +++ .../GenericSimpleScriptedTestProtocol.java | 2 + .../mpt/script/ImapScriptedTestProtocol.java | 1 + .../james/mpt/session/ExternalSession.java | 5 + .../mpt/session/ExternalSessionFactory.java | 1 + .../james/mpt/user/ScriptedUserAdder.java | 1 + .../org/apache/james/mpt/DiscardProtocol.java | 3 + .../apache/james/mpt/TestDiscardProtocol.java | 1 + .../apache/james/mpt/TestScriptedUserAdder.java | 2 + .../cassandra/CassandraQuotaTest.java | 1 + .../james/mpt/host/JamesImapHostSystem.java | 8 ++ .../mpt/imapmailbox/cyrus/CyrusACLCommands.java | 1 + .../imapmailbox/cyrus/CyrusACLIntegration.java | 1 + .../imapmailbox/cyrus/host/CyrusHostSystem.java | 2 + .../cyrus/host/GrantRightsOnCyrusHost.java | 1 + .../host/MailboxMessageAppenderOnCyrusHost.java | 1 + .../ElasticSearchUidSearchOnIndex.java | 1 + .../james/JamesDeploymentValidation.java | 1 + .../james/host/ExternalJamesHostSystem.java | 2 + .../hbase/HBaseAuthenticatePlain.java | 1 + .../hbase/HBaseAuthenticatedState.java | 1 + .../hbase/HBaseConcurrentSessions.java | 1 + .../mpt/imapmailbox/hbase/HBaseCondstore.java | 1 + .../james/mpt/imapmailbox/hbase/HBaseCopy.java | 1 + .../mpt/imapmailbox/hbase/HBaseEvents.java | 1 + .../mpt/imapmailbox/hbase/HBaseExpunge.java | 1 + .../james/mpt/imapmailbox/hbase/HBaseFetch.java | 1 + .../hbase/HBaseFetchBodySection.java | 1 + .../hbase/HBaseFetchBodyStructure.java | 1 + .../imapmailbox/hbase/HBaseFetchHeaders.java | 1 + .../mpt/imapmailbox/hbase/HBaseListing.java | 1 + .../hbase/HBaseMailboxAnnotation.java | 1 + .../hbase/HBaseMailboxWithLongNameError.java | 1 + .../james/mpt/imapmailbox/hbase/HBaseMove.java | 1 + .../hbase/HBaseNonAuthenticatedState.java | 1 + .../imapmailbox/hbase/HBasePartialFetch.java | 1 + .../mpt/imapmailbox/hbase/HBaseQuotaTest.java | 2 + .../mpt/imapmailbox/hbase/HBaseRename.java | 1 + .../mpt/imapmailbox/hbase/HBaseSearch.java | 1 + .../mpt/imapmailbox/hbase/HBaseSecurity.java | 1 + .../mpt/imapmailbox/hbase/HBaseSelect.java | 1 + .../imapmailbox/hbase/HBaseSelectedInbox.java | 1 + .../imapmailbox/hbase/HBaseSelectedState.java | 1 + .../mpt/imapmailbox/hbase/HBaseUidSearch.java | 1 + .../hbase/HBaseUidSearchOnIndex.java | 1 + .../hbase/HBaseUserFlagsSupport.java | 1 + .../inmemory/InMemoryAuthenticatePlain.java | 1 + .../inmemory/InMemoryAuthenticatedState.java | 1 + .../inmemory/InMemoryConcurrentSessions.java | 1 + .../imapmailbox/inmemory/InMemoryCondstore.java | 1 + .../mpt/imapmailbox/inmemory/InMemoryCopy.java | 1 + .../imapmailbox/inmemory/InMemoryEvents.java | 1 + .../imapmailbox/inmemory/InMemoryExpunge.java | 1 + .../mpt/imapmailbox/inmemory/InMemoryFetch.java | 1 + .../inmemory/InMemoryFetchBodySection.java | 1 + .../inmemory/InMemoryFetchBodyStructure.java | 1 + .../inmemory/InMemoryFetchHeaders.java | 1 + .../imapmailbox/inmemory/InMemoryListing.java | 1 + .../InMemoryListingWithSharingTest.java | 1 + .../inmemory/InMemoryMailboxAnnotation.java | 1 + .../InMemoryMailboxWithLongNameSuccess.java | 1 + .../mpt/imapmailbox/inmemory/InMemoryMove.java | 1 + .../inmemory/InMemoryNonAuthenticatedState.java | 1 + .../inmemory/InMemoryPartialFetch.java | 1 + .../imapmailbox/inmemory/InMemoryQuotaTest.java | 2 + .../imapmailbox/inmemory/InMemoryRename.java | 1 + .../imapmailbox/inmemory/InMemorySearch.java | 1 + .../imapmailbox/inmemory/InMemorySecurity.java | 1 + .../imapmailbox/inmemory/InMemorySelect.java | 1 + .../inmemory/InMemorySelectedInbox.java | 1 + .../inmemory/InMemorySelectedState.java | 1 + .../imapmailbox/inmemory/InMemoryUidSearch.java | 1 + .../inmemory/InMemoryUidSearchOnIndex.java | 1 + .../inmemory/InMemoryUserFlagsSupport.java | 1 + .../imapmailbox/jpa/JpaAuthenticatePlain.java | 1 + .../imapmailbox/jpa/JpaAuthenticatedState.java | 1 + .../imapmailbox/jpa/JpaConcurrentSessions.java | 1 + .../james/mpt/imapmailbox/jpa/JpaCondstore.java | 1 + .../james/mpt/imapmailbox/jpa/JpaCopy.java | 1 + .../james/mpt/imapmailbox/jpa/JpaEvents.java | 1 + .../james/mpt/imapmailbox/jpa/JpaExpunge.java | 1 + .../james/mpt/imapmailbox/jpa/JpaFetch.java | 1 + .../imapmailbox/jpa/JpaFetchBodySection.java | 1 + .../imapmailbox/jpa/JpaFetchBodyStructure.java | 1 + .../mpt/imapmailbox/jpa/JpaFetchHeaders.java | 1 + .../james/mpt/imapmailbox/jpa/JpaListing.java | 1 + .../imapmailbox/jpa/JpaMailboxAnnotation.java | 1 + .../jpa/JpaMailboxWithLongNameError.java | 1 + .../james/mpt/imapmailbox/jpa/JpaMove.java | 1 + .../jpa/JpaNonAuthenticatedState.java | 1 + .../mpt/imapmailbox/jpa/JpaPartialFetch.java | 1 + .../james/mpt/imapmailbox/jpa/JpaQuotaTest.java | 2 + .../james/mpt/imapmailbox/jpa/JpaRename.java | 1 + .../james/mpt/imapmailbox/jpa/JpaSearch.java | 1 + .../james/mpt/imapmailbox/jpa/JpaSecurity.java | 1 + .../james/mpt/imapmailbox/jpa/JpaSelect.java | 1 + .../mpt/imapmailbox/jpa/JpaSelectedInbox.java | 1 + .../mpt/imapmailbox/jpa/JpaSelectedState.java | 1 + .../james/mpt/imapmailbox/jpa/JpaUidSearch.java | 1 + .../imapmailbox/jpa/JpaUidSearchOnIndex.java | 1 + .../imapmailbox/jpa/JpaUserFlagsSupport.java | 1 + .../lucenesearch/LuceneAuthenticatePlain.java | 1 + .../lucenesearch/LuceneAuthenticatedState.java | 1 + .../lucenesearch/LuceneConcurrentSessions.java | 1 + .../lucenesearch/LuceneCondstore.java | 1 + .../imapmailbox/lucenesearch/LuceneCopy.java | 1 + .../imapmailbox/lucenesearch/LuceneEvents.java | 1 + .../imapmailbox/lucenesearch/LuceneExpunge.java | 1 + .../imapmailbox/lucenesearch/LuceneFetch.java | 1 + .../lucenesearch/LuceneFetchBodySection.java | 1 + .../lucenesearch/LuceneFetchBodyStructure.java | 1 + .../lucenesearch/LuceneFetchHeaders.java | 1 + .../imapmailbox/lucenesearch/LuceneListing.java | 1 + .../lucenesearch/LuceneMailboxAnnotation.java | 1 + .../LuceneMailboxWithLongNameError.java | 1 + .../imapmailbox/lucenesearch/LuceneMove.java | 1 + .../LuceneNonAuthenticatedState.java | 1 + .../lucenesearch/LucenePartialFetch.java | 1 + .../lucenesearch/LuceneQuotaTest.java | 2 + .../imapmailbox/lucenesearch/LuceneRename.java | 1 + .../imapmailbox/lucenesearch/LuceneSearch.java | 1 + .../lucenesearch/LuceneSecurity.java | 1 + .../imapmailbox/lucenesearch/LuceneSelect.java | 1 + .../lucenesearch/LuceneSelectedInbox.java | 1 + .../lucenesearch/LuceneSelectedState.java | 1 + .../lucenesearch/LuceneUidSearch.java | 1 + .../lucenesearch/LuceneUidSearchOnIndex.java | 1 + .../lucenesearch/LuceneUserFlagsSupport.java | 1 + .../maildir/MaildirAuthenticatePlain.java | 1 + .../maildir/MaildirAuthenticatedState.java | 1 + .../maildir/MaildirConcurrentSessions.java | 1 + .../imapmailbox/maildir/MaildirCondstore.java | 1 + .../mpt/imapmailbox/maildir/MaildirCopy.java | 1 + .../mpt/imapmailbox/maildir/MaildirEvents.java | 1 + .../mpt/imapmailbox/maildir/MaildirExpunge.java | 1 + .../mpt/imapmailbox/maildir/MaildirFetch.java | 1 + .../maildir/MaildirFetchBodySection.java | 1 + .../maildir/MaildirFetchBodyStructure.java | 1 + .../maildir/MaildirFetchHeaders.java | 1 + .../mpt/imapmailbox/maildir/MaildirListing.java | 1 + .../maildir/MaildirMailboxAnnotation.java | 1 + .../MaildirMailboxWithLongNameError.java | 1 + .../mpt/imapmailbox/maildir/MaildirMove.java | 1 + .../maildir/MaildirNonAuthenticatedState.java | 1 + .../maildir/MaildirPartialFetch.java | 1 + .../imapmailbox/maildir/MaildirQuotaTest.java | 2 + .../mpt/imapmailbox/maildir/MaildirRename.java | 1 + .../mpt/imapmailbox/maildir/MaildirSearch.java | 1 + .../imapmailbox/maildir/MaildirSecurity.java | 1 + .../mpt/imapmailbox/maildir/MaildirSelect.java | 1 + .../maildir/MaildirSelectedInbox.java | 1 + .../maildir/MaildirSelectedState.java | 1 + .../imapmailbox/maildir/MaildirUidSearch.java | 1 + .../maildir/MaildirUidSearchOnIndex.java | 1 + .../maildir/MaildirUserFlagsSupport.java | 1 + .../cassandra/CassandraAuthenticateTest.java | 2 + .../cassandra/CassandraCapabilityTest.java | 2 + .../cassandra/CassandraCheckScriptTest.java | 2 + .../cassandra/CassandraDeleteScriptTest.java | 2 + .../cassandra/CassandraGetScriptTest.java | 2 + .../cassandra/CassandraHaveSpaceTest.java | 2 + .../cassandra/CassandraListScriptsTest.java | 2 + .../cassandra/CassandraLogoutTest.java | 2 + .../cassandra/CassandraNoopTest.java | 2 + .../cassandra/CassandraPutScriptTest.java | 2 + .../cassandra/CassandraRenameScriptTest.java | 2 + .../cassandra/CassandraSetActiveTest.java | 2 + .../cassandra/CassandraStartTlsTest.java | 2 + .../cassandra/CassandraUnauthenticatedTest.java | 2 + .../cassandra/host/CassandraHostSystem.java | 2 + .../managesieve/file/FileAuthenticateTest.java | 2 + .../managesieve/file/FileCapabilityTest.java | 2 + .../managesieve/file/FileCheckScriptTest.java | 2 + .../managesieve/file/FileDeleteScriptTest.java | 2 + .../mpt/managesieve/file/FileGetScriptTest.java | 2 + .../mpt/managesieve/file/FileHaveSpaceTest.java | 2 + .../managesieve/file/FileListScriptsTest.java | 2 + .../mpt/managesieve/file/FileLogoutTest.java | 2 + .../mpt/managesieve/file/FileNoopTest.java | 2 + .../mpt/managesieve/file/FilePutScriptTest.java | 2 + .../managesieve/file/FileRenameScriptTest.java | 2 + .../mpt/managesieve/file/FileSetActiveTest.java | 2 + .../mpt/managesieve/file/FileStartTlsTest.java | 2 + .../file/FileUnauthenticatedTest.java | 2 + .../managesieve/file/host/FileHostSystem.java | 3 + .../mpt/smtp/CassandraForwardSmtpTest.java | 1 + .../smtp/CassandraSmtpStarttlsCommandTest.java | 1 + .../smtp/host/CassandraJamesSmtpHostSystem.java | 1 + .../james/mpt/maven/MailProtocolTest.java | 15 +-- .../james/mpt/maven/MailProtocolTestMojo.java | 1 + .../api/AbstractProtocolTransport.java | 4 +- .../james/protocols/api/AbstractResponse.java | 5 + .../apache/james/protocols/api/BaseRequest.java | 8 +- .../protocols/api/CombinedInputStream.java | 8 +- .../api/ProtocolConfigurationImpl.java | 17 +-- .../james/protocols/api/ProtocolImpl.java | 15 +-- .../protocols/api/ProtocolSessionImpl.java | 72 +++-------- .../apache/james/protocols/api/Response.java | 3 + .../api/future/FutureResponseImpl.java | 26 +--- .../api/future/FutureStreamResponseImpl.java | 5 +- .../handler/AbstractProtocolHandlerChain.java | 9 +- .../api/handler/CommandDispatcher.java | 14 +-- .../api/handler/CommandHandlerResultLogger.java | 1 + .../protocols/api/handler/MultiLineHandler.java | 5 +- .../api/handler/ProtocolHandlerChainImpl.java | 121 +++++-------------- .../api/handler/UnknownCommandHandler.java | 5 +- .../api/AbstractProtocolTransportTest.java | 16 +++ .../api/utils/BogusTrustManagerFactory.java | 3 + .../apache/james/imap/api/message/IdRange.java | 5 + .../imap/decode/ImapRequestLineReader.java | 4 + .../decode/base/AbstractImapCommandParser.java | 10 +- .../imap/decode/main/DefaultImapDecoder.java | 6 +- .../AbstractMessageRangeCommandParser.java | 1 + .../parser/AbstractSelectionCommandParser.java | 2 + .../decode/parser/AbstractUidCommandParser.java | 1 + .../imap/decode/parser/AppendCommandParser.java | 7 +- .../parser/AuthenticateCommandParser.java | 7 +- .../decode/parser/CapabilityCommandParser.java | 7 +- .../imap/decode/parser/CheckCommandParser.java | 7 +- .../imap/decode/parser/CloseCommandParser.java | 7 +- .../decode/parser/CompressCommandParser.java | 7 +- .../imap/decode/parser/CreateCommandParser.java | 7 +- .../imap/decode/parser/DeleteCommandParser.java | 7 +- .../decode/parser/ExpungeCommandParser.java | 7 +- .../imap/decode/parser/FetchCommandParser.java | 9 +- .../imap/decode/parser/IdleCommandParser.java | 7 +- .../imap/decode/parser/ImapParserFactory.java | 4 +- .../imap/decode/parser/ListCommandParser.java | 8 +- .../imap/decode/parser/LoginCommandParser.java | 7 +- .../imap/decode/parser/LogoutCommandParser.java | 7 +- .../imap/decode/parser/LsubCommandParser.java | 6 +- .../decode/parser/NamespaceCommandParser.java | 7 +- .../imap/decode/parser/NoopCommandParser.java | 7 +- .../imap/decode/parser/RenameCommandParser.java | 7 +- .../imap/decode/parser/SearchCommandParser.java | 1 + .../decode/parser/StartTLSCommandParser.java | 7 +- .../imap/decode/parser/StatusCommandParser.java | 7 +- .../imap/decode/parser/StoreCommandParser.java | 8 +- .../decode/parser/SubscribeCommandParser.java | 7 +- .../imap/decode/parser/UidCommandParser.java | 15 +-- .../decode/parser/UnselectCommandParser.java | 7 +- .../decode/parser/UnsubscribeCommandParser.java | 7 +- .../james/imap/encode/ACLResponseEncoder.java | 9 +- .../imap/encode/AnnotationResponseEncoder.java | 2 + .../encode/AuthenticateResponseEncoder.java | 10 +- .../imap/encode/CapabilityResponseEncoder.java | 13 +- .../encode/ContinuationResponseEncoder.java | 2 + .../imap/encode/ESearchResponseEncoder.java | 6 +- .../imap/encode/EnableResponseEncoder.java | 14 +-- .../imap/encode/ExistsResponseEncoder.java | 2 + .../imap/encode/ExpungeResponseEncoder.java | 2 + .../james/imap/encode/FetchResponseEncoder.java | 2 + .../james/imap/encode/FlagsResponseEncoder.java | 2 + .../james/imap/encode/LSubResponseEncoder.java | 2 + .../james/imap/encode/ListResponseEncoder.java | 2 + .../imap/encode/ListRightsResponseEncoder.java | 14 +-- .../encode/MailboxStatusResponseEncoder.java | 2 + .../imap/encode/MyRightsResponseEncoder.java | 16 +-- .../james/imap/encode/QuotaResponseEncoder.java | 9 +- .../imap/encode/QuotaRootResponseEncoder.java | 9 +- .../imap/encode/RecentResponseEncoder.java | 2 + .../imap/encode/SearchResponseEncoder.java | 2 + .../imap/encode/StatusResponseEncoder.java | 2 + .../james/imap/encode/XListResponseEncoder.java | 2 + .../encode/base/AbstractChainedImapEncoder.java | 1 + .../james/imap/encode/base/EndImapEncoder.java | 6 +- .../encode/base/ImapResponseComposerImpl.java | 105 ++++------------ .../encode/main/DefaultImapEncoderFactory.java | 4 +- .../imap/encode/main/DefaultLocalizer.java | 4 +- .../imap/main/AbstractImapRequestHandler.java | 1 + .../imap/main/DefaultImapDecoderFactory.java | 1 + .../apache/james/imap/main/ResponseEncoder.java | 1 + .../message/request/AbstractImapRequest.java | 2 + .../response/AbstactStatusResponseFactory.java | 16 +++ .../response/ImmutableStatusResponse.java | 20 +-- .../response/UnpooledStatusResponseFactory.java | 1 + .../processor/AbstractSelectionProcessor.java | 22 +--- .../james/imap/processor/AppendProcessor.java | 8 +- .../imap/processor/AuthenticateProcessor.java | 13 +- .../imap/processor/CapabilityProcessor.java | 13 +- .../james/imap/processor/CheckProcessor.java | 1 + .../james/imap/processor/CloseProcessor.java | 1 + .../james/imap/processor/CompressProcessor.java | 12 +- .../james/imap/processor/CreateProcessor.java | 8 +- .../imap/processor/DeleteACLProcessor.java | 7 +- .../james/imap/processor/DeleteProcessor.java | 8 +- .../james/imap/processor/EnableProcessor.java | 12 +- .../james/imap/processor/ExpungeProcessor.java | 6 +- .../james/imap/processor/GetACLProcessor.java | 7 +- .../imap/processor/GetAnnotationProcessor.java | 4 +- .../james/imap/processor/GetQuotaProcessor.java | 7 +- .../imap/processor/GetQuotaRootProcessor.java | 1 + .../james/imap/processor/IdleProcessor.java | 5 + .../james/imap/processor/LSubProcessor.java | 8 +- .../james/imap/processor/ListProcessor.java | 14 +-- .../imap/processor/ListRightsProcessor.java | 7 +- .../james/imap/processor/LoginProcessor.java | 12 +- .../james/imap/processor/LogoutProcessor.java | 1 + .../james/imap/processor/MyRightsProcessor.java | 5 +- .../imap/processor/NamespaceProcessor.java | 5 +- .../james/imap/processor/NoopProcessor.java | 1 + .../james/imap/processor/RenameProcessor.java | 9 +- .../james/imap/processor/SearchProcessor.java | 6 +- .../james/imap/processor/SetACLProcessor.java | 7 +- .../imap/processor/SetAnnotationProcessor.java | 4 +- .../james/imap/processor/SetQuotaProcessor.java | 1 + .../james/imap/processor/StartTLSProcessor.java | 13 +- .../james/imap/processor/StatusProcessor.java | 9 +- .../james/imap/processor/StoreProcessor.java | 7 +- .../imap/processor/SubscribeProcessor.java | 8 +- .../james/imap/processor/UnselectProcessor.java | 14 +-- .../imap/processor/UnsubscribeProcessor.java | 8 +- .../james/imap/processor/XListProcessor.java | 5 +- .../base/AbstractChainedProcessor.java | 6 - .../base/ImapResponseMessageProcessor.java | 1 + .../processor/base/SelectedMailboxImpl.java | 9 ++ .../processor/base/UnknownRequestProcessor.java | 1 + .../james/imap/processor/fetch/AddressImpl.java | 16 +-- .../processor/fetch/ContentBodyElement.java | 13 +- .../imap/processor/fetch/EmptyContent.java | 5 +- .../imap/processor/fetch/EnvelopeImpl.java | 40 ++---- .../imap/processor/fetch/FetchProcessor.java | 8 +- .../imap/processor/fetch/MimeBodyElement.java | 14 +-- .../fetch/MimeDescriptorStructure.java | 64 +++------- .../imap/processor/fetch/MimePathImpl.java | 4 +- .../fetch/PartialFetchBodyElement.java | 20 +-- .../james/protocols/imap/DecodingException.java | 1 + .../james/protocols/imap/IMAPRequest.java | 13 +- .../james/protocols/imap/IMAPSession.java | 2 + .../imap/core/IMAPCommandDispatcher.java | 1 + .../imap/utils/FixedLengthInputStream.java | 9 ++ .../decode/ImapRequestStreamLineReader.java | 6 +- .../main/OutputStreamImapResponseWriter.java | 9 +- .../james/imap/encode/FakeImapSession.java | 20 ++- .../encode/base/ByteImapResponseWriter.java | 5 +- .../UnpooledStatusResponseFactoryTest.java | 1 + .../james/imap/processor/LSubProcessorTest.java | 3 + .../processor/StatusResponseTypeMatcher.java | 8 +- .../base/FakeMailboxListenerFlagsUpdate.java | 4 +- .../base/MailboxEventAnalyserTest.java | 4 + .../fetch/MailboxMessageResultUtilsTest.java | 4 + .../james/protocols/lmtp/LMTPConfiguration.java | 16 +-- .../protocols/lmtp/LMTPConfigurationImpl.java | 5 +- .../james/protocols/lmtp/LMTPMultiResponse.java | 15 +-- .../protocols/lmtp/AbstractLMTPSServerTest.java | 1 + .../protocols/lmtp/AbstractLMTPServerTest.java | 4 + .../apache/james/managesieve/jsieve/Parser.java | 2 + .../james/managesieve/util/SettableSession.java | 9 ++ .../protocols/netty/AbstractAsyncServer.java | 30 +---- .../netty/AbstractChannelPipelineFactory.java | 4 +- .../protocols/netty/NettyProtocolTransport.java | 40 ++---- .../james/protocols/pop3/POP3Response.java | 1 + .../james/protocols/pop3/POP3SessionImpl.java | 17 +-- .../protocols/pop3/POP3StartTlsResponse.java | 3 + .../protocols/pop3/POP3StreamResponse.java | 8 +- .../pop3/core/AbstractApopCmdHandler.java | 5 +- .../pop3/core/AbstractPassCmdHandler.java | 5 +- .../protocols/pop3/core/CapaCmdHandler.java | 23 +--- .../protocols/pop3/core/DeleCmdHandler.java | 5 +- .../protocols/pop3/core/ListCmdHandler.java | 5 +- .../protocols/pop3/core/NoopCmdHandler.java | 5 +- .../protocols/pop3/core/QuitCmdHandler.java | 5 +- .../protocols/pop3/core/RetrCmdHandler.java | 5 +- .../protocols/pop3/core/RsetCmdHandler.java | 5 +- .../protocols/pop3/core/StatCmdHandler.java | 5 +- .../protocols/pop3/core/StlsCmdHandler.java | 12 +- .../protocols/pop3/core/TopCmdHandler.java | 7 +- .../protocols/pop3/core/UidlCmdHandler.java | 9 +- .../protocols/pop3/core/UnknownCmdHandler.java | 1 + .../protocols/pop3/core/UserCmdHandler.java | 9 +- .../pop3/core/WelcomeMessageHandler.java | 5 +- .../protocols/pop3/mailbox/AbstractMailbox.java | 7 +- .../protocols/pop3/mailbox/ImapMailbox.java | 4 + .../james/protocols/pop3/utils/MockMailbox.java | 7 ++ .../pop3/utils/TestPassCmdHandler.java | 1 + .../james/protocols/smtp/MailEnvelopeImpl.java | 20 +-- .../protocols/smtp/SMTPConfigurationImpl.java | 17 +-- .../smtp/SMTPProtocolHandlerChain.java | 1 + .../james/protocols/smtp/SMTPResponse.java | 4 +- .../james/protocols/smtp/SMTPSession.java | 1 + .../james/protocols/smtp/SMTPSessionImpl.java | 17 +-- .../protocols/smtp/SMTPStartTlsResponse.java | 3 + .../AbstractAuthRequiredToRelayRcptHook.java | 7 +- .../smtp/core/AbstractHookableCmdHandler.java | 19 +-- ...tSenderAuthIdentifyVerificationRcptHook.java | 7 +- .../AcceptRecipientIfRelayingIsAllowed.java | 7 +- .../protocols/smtp/core/DataCmdHandler.java | 17 +-- .../smtp/core/DataLineMessageHookHandler.java | 10 +- .../protocols/smtp/core/ExpnCmdHandler.java | 5 +- .../protocols/smtp/core/HeloCmdHandler.java | 26 ++-- .../protocols/smtp/core/HelpCmdHandler.java | 5 +- .../protocols/smtp/core/MailCmdHandler.java | 37 ++---- .../protocols/smtp/core/NoopCmdHandler.java | 5 +- .../smtp/core/PostmasterAbuseRcptHook.java | 4 +- .../protocols/smtp/core/QuitCmdHandler.java | 26 ++-- .../protocols/smtp/core/RcptCmdHandler.java | 18 ++- .../protocols/smtp/core/RsetCmdHandler.java | 5 +- .../smtp/core/SeparatingDataLineFilter.java | 5 +- .../protocols/smtp/core/UnknownCmdHandler.java | 4 +- .../protocols/smtp/core/VrfyCmdHandler.java | 5 +- .../smtp/core/WelcomeMessageHandler.java | 4 +- .../smtp/core/esmtp/AuthCmdHandler.java | 29 ++--- .../smtp/core/esmtp/EhloCmdHandler.java | 39 ++---- .../smtp/core/esmtp/MailSizeEsmtpExtension.java | 22 +--- .../smtp/core/esmtp/StartTlsCmdHandler.java | 6 +- .../core/fastfail/AbstractGreylistHandler.java | 4 +- .../core/fastfail/AbstractValidRcptHandler.java | 4 +- .../smtp/core/fastfail/DNSRBLHandler.java | 4 +- .../smtp/core/fastfail/MaxRcptHandler.java | 4 +- .../core/fastfail/MaxUnknownCmdHandler.java | 5 +- .../fastfail/ResolvableEhloHeloHandler.java | 8 +- .../fastfail/ReverseEqualsEhloHeloHandler.java | 3 - .../smtp/core/fastfail/SpamTrapHandler.java | 4 +- .../fastfail/SupressDuplicateRcptHandler.java | 4 +- .../core/fastfail/ValidSenderDomainHandler.java | 4 +- .../smtp/core/log/HookResultLogger.java | 1 + .../james/protocols/smtp/hook/SimpleHook.java | 4 + .../protocols/smtp/AbstractSMTPServerTest.java | 11 ++ .../smtp/core/fastfail/DNSRBLHandlerTest.java | 6 + .../smtp/core/fastfail/MaxRcptHandlerTest.java | 3 + .../core/fastfail/MaxUnknownCmdHandlerTest.java | 3 + .../fastfail/ResolvableEhloHeloHandlerTest.java | 7 ++ .../fastfail/ValidSenderDomainHandlerTest.java | 4 + .../smtp/utils/BaseFakeSMTPSession.java | 69 ++++------- .../protocols/smtp/utils/TestMessageHook.java | 1 + .../james/app/spring/JamesAppSpringMain.java | 17 +-- .../james/cli/probe/impl/JmxDataProbe.java | 1 + .../james/cli/probe/impl/JmxMailboxProbe.java | 1 + .../james/cli/probe/impl/JmxQuotaProbe.java | 1 + .../james/cli/probe/impl/JmxSieveProbe.java | 1 + .../server/core/JamesServerResourceLoader.java | 19 +-- .../apache/james/server/core/MailHeaders.java | 2 + .../org/apache/james/server/core/MailImpl.java | 2 + .../core/MimeMessageInputStreamSource.java | 2 + .../james/server/core/MimeMessageUtil.java | 3 + .../james/server/core/MimeMessageWrapper.java | 15 --- .../mailbox/ResilientClusterProvider.java | 1 + .../james/modules/server/DNSServiceModule.java | 1 + .../onami/lifecycle/AbstractBasicStageable.java | 3 - .../lifecycle/AbstractMethodTypeListener.java | 3 - .../onami/lifecycle/AbstractStageable.java | 3 - .../james/onami/lifecycle/DefaultStager.java | 18 --- .../onami/lifecycle/LifeCycleStageModule.java | 3 - .../james/onami/lifecycle/NoOpStageHandler.java | 6 - .../james/onami/lifecycle/StageableMethod.java | 3 - .../mailbox/MailboxCopierManagement.java | 12 +- .../mailbox/MailboxManagerManagement.java | 8 -- .../store/UserRepositoryAuthenticator.java | 1 + .../spring/bean/AbstractBeanFactory.java | 1 + .../bean/factory/AbstractBeanFactory.java | 1 + .../MailetLoaderBeanFactory.java | 4 +- .../MatcherLoaderBeanFactory.java | 4 +- .../MailRepositoryStoreBeanFactory.java | 9 +- .../ConfigurationBeanFactoryPostProcessor.java | 1 + .../FileSystemBeanFactoryPostProcessor.java | 5 +- ...erConfigurationBeanFactoryPostProcessor.java | 5 +- ...oxConfigurationBeanFactoryPostProcessor.java | 1 + .../context/JamesServerApplicationContext.java | 25 +--- .../web/JamesServerWebApplicationContext.java | 29 ++--- .../AbstractLifecycleBeanPostProcessor.java | 14 +-- .../lifecycle/ConfigurationProviderImpl.java | 14 +-- .../spring/lifecycle/LogProviderImpl.java | 31 ++--- ...AbstractOSGIAnnotationBeanPostProcessor.java | 12 +- ...OSGIResourceAnnotationBeanPostProcessor.java | 4 +- .../spring/mailbox/SpringResolver.java | 6 +- .../resource/DefaultJamesResourceLoader.java | 5 + .../james/util/BodyOffsetInputStream.java | 12 +- .../james/util/RestrictingRMISocketFactory.java | 2 + .../james/util/bayesian/BayesianAnalyzer.java | 1 + .../JMXEnabledScheduledThreadPoolExecutor.java | 26 ++-- .../JMXEnabledThreadPoolExecutor.java | 26 ++-- .../james/util/retry/DoublingRetrySchedule.java | 5 - .../james/util/retry/ExceptionRetryHandler.java | 11 +- .../util/retry/naming/LoggingRetryHandler.java | 2 - .../naming/NamingExceptionRetryHandler.java | 4 - .../util/retry/naming/RetryingContext.java | 83 +------------ .../naming/directory/RetryingDirContext.java | 66 ---------- .../retry/naming/ldap/RetryingLdapContext.java | 21 ---- .../util/retry/ExceptionRetryHandlerTest.java | 8 -- .../naming/NamingExceptionRetryHandlerTest.java | 8 -- .../cassandra/CassandraDomainListTest.java | 1 + .../CassandraRecipientRewriteTableTest.java | 2 + .../cassandra/CassandraSieveRepositoryTest.java | 1 + .../cassandra/CassandraUsersRepositoryTest.java | 2 + .../mailrepository/file/MBoxMailRepository.java | 39 +++--- .../file/MimeMessageStreamRepositorySource.java | 11 +- .../file/SieveFileRepository.java | 2 + .../james/user/file/UsersFileRepository.java | 39 ++---- .../mailrepository/FileMailRepositoryTest.java | 4 + .../rrt/file/XMLRecipientRewriteTableTest.java | 2 + .../file/SieveFileRepositoryTest.java | 4 + .../user/file/UsersFileRepositoryTest.java | 2 + .../james/domainlist/hbase/HBaseDomainList.java | 9 -- .../rrt/hbase/HBaseRecipientRewriteTable.java | 15 --- .../james/user/hbase/HBaseUsersRepository.java | 27 ----- .../domainlist/hbase/HBaseDomainListTest.java | 4 +- .../hbase/HBaseRecipientRewriteTableTest.java | 4 +- .../user/hbase/HBaseUsersRepositoryTest.java | 3 - .../mailrepository/jcr/JCRMailRepository.java | 7 +- .../james/user/jcr/JCRUsersRepository.java | 8 ++ .../apache/james/user/jcr/model/JCRUser.java | 3 + .../mailrepository/jdbc/JDBCMailRepository.java | 17 +-- .../mailrepository/jdbc/MessageInputStream.java | 38 ++---- .../jdbc/MimeMessageJDBCSource.java | 5 +- .../rrt/jdbc/JDBCRecipientRewriteTable.java | 17 +-- .../user/jdbc/AbstractJdbcUsersRepository.java | 11 +- .../user/jdbc/JamesUsersJdbcRepository.java | 14 +-- .../rrt/jdbc/JDBCRecipientRewriteTableTest.java | 2 + .../jdbc/DefaultUsersJdbcRepositoryTest.java | 2 + .../user/jdbc/JamesUsersJdbcRepositoryTest.java | 2 + .../CassandraAccessTokenRepositoryTest.java | 1 + .../CassandraNotificationRegistryTest.java | 1 + .../CassandraVacationRepositoryTest.java | 1 + .../access/MemoryAccessTokenRepositoryTest.java | 1 + .../james/rrt/jpa/JPARecipientRewriteTable.java | 16 +-- .../james/user/jpa/JPAUsersRepository.java | 17 +-- .../apache/james/user/jpa/model/JPAUser.java | 12 +- .../james/domainlist/jpa/JPADomainListTest.java | 1 + .../rrt/jpa/JPARecipientRewriteTableTest.java | 2 + .../james/user/jpa/JpaUsersRepositoryTest.java | 1 + .../james/user/ldap/ReadOnlyLDAPUser.java | 3 + .../user/ldap/ReadOnlyUsersLDAPRepository.java | 33 ++--- .../lib/AbstractMailRepository.java | 19 ++- .../repository/file/AbstractFileRepository.java | 1 + .../file/ClassLoaderObjectInputStream.java | 1 + .../repository/file/ExtensionFileFilter.java | 1 + .../file/FilePersistentObjectRepository.java | 22 +--- .../file/NumberedRepositoryFileFilter.java | 4 +- .../rrt/lib/AbstractRecipientRewriteTable.java | 68 +++-------- .../lib/RecipientRewriteTableManagement.java | 60 ++------- .../user/lib/AbstractJamesUsersRepository.java | 43 +++---- .../james/user/lib/AbstractUsersRepository.java | 14 +-- .../james/user/lib/model/DefaultJamesUser.java | 32 ++--- .../james/user/lib/model/DefaultUser.java | 12 +- .../domainlist/memory/MemoryDomainListTest.java | 1 + .../memory/MemoryRecipientRewriteTableTest.java | 2 + .../user/memory/MemoryUsersRepositoryTest.java | 1 + .../dnsservice/api/mock/MockDNSService.java | 18 --- .../dnsservice/dnsjava/DNSJavaService.java | 1 + .../library/MXHostAddressIterator.java | 3 - .../configuration/SmtpConfiguration.java | 1 + .../mailetcontainer/impl/JamesMailSpooler.java | 4 +- .../impl/JamesMailetContext.java | 6 +- .../mailetcontainer/impl/MailetConfigImpl.java | 14 +-- .../mailetcontainer/impl/MatcherConfigImpl.java | 3 + .../impl/camel/CamelCompositeProcessor.java | 14 +-- .../impl/camel/CamelMailetProcessor.java | 23 ++-- .../impl/camel/CamelProcessor.java | 1 + .../impl/camel/DisposeProcessor.java | 4 +- .../impl/camel/MailStateEquals.java | 4 +- .../impl/camel/MailStateNotEquals.java | 4 +- .../impl/camel/MatcherMatch.java | 4 +- .../jmx/JMXStateCompositeProcessorListener.java | 11 +- .../jmx/JMXStateMailetProcessorListener.java | 17 +-- .../impl/jmx/MailProcessorManagement.java | 28 ++--- .../impl/jmx/MailetManagement.java | 35 ++---- .../impl/jmx/MatcherManagement.java | 46 ++----- .../mailetcontainer/impl/matchers/And.java | 1 + .../impl/matchers/GenericCompositeMatcher.java | 2 + .../mailetcontainer/impl/matchers/Not.java | 1 + .../james/mailetcontainer/impl/matchers/Or.java | 1 + .../mailetcontainer/impl/matchers/Xor.java | 1 + .../lib/AbstractStateCompositeProcessor.java | 11 +- .../lib/AbstractStateMailetProcessor.java | 10 +- .../mailets/AbstractRecipientRewriteTable.java | 1 + .../transport/mailets/BayesianAnalysis.java | 4 + .../mailets/BayesianAnalysisFeeder.java | 14 +-- .../james/transport/mailets/FromRepository.java | 11 +- .../james/transport/mailets/JDBCAlias.java | 11 +- .../mailets/JDBCRecipientRewriteTable.java | 6 +- .../james/transport/mailets/LocalDelivery.java | 3 + .../james/transport/mailets/RemoteDelivery.java | 1 + .../org/apache/james/transport/mailets/SPF.java | 24 +++- .../james/transport/mailets/SpamAssassin.java | 12 +- .../UsersRepositoryAliasingForwarding.java | 1 + .../transport/mailets/WhiteListManager.java | 14 +-- .../mailets/XMLRecipientRewriteTable.java | 6 +- .../transport/mailets/jsieve/DiscardAction.java | 1 + .../mailets/jsieve/FileIntoAction.java | 1 + .../transport/mailets/jsieve/KeepAction.java | 1 + .../mailets/jsieve/RedirectAction.java | 1 + .../transport/mailets/jsieve/RejectAction.java | 1 + .../mailets/jsieve/SieveMailAdapter.java | 40 +++--- .../mailets/managesieve/ManageSieveMailet.java | 1 + .../mailets/redirect/ProcessRedirectNotify.java | 1 + .../delivery/RemoteDeliverySocketFactory.java | 5 + .../matchers/AbstractSQLWhitelistMatcher.java | 1 + .../matchers/AbstractStorageQuota.java | 1 + .../transport/matchers/InSpammerBlacklist.java | 2 + .../james/transport/matchers/IsInWhiteList.java | 19 +-- .../transport/matchers/MailboxQuotaFixed.java | 5 +- .../matchers/NetworkIsInWhitelist.java | 18 +-- .../transport/matchers/SenderInFakeDomain.java | 1 + .../org/apache/james/fetchmail/Account.java | 14 +-- .../org/apache/james/fetchmail/FetchMail.java | 4 +- .../apache/james/fetchmail/FetchScheduler.java | 6 +- .../apache/james/fetchmail/FolderProcessor.java | 3 +- .../james/fetchmail/MessageProcessor.java | 3 +- .../apache/james/fetchmail/StoreProcessor.java | 3 +- .../apache/james/jmap/mailet/SentByJmap.java | 1 + .../james/jmap/methods/GetMailboxesMethod.java | 1 + .../methods/SetMailboxesCreationProcessor.java | 1 + .../SetMailboxesDestructionProcessor.java | 1 + .../james/jmap/methods/SetMessagesMethod.java | 1 + .../james/jmap/model/MailboxProperty.java | 1 + .../AbstractNettyImapRequestLineReader.java | 5 +- .../netty/ChannelImapResponseWriter.java | 8 +- .../james/imapserver/netty/IMAPServer.java | 8 +- .../netty/ImapRequestFrameDecoder.java | 6 +- .../netty/NettyImapRequestLineReader.java | 2 + .../imapserver/netty/NettyImapSession.java | 77 +++--------- .../netty/NettyStreamImapRequestLineReader.java | 2 + .../AbstractCommandHandlerResultJMXMonitor.java | 18 +-- .../lib/jmx/AbstractCommandHandlerStats.java | 20 +-- .../AbstractConnectHandlerResultJMXMonitor.java | 17 +-- .../AbstractLineHandlerResultJMXMonitor.java | 17 +-- .../protocols/lib/jmx/ConnectHandlerStats.java | 16 +-- .../protocols/lib/jmx/LineHandlerStats.java | 16 +-- .../netty/AbstractConfigurableAsyncServer.java | 41 ++----- ...ledOrderedMemoryAwareThreadPoolExecutor.java | 24 +--- .../james/lmtpserver/CoreCmdHandlerLoader.java | 4 +- .../james/lmtpserver/jmx/JMXHandlersLoader.java | 4 +- .../james/lmtpserver/netty/LMTPServer.java | 30 ++--- .../netty/ManageSieveServer.java | 1 + .../netty/ManageSieveServerFactory.java | 1 + .../pop3server/core/CoreCmdHandlerLoader.java | 3 +- .../jmx/CommandHandlerResultJMXMonitor.java | 5 +- .../jmx/ConnectHandlerResultJMXMonitor.java | 5 +- .../james/pop3server/jmx/JMXHandlersLoader.java | 3 +- .../jmx/LineHandlerResultJMXMonitor.java | 5 +- .../pop3server/jmx/POP3CommandHandlerStats.java | 15 +-- .../james/pop3server/netty/POP3Server.java | 5 +- .../AddDefaultAttributesMessageHook.java | 1 + .../smtpserver/AuthRequiredToRelayRcptHook.java | 6 +- .../james/smtpserver/CoreCmdHandlerLoader.java | 3 +- .../DataLineJamesMessageHookHandler.java | 1 + .../james/smtpserver/JamesDataCmdHandler.java | 1 + .../james/smtpserver/JamesMailCmdHandler.java | 4 +- .../james/smtpserver/JamesRcptCmdHandler.java | 4 +- .../james/smtpserver/MailPriorityHandler.java | 6 +- .../james/smtpserver/POP3BeforeSMTPHandler.java | 8 +- .../james/smtpserver/SendMailHandler.java | 1 + .../SenderAuthIdentifyVerificationRcptHook.java | 8 +- .../james/smtpserver/SetMimeHeaderHandler.java | 1 + .../smtpserver/UsersRepositoryAuthHook.java | 5 +- .../fastfail/JDBCGreylistHandler.java | 26 +--- .../james/smtpserver/fastfail/SPFHandler.java | 27 +++-- .../fastfail/SpamAssassinHandler.java | 5 +- .../smtpserver/fastfail/URIRBLHandler.java | 5 +- .../smtpserver/fastfail/ValidRcptHandler.java | 7 +- .../james/smtpserver/fastfail/ValidRcptMX.java | 1 + .../jmx/CommandHandlerResultJMXMonitor.java | 6 +- .../jmx/ConnectHandlerResultJMXMonitor.java | 4 +- .../smtpserver/jmx/HookResultJMXMonitor.java | 18 +-- .../apache/james/smtpserver/jmx/HookStats.java | 28 ++--- .../james/smtpserver/jmx/JMXHandlersLoader.java | 3 +- .../jmx/LineHandlerResultJMXMonitor.java | 5 +- .../smtpserver/jmx/SMTPCommandHandlerStats.java | 19 +-- .../netty/SMTPChannelUpstreamHandler.java | 1 + .../james/smtpserver/netty/SMTPServer.java | 47 +++---- .../james/queue/activemq/ActiveMQMailQueue.java | 5 +- .../queue/activemq/ActiveMQMailQueueItem.java | 4 +- .../activemq/MimeMessageBlobMessageSource.java | 8 +- .../api/DelayedManageableMailQueueContract.java | 1 + .../api/DelayedPriorityMailQueueContract.java | 1 + .../PriorityManageableMailQueueContract.java | 1 + 898 files changed, 2311 insertions(+), 4178 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ClientProviderImpl.java ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ClientProviderImpl.java b/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ClientProviderImpl.java index d4d3e4b..317c0b7 100644 --- a/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ClientProviderImpl.java +++ b/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ClientProviderImpl.java @@ -54,6 +54,7 @@ public class ClientProviderImpl implements ClientProvider { } + @Override public Client get() { TransportClient transportClient = TransportClient.builder().build(); ConsumerChainer<Host> consumer = Throwing.consumer(host -> transportClient http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java index 16f6bb8..1facc04 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java @@ -75,6 +75,7 @@ public interface MailboxListener { * * @return session */ + @Override public MailboxSession getSession() { return session; } @@ -211,6 +212,7 @@ public interface MailboxListener { * * @return flags */ + @Override public abstract MessageMetaData getMetaData(MessageUid uid); } @@ -250,6 +252,7 @@ public interface MailboxListener { * * @return flags */ + @Override public abstract MessageMetaData getMetaData(MessageUid uid); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/api/src/main/java/org/apache/james/mailbox/StandardMailboxMetaDataComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/StandardMailboxMetaDataComparator.java b/mailbox/api/src/main/java/org/apache/james/mailbox/StandardMailboxMetaDataComparator.java index a876c26..7aa0ea4 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/StandardMailboxMetaDataComparator.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/StandardMailboxMetaDataComparator.java @@ -58,9 +58,7 @@ public class StandardMailboxMetaDataComparator implements Comparator<MailboxMeta return result; } - /** - * @see Comparator#compare(Object, Object) - */ + @Override public int compare(MailboxMetaData one, MailboxMetaData two) { return order(one, two); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java b/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java index bdf6357..7e620f1 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java @@ -223,10 +223,6 @@ public class UnionMailboxACLResolver implements MailboxACLResolver { } } - /** - * @see org.apache.james.mailbox.MailboxACLResolver#applyGlobalACL(org.apache - * .james.mailbox.MailboxACL, boolean) - */ @Override public MailboxACL applyGlobalACL(MailboxACL resourceACL, boolean resourceOwnerIsGroup) throws UnsupportedRightException { return resourceOwnerIsGroup ? resourceACL.union(groupGlobalACL) : resourceACL.union(userGlobalACL); @@ -304,12 +300,6 @@ public class UnionMailboxACLResolver implements MailboxACLResolver { return result.toArray(new Rfc4314Rights[result.size()]); } - /** - * @see org.apache.james.mailbox.store.mail.MailboxACLResolver#rightsOf(java. - * lang.String, org.apache.james.mailbox.store.mail.MailboxACLResolver. - * GroupMembershipResolver, org.apache.james.mailbox.MailboxACL, - * java.lang.String) - */ @Override public Rfc4314Rights resolveRights(String requestUser, GroupMembershipResolver groupMembershipResolver, MailboxACL resourceACL, String resourceOwner, boolean resourceOwnerIsGroup) throws UnsupportedRightException { Rfc4314Rights[] positiveNegativePair = { MailboxACL.NO_RIGHTS, MailboxACL.NO_RIGHTS }; http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/api/src/main/java/org/apache/james/mailbox/model/FetchGroupImpl.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/FetchGroupImpl.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/FetchGroupImpl.java index 2f03b86..c5d0430 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/FetchGroupImpl.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/FetchGroupImpl.java @@ -54,6 +54,7 @@ public class FetchGroupImpl implements MessageResult.FetchGroup { this.partContentDescriptors = partContentDescriptors; } + @Override public int content() { return content; } @@ -66,12 +67,7 @@ public class FetchGroupImpl implements MessageResult.FetchGroup { return "Fetch " + content; } - /** - * Gets content descriptors for the parts to be fetched. - * - * @return <code>Set</code> of {@link org.apache.james.mailbox.MessageResult.FetchGroup.PartContentDescriptor}, - * possibly null - */ + @Override public Set<PartContentDescriptor> getPartContentDescriptors() { return partContentDescriptors; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java index 128760a..b0591bd 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java @@ -265,5 +265,6 @@ public interface MessageResult extends Comparable<MessageResult>, MessageMetaDat int[] getPositions(); } + @Override MessageId getMessageId(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/api/src/main/java/org/apache/james/mailbox/model/PartContentDescriptorImpl.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/PartContentDescriptorImpl.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/PartContentDescriptorImpl.java index 013a897..6072220 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/PartContentDescriptorImpl.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/PartContentDescriptorImpl.java @@ -46,10 +46,12 @@ public class PartContentDescriptorImpl implements PartContentDescriptor { this.content = this.content | content; } + @Override public int content() { return content; } + @Override public MimePath path() { return path; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java index 678d436..71d32a3 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java @@ -43,14 +43,17 @@ public class MockMailboxSession implements MailboxSession { public MockMailboxSession(String username, long sessionId) { this.user = new User() { + @Override public String getUserName() { return username; } + @Override public String getPassword() { return null; } + @Override public List<Locale> getLocalePreferences() { return new ArrayList<>(); } @@ -68,42 +71,52 @@ public class MockMailboxSession implements MailboxSession { type = SessionType.User; } + @Override public void close() { this.open = false; } + @Override public Map<Object, Object> getAttributes() { return attrs; } + @Override public String getOtherUsersSpace() { return null; } + @Override public String getPersonalSpace() { return ""; } + @Override public long getSessionId() { return sessionId; } + @Override public Collection<String> getSharedSpaces() { return new ArrayList<>(); } + @Override public User getUser() { return user; } + @Override public boolean isOpen() { return open; } + @Override public char getPathDelimiter() { return '.'; } + @Override public SessionType getType() { return type; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaCountTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaCountTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaCountTest.java index b057374..9148001 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaCountTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaCountTest.java @@ -24,10 +24,12 @@ import nl.jqno.equalsverifier.EqualsVerifier; public class QuotaCountTest implements QuotaValueTest<QuotaCount> { + @Override public QuotaCount instance(long value) { return QuotaCount.count(value); } + @Override public QuotaCount unlimited() { return QuotaCount.unlimited(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaSizeTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaSizeTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaSizeTest.java index 893b97e..cc036d8 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaSizeTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaSizeTest.java @@ -24,10 +24,12 @@ import nl.jqno.equalsverifier.EqualsVerifier; public class QuotaSizeTest implements QuotaValueTest<QuotaSize> { + @Override public QuotaSize instance(long value) { return QuotaSize.size(value); } + @Override public QuotaSize unlimited() { return QuotaSize.unlimited(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java b/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java index fb17648..13f1020 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java @@ -53,6 +53,7 @@ public class EventCollector implements MailboxListener { return events; } + @Override public void event(Event event) { events.add(event); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java index b70516c..f25c738 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java @@ -176,10 +176,12 @@ public class CassandraMailboxSessionMapperFactory extends MailboxSessionMapperFa return new CassandraSubscriptionMapper(session, cassandraUtils); } + @Override public ModSeqProvider getModSeqProvider() { return modSeqProvider; } + @Override public UidProvider getUidProvider() { return uidProvider; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManager.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManager.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManager.java index 401f388..f85b4f6 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManager.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManager.java @@ -37,10 +37,7 @@ public class CassandraSubscriptionManager extends StoreSubscriptionManager { super(mapperFactory); } - /** - * @see org.apache.james.mailbox.store.StoreSubscriptionManager#createSubscription(org.apache.james.mailbox.MailboxSession, - * java.lang.String) - */ + @Override protected Subscription createSubscription(MailboxSession session, String mailbox) { return new SimpleSubscription(session.getUser().getUserName(), mailbox); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapper.java index 2cea9d4..f689e39 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapper.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapper.java @@ -59,6 +59,7 @@ public class CassandraAnnotationMapper extends NonTransactionalMapper implements this.cassandraUtils = cassandraUtils; } + @Override public List<MailboxAnnotation> getAllAnnotations(MailboxId mailboxId) { CassandraId cassandraId = (CassandraId)mailboxId; return cassandraUtils.convertToStream(session.execute(getStoredAnnotationsQuery(cassandraId))) @@ -66,6 +67,7 @@ public class CassandraAnnotationMapper extends NonTransactionalMapper implements .collect(Collectors.toList()); } + @Override public List<MailboxAnnotation> getAnnotationsByKeys(MailboxId mailboxId, Set<MailboxAnnotationKey> keys) { CassandraId cassandraId = (CassandraId)mailboxId; return cassandraUtils.convertToStream(session.execute(getStoredAnnotationsQueryForKeys(cassandraId, keys))) @@ -73,6 +75,7 @@ public class CassandraAnnotationMapper extends NonTransactionalMapper implements .collect(Collectors.toList()); } + @Override public List<MailboxAnnotation> getAnnotationsByKeysWithOneDepth(MailboxId mailboxId, Set<MailboxAnnotationKey> keys) { CassandraId cassandraId = (CassandraId)mailboxId; return keys.stream() @@ -80,6 +83,7 @@ public class CassandraAnnotationMapper extends NonTransactionalMapper implements .collect(Guavate.toImmutableList()); } + @Override public List<MailboxAnnotation> getAnnotationsByKeysWithAllDepth(MailboxId mailboxId, Set<MailboxAnnotationKey> keys) { CassandraId cassandraId = (CassandraId)mailboxId; return keys.stream() @@ -87,12 +91,14 @@ public class CassandraAnnotationMapper extends NonTransactionalMapper implements .collect(Guavate.toImmutableList()); } + @Override public void deleteAnnotation(MailboxId mailboxId, MailboxAnnotationKey key) { session.execute(delete().from(CassandraAnnotationTable.TABLE_NAME) .where(eq(CassandraAnnotationTable.MAILBOX_ID, ((CassandraId) mailboxId).asUuid())) .and(eq(CassandraAnnotationTable.KEY, key.asString()))); } + @Override public void insertAnnotation(MailboxId mailboxId, MailboxAnnotation mailboxAnnotation) { Preconditions.checkArgument(!mailboxAnnotation.isNil()); session.execute(insertInto(CassandraAnnotationTable.TABLE_NAME) http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTest.java index 7ac4e73..ad412d5 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTest.java @@ -52,6 +52,7 @@ public class CassandraCombinationManagerTest extends AbstractCombinationManagerT private CassandraCluster cassandra; + @Override @Before public void setUp() throws Exception { CassandraModuleComposite modules = new CassandraModuleComposite( http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java index cba1f6e..ad8acaa 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java @@ -74,6 +74,7 @@ public class CassandraMailboxManagerTest extends MailboxManagerTest { return CassandraMailboxManagerProvider.provideMailboxManager(cassandra.getConf(), cassandra.getTypesProvider()); } + @Override @After public void tearDown() throws Exception { super.tearDown(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerQuotaTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerQuotaTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerQuotaTest.java index 9d18c8e..62ecd26 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerQuotaTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerQuotaTest.java @@ -52,6 +52,7 @@ public class CassandraMessageIdManagerQuotaTest extends AbstractMessageIdManager private CassandraCluster cassandra; + @Override @Before public void setUp() throws Exception { CassandraModuleComposite modules = new CassandraModuleComposite( http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java index 24e64c2..4326bf7 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java @@ -49,6 +49,7 @@ public class CassandraMessageIdManagerSideEffectTest extends AbstractMessageIdMa private CassandraCluster cassandra; + @Override @Before public void setUp() throws Exception { CassandraModuleComposite modules = new CassandraModuleComposite( http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java index bd83a42..8e9750c 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java @@ -62,6 +62,7 @@ public class CassandraMessageIdManagerStorageTest extends AbstractMessageIdManag @Rule public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule(); + @Override @Before public void setUp() throws Exception { CassandraModuleComposite modules = new CassandraModuleComposite( http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapperTest.java index ec23ad8..fd8e8e3 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapperTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapperTest.java @@ -47,6 +47,7 @@ public class CassandraAnnotationMapperTest extends AnnotationMapperTest { private CassandraCluster cassandra; + @Override @Before public void setUp() throws Exception { CassandraModuleComposite modules = new CassandraModuleComposite( http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapperTest.java index 9325241..14ddd79 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapperTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapperTest.java @@ -50,6 +50,7 @@ public class CassandraAttachmentMapperTest extends AttachmentMapperTest { private CassandraCluster cassandra; + @Override @Before public void setUp() throws MailboxException { CassandraModuleComposite modules = new CassandraModuleComposite( http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraGenericMailboxMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraGenericMailboxMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraGenericMailboxMapperTest.java index 836768b..c92d4bd 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraGenericMailboxMapperTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraGenericMailboxMapperTest.java @@ -47,6 +47,7 @@ public class CassandraGenericMailboxMapperTest extends MailboxMapperTest { private CassandraCluster cassandra; + @Override @Before public void setUp() throws Exception { CassandraModuleComposite modules = new CassandraModuleComposite( http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperAclTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperAclTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperAclTest.java index 286d90e..251a508 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperAclTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperAclTest.java @@ -47,6 +47,7 @@ public class CassandraMailboxMapperAclTest extends MailboxMapperACLTest { private CassandraCluster cassandra; + @Override @Before public void setUp() throws Exception { CassandraModuleComposite modules = new CassandraModuleComposite( http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java index b7499bb..bc7f9b4 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java @@ -47,6 +47,7 @@ public class CassandraMessageIdMapperTest extends MessageIdMapperTest { private CassandraCluster cassandra; + @Override @Before public void setUp() throws MailboxException { CassandraModuleComposite modules = new CassandraModuleComposite( http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java index e5f472f..fa64788 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java @@ -57,6 +57,7 @@ public class CassandraMessageMapperTest extends MessageMapperTest { private CassandraCluster cassandra; + @Override @Before public void setUp() throws Exception { CassandraModuleComposite modules = new CassandraModuleComposite( http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMoveTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMoveTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMoveTest.java index 0f41fa3..b2a1021 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMoveTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMoveTest.java @@ -47,6 +47,7 @@ public class CassandraMessageMoveTest extends MessageMoveTest { private CassandraCluster cassandra; + @Override @Before public void setUp() throws Exception { CassandraModuleComposite modules = new CassandraModuleComposite( http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageWithAttachmentMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageWithAttachmentMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageWithAttachmentMapperTest.java index 9efe448..4dbba4f 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageWithAttachmentMapperTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageWithAttachmentMapperTest.java @@ -47,6 +47,7 @@ public class CassandraMessageWithAttachmentMapperTest extends MessageWithAttachm private CassandraCluster cassandra; + @Override @Before public void setUp() throws Exception { CassandraModuleComposite modules = new CassandraModuleComposite( http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/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 211e481..d56d71e 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 @@ -33,14 +33,17 @@ public class FieldImpl implements Field { this.body = body; } + @Override public String getName() { return name; } + @Override public String getBody() { return body; } + @Override public ByteSequence getRaw() { return null; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java index c8ce4e3..db441ca 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java @@ -160,18 +160,12 @@ public class HBaseMailboxSessionMapperFactory extends MailboxSessionMapperFactor return conf; } - /** - * Returns the ModSeqProvider used. - * @return The used modSeqProvider - */ + @Override public ModSeqProvider getModSeqProvider() { return modSeqProvider; } - /** - * Returns the UidProvider that generates UID's for mailboxes. - * @return The provider that generates UID's for mailboxes - */ + @Override public UidProvider getUidProvider() { return uidProvider; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java index 076aa21..95884c4 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java @@ -59,9 +59,6 @@ public class HBaseMessageManager extends StoreMessageManager { } - /** - * Support user flags - */ @Override protected Flags getPermanentFlags(MailboxSession session) { Flags flags = super.getPermanentFlags(session); http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseNonTransactionalMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseNonTransactionalMapper.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseNonTransactionalMapper.java index bea36b8..bcf5990 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseNonTransactionalMapper.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseNonTransactionalMapper.java @@ -28,9 +28,6 @@ import org.apache.james.mailbox.store.transaction.NonTransactionalMapper; */ public class HBaseNonTransactionalMapper extends NonTransactionalMapper { - /** - * End request - */ @Override public void endRequest() { //TODO: maybe do some thing more wise here? http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/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 900757a..277a0e5 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 @@ -57,11 +57,6 @@ public class ChunkInputStream extends InputStream { this(conf, Bytes.toBytes(tableName), Bytes.toBytes(cf), key); } - /* - * (non-Javadoc) - * - * @see java.io.InputStream#read() - */ @Override public int read() throws IOException { if (chunk == null || pos + 1 == chunk.length) { @@ -105,9 +100,6 @@ public class ChunkInputStream extends InputStream { } } - /** - * Not supported - */ @Override public boolean markSupported() { return false; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
