JAMES-2107 Run IntelliJ inspection: "Explicit type parameter can be removed"
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/03b574c9 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/03b574c9 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/03b574c9 Branch: refs/heads/master Commit: 03b574c98b45f8f52ed647aa7a49acab1abe98ed Parents: cb0f621 Author: benwa <[email protected]> Authored: Wed Aug 2 09:02:44 2017 +0700 Committer: benwa <[email protected]> Committed: Wed Aug 16 16:44:08 2017 +0700 ---------------------------------------------------------------------- .../james/backends/jpa/JpaTestCluster.java | 2 +- .../acl/SimpleGroupMembershipResolver.java | 2 +- .../mailbox/acl/UnionMailboxACLResolver.java | 2 +- .../james/mailbox/model/FetchGroupImpl.java | 4 +- .../apache/james/mailbox/model/MailboxPath.java | 2 +- .../james/mailbox/model/MessageRange.java | 6 +-- .../apache/james/mailbox/model/SearchQuery.java | 12 +++--- .../james/mailbox/model/SimpleMailboxACL.java | 16 ++++---- .../james/mailbox/MailboxManagerStressTest.java | 4 +- .../james/mailbox/mock/MockMailboxSession.java | 6 +-- .../mailbox/model/SimpleMailboxACLTest.java | 20 +++++----- .../james/mailbox/util/EventCollector.java | 2 +- .../apache/james/mailbox/hbase/HBaseUtils.java | 2 +- .../mailbox/hbase/mail/HBaseMailboxMapper.java | 10 ++--- .../mailbox/hbase/mail/HBaseMailboxMessage.java | 6 +-- .../mailbox/hbase/mail/HBaseMessageMapper.java | 20 +++++----- .../hbase/user/HBaseSubscriptionMapper.java | 2 +- .../hbase/mail/HBaseMailboxMapperTest.java | 6 +-- .../mail/HBaseMailboxMessageMapperTest.java | 6 +-- .../mail/HBaseUidAndModSeqProviderTest.java | 20 ++++++++-- .../hbase/user/HBaseSubscriptionMapperTest.java | 26 +++++++++---- .../mailbox/jcr/mail/JCRMailboxMapper.java | 4 +- .../mailbox/jcr/mail/JCRMessageMapper.java | 20 +++++----- .../jcr/mail/model/JCRMailboxMessage.java | 8 ++-- .../mailbox/jcr/user/JCRSubscriptionMapper.java | 4 +- .../mailbox/jcr/user/model/JCRSubscription.java | 2 +- .../mailbox/jpa/mail/JPAMessageMapper.java | 2 +- .../openjpa/AbstractJPAMailboxMessage.java | 10 ++--- .../lucene/search/LuceneMessageSearchIndex.java | 8 ++-- .../LuceneMailboxMessageSearchIndexTest.java | 8 ++-- .../james/mailbox/maildir/MaildirFolder.java | 22 +++++------ .../james/mailbox/maildir/UidConstraint.java | 2 +- .../maildir/mail/MaildirMailboxMapper.java | 6 +-- .../maildir/mail/MaildirMessageMapper.java | 16 ++++---- .../maildir/user/MaildirSubscriptionMapper.java | 2 +- .../maildir/MailderMailboxMessageNameTest.java | 2 +- .../inmemory/mail/InMemoryAttachmentMapper.java | 2 +- .../inmemory/mail/InMemoryMailboxMapper.java | 4 +- .../inmemory/mail/InMemoryMessageMapper.java | 10 ++--- .../inmemory/mail/InMemoryModSeqProvider.java | 2 +- .../inmemory/mail/InMemoryUidProvider.java | 2 +- .../quota/InMemoryPerUserMaxQuotaManager.java | 6 +-- .../user/InMemorySubscriptionMapper.java | 4 +- .../james/mailbox/store/FakeAuthenticator.java | 2 +- .../mailbox/store/JVMMailboxPathLocker.java | 12 +++--- .../james/mailbox/store/MailboxMetaData.java | 2 +- .../james/mailbox/store/MessageBatcher.java | 2 +- .../james/mailbox/store/MessageResultImpl.java | 2 +- .../james/mailbox/store/MimeDescriptorImpl.java | 6 +-- .../apache/james/mailbox/store/ResultUtils.java | 2 +- .../mailbox/store/SimpleMailboxSession.java | 4 +- .../mailbox/store/StoreMailboxManager.java | 7 ++-- .../mailbox/store/StoreMessageIdManager.java | 2 +- .../mailbox/store/StoreMessageManager.java | 20 +++++----- .../store/event/MailboxListenerRegistry.java | 2 +- .../distributed/DistantMailboxPathRegister.java | 20 +++++----- .../store/extractor/DefaultTextExtractor.java | 5 +-- .../store/json/event/EventConverter.java | 4 +- .../dto/MailboxSessionDataTransferObject.java | 4 +- .../store/mail/AbstractMessageMapper.java | 2 +- .../store/mail/model/impl/PropertyBuilder.java | 4 +- .../store/search/LazyMessageSearchIndex.java | 2 +- .../james/mailbox/store/search/SearchUtil.java | 2 +- .../store/search/SimpleMessageSearchIndex.java | 4 +- .../store/streaming/PartContentBuilder.java | 4 +- .../james/mailbox/store/MessageBuilder.java | 2 +- .../store/SearchUtilsMultipartMixedTest.java | 2 +- .../mailbox/store/SearchUtilsRFC822Test.java | 2 +- .../james/mailbox/store/SearchUtilsTest.java | 2 +- .../mailbox/store/SimpleMailboxMembership.java | 2 +- .../StoreMailboxMessageResultIteratorTest.java | 4 +- .../store/TestMailboxSessionMapperFactory.java | 2 +- ...elegatingMailboxListenerIntegrationTest.java | 7 ++-- .../mailbox/store/json/EventSerializerTest.java | 4 +- .../json/SimpleMailboxACLJsonConverterTest.java | 7 ++-- .../store/mail/model/MetadataMapAssertTest.java | 8 ++-- .../james/mailbox/copier/MailboxCopierImpl.java | 2 +- .../registrations/GlobalRegistration.java | 9 +++-- .../registrations/MailboxRegistrationTest.java | 4 +- .../james/ai/classic/BayesianAnalyzer.java | 16 ++++---- .../james/ai/classic/JDBCBayesianAnalyzer.java | 2 +- .../apache/james/ai/classic/SqlResources.java | 10 ++--- .../org/apache/mailet/base/GenericMailet.java | 4 +- .../mailet/base/GenericRecipientMatcher.java | 2 +- .../org/apache/mailet/base/MatcherInverter.java | 2 +- .../org/apache/mailet/base/StringUtils.java | 2 +- .../mailet/base/test/FakeMailContext.java | 10 ++--- .../apache/james/transport/KeyStoreHolder.java | 2 +- .../apache/james/transport/SMIMEKeyHolder.java | 2 +- .../transport/mailets/SMIMECheckSignature.java | 4 +- .../james/transport/mailets/SMIMEDecrypt.java | 2 +- .../mailet/DefaultDescriptorsExtractor.java | 6 +-- .../james/transport/mailets/ClamAVScan.java | 2 +- .../james/transport/mailets/HeadersToHTTP.java | 2 +- .../james/transport/mailets/OnlyText.java | 15 ++++---- .../transport/mailets/PostmasterAlias.java | 13 ++++--- .../transport/mailets/StripAttachment.java | 4 +- .../matchers/AbstractQuotaMatcher.java | 9 +++-- .../matchers/AttachmentFileNameIs.java | 27 ++++++------- .../apache/james/transport/matchers/HostIs.java | 8 ++-- .../transport/matchers/SMTPAuthUserIs.java | 4 +- .../james/mpt/ant/MailProtocolTestTask.java | 2 +- .../protocol/FileProtocolSessionBuilder.java | 2 +- .../james/mpt/protocol/ProtocolSession.java | 8 ++-- .../mpt/protocol/ProtocolSessionBuilder.java | 2 +- .../GenericSimpleScriptedTestProtocol.java | 2 +- .../org/apache/james/mpt/DiscardProtocol.java | 4 +- .../james/mpt/host/JamesImapHostSystem.java | 2 +- .../james/mpt/session/ImapSessionImpl.java | 2 +- .../mpt/user/InMemoryMailboxUserManager.java | 2 +- .../org/apache/james/mpt/user/MailboxUser.java | 2 +- .../api/AbstractProtocolTransport.java | 2 +- .../james/protocols/api/AbstractResponse.java | 2 +- .../protocols/api/ProtocolSessionImpl.java | 6 +-- .../api/future/FutureResponseImpl.java | 2 +- .../api/handler/CommandDispatcher.java | 6 +-- .../protocols/api/handler/MultiLineHandler.java | 2 +- .../api/handler/ProtocolHandlerChainImpl.java | 2 +- .../api/AbstractProtocolTransportTest.java | 6 +-- .../james/imap/api/display/CharsetUtil.java | 4 +- .../james/imap/api/message/FetchData.java | 2 +- .../apache/james/imap/api/message/IdRange.java | 2 +- .../james/imap/api/message/MessageFlags.java | 2 +- .../apache/james/imap/api/message/UidRange.java | 2 +- .../imap/api/message/request/SearchKey.java | 4 +- .../james/imap/decode/FetchPartPathDecoder.java | 2 +- .../imap/decode/ImapRequestLineReader.java | 4 +- .../imap/decode/parser/EnableCommandParser.java | 2 +- .../imap/decode/parser/ImapParserFactory.java | 2 +- .../imap/decode/parser/SearchCommandParser.java | 8 ++-- .../encode/ContinuationResponseEncoder.java | 3 +- .../james/imap/encode/FetchResponseEncoder.java | 2 +- .../james/imap/encode/ListingEncodingUtils.java | 2 +- .../imap/encode/StatusResponseEncoder.java | 3 +- .../imap/message/request/SetQuotaRequest.java | 8 ++-- .../processor/AbstractMailboxProcessor.java | 2 +- .../AbstractMessageRangeProcessor.java | 2 +- .../processor/AbstractSelectionProcessor.java | 6 +-- .../imap/processor/AuthenticateProcessor.java | 2 +- .../imap/processor/CapabilityProcessor.java | 8 ++-- .../james/imap/processor/EnableProcessor.java | 6 +-- .../james/imap/processor/LSubProcessor.java | 2 +- .../james/imap/processor/ListProcessor.java | 2 +- .../imap/processor/NamespaceProcessor.java | 6 +-- .../james/imap/processor/SearchProcessor.java | 18 ++++----- .../james/imap/processor/StoreProcessor.java | 10 ++--- .../processor/base/SelectedMailboxImpl.java | 12 +++--- .../imap/processor/base/UidMsnConverter.java | 2 +- .../imap/processor/fetch/EnvelopeBuilder.java | 2 +- .../imap/processor/fetch/FetchProcessor.java | 2 +- .../processor/fetch/FetchResponseBuilder.java | 2 +- .../processor/fetch/MessageResultUtils.java | 8 ++-- .../fetch/MimeDescriptorStructure.java | 4 +- .../org/apache/james/imap/api/IdRangeTest.java | 14 ++++--- .../SearchCommandParserAndParenthesesTest.java | 2 +- .../SearchCommandParserTopLevelAndTest.java | 6 +-- .../james/imap/encode/FakeImapSession.java | 2 +- .../FetchResponseEncoderNoExtensionsTest.java | 11 +++--- .../imap/encode/ListingEncodingUtilsTest.java | 7 ++-- .../encode/NamespaceResponseEncoderTest.java | 11 +++--- .../james/imap/processor/LSubProcessorTest.java | 4 +- .../imap/processor/NamespaceProcessorTest.java | 8 ++-- .../imap/processor/SearchProcessorTest.java | 7 ++-- .../processor/base/SelectedMailboxImplTest.java | 2 +- .../fetch/MailboxMessageResultUtilsTest.java | 2 +- .../james/protocols/lmtp/LMTPMultiResponse.java | 4 +- .../lmtp/LMTPProtocolHandlerChain.java | 4 +- .../lmtp/core/DataLineMessageHookHandler.java | 4 +- .../protocols/lmtp/AbstractLMTPSServerTest.java | 2 +- .../protocols/lmtp/AbstractLMTPServerTest.java | 6 +-- .../james/managesieve/core/CoreProcessor.java | 2 +- .../apache/james/managesieve/jsieve/Parser.java | 2 +- .../protocols/netty/AbstractAsyncServer.java | 2 +- .../ConnectionPerIpLimitUpstreamHandler.java | 2 +- .../pop3/POP3ProtocolHandlerChain.java | 4 +- .../james/protocols/pop3/POP3Response.java | 2 +- .../protocols/pop3/core/CapaCmdHandler.java | 3 +- .../protocols/pop3/core/ListCmdHandler.java | 2 +- .../protocols/pop3/core/StatCmdHandler.java | 4 +- .../protocols/pop3/core/StlsCmdHandler.java | 2 +- .../protocols/pop3/core/TopCmdHandler.java | 2 +- .../protocols/pop3/core/UidlCmdHandler.java | 29 +++++++------- .../protocols/pop3/core/UserCmdHandler.java | 24 ++++++------ .../protocols/pop3/AbstractPOP3ServerTest.java | 2 +- .../james/protocols/pop3/utils/MockMailbox.java | 2 +- .../pop3/utils/TestPassCmdHandler.java | 2 +- .../smtp/SMTPProtocolHandlerChain.java | 2 +- .../james/protocols/smtp/SMTPResponse.java | 2 +- .../smtp/core/AbstractAddHeadersFilter.java | 2 +- .../smtp/core/AbstractHookableCmdHandler.java | 2 +- .../protocols/smtp/core/DataCmdHandler.java | 2 +- .../smtp/core/DataLineMessageHookHandler.java | 2 +- .../protocols/smtp/core/MailCmdHandler.java | 2 +- .../protocols/smtp/core/RcptCmdHandler.java | 2 +- .../smtp/core/esmtp/AuthCmdHandler.java | 2 +- .../smtp/core/fastfail/SpamTrapHandler.java | 4 +- .../smtp/core/fastfail/DNSRBLHandlerTest.java | 6 +-- .../smtp/core/fastfail/MaxRcptHandlerTest.java | 8 ++-- .../core/fastfail/MaxUnknownCmdHandlerTest.java | 7 ++-- .../fastfail/ResolvableEhloHeloHandlerTest.java | 12 +++--- .../smtp/core/fastfail/SpamTrapHandlerTest.java | 8 ++-- .../fastfail/ValidSenderDomainHandlerTest.java | 2 +- .../protocols/smtp/utils/TestMessageHook.java | 2 +- .../org/apache/james/cli/ServerCmdTest.java | 5 +-- .../java/org/apache/james/core/MailImpl.java | 40 ++++++++++---------- .../core/MimeMessageInputStreamSource.java | 2 +- .../org/apache/james/core/MailImplTest.java | 21 ++++++---- .../core/MimeMessageCopyOnWriteProxyTest.java | 21 ++++++---- .../james/modules/mailbox/JPAMailboxModule.java | 2 +- .../james/onami/lifecycle/DefaultStager.java | 2 +- .../james/onami/lifecycle/PreDestroyModule.java | 2 +- .../onami/lifecycle/DefaultStagerTestCase.java | 4 +- .../onami/lifecycle/StagingOrderTestCase.java | 2 +- .../mailbox/MailboxCopierManagement.java | 2 +- .../mailbox/MailboxManagerManagement.java | 2 +- .../MailRepositoryStoreBeanFactory.java | 20 +++++----- .../lifecycle/ConfigurationProviderImpl.java | 2 +- .../spring/lifecycle/LogProviderImpl.java | 4 +- .../mailbox/MaxQuotaConfigurationReader.java | 10 ++--- .../org/apache/james/util/IteratorWrapper.java | 2 +- .../james/util/RestrictingRMISocketFactory.java | 2 +- .../org/apache/james/util/TimeConverter.java | 2 +- .../james/util/bayesian/BayesianAnalyzer.java | 16 ++++---- .../util/bayesian/JDBCBayesianAnalyzer.java | 20 +++++----- .../util/concurrency/ConcurrentTestRunner.java | 2 +- .../JMXEnabledScheduledThreadPoolExecutor.java | 2 +- .../JMXEnabledThreadPoolExecutor.java | 8 ++-- .../james/util/scanner/SpamAssassinInvoker.java | 16 ++++---- .../org/apache/james/util/sql/SqlResources.java | 27 ++++++------- .../apache/james/util/IteratorWrapperTest.java | 8 ++-- .../concurrency/ConcurrentTestRunnerTest.java | 6 +-- .../util/retry/ExceptionRetryHandlerTest.java | 7 +++- .../james/domainlist/xml/XMLDomainList.java | 4 +- .../mailrepository/file/FileMailRepository.java | 8 ++-- .../mailrepository/file/MBoxMailRepository.java | 10 ++--- .../rrt/file/XMLRecipientRewriteTable.java | 2 +- .../file/SieveFileRepository.java | 2 +- .../james/domainlist/xml/XMLDomainListTest.java | 12 +++--- .../rrt/file/XMLRecipientRewriteTableTest.java | 2 +- .../james/domainlist/hbase/HBaseDomainList.java | 2 +- .../rrt/hbase/HBaseRecipientRewriteTable.java | 2 +- .../james/user/hbase/HBaseUsersRepository.java | 2 +- .../mailrepository/jcr/JCRMailRepository.java | 4 +- .../james/user/jcr/JCRUsersRepository.java | 2 +- .../mailrepository/jdbc/JDBCMailRepository.java | 12 +++--- .../rrt/jdbc/JDBCRecipientRewriteTable.java | 6 +-- .../user/jdbc/AbstractJdbcUsersRepository.java | 8 ++-- .../james/domainlist/jpa/JPADomainList.java | 2 +- .../james/rrt/jpa/JPARecipientRewriteTable.java | 2 +- .../user/ldap/ReadOnlyLDAPGroupRestriction.java | 21 +++++----- .../user/ldap/ReadOnlyUsersLDAPRepository.java | 6 +-- .../domainlist/lib/AbstractDomainList.java | 2 +- .../apache/james/mailrepository/lib/Lock.java | 2 +- .../org/apache/james/rrt/lib/MappingsImpl.java | 2 +- .../rrt/lib/RecipientRewriteTableUtil.java | 4 +- .../user/lib/AbstractJamesUsersRepository.java | 2 +- .../user/lib/UsersRepositoryManagement.java | 17 +++++---- .../domainlist/api/mock/SimpleDomainList.java | 2 +- .../AbstractMailRepositoryTest.java | 11 +++++- .../mock/MockMailRepositoryStore.java | 4 +- .../user/lib/AbstractUsersRepositoryTest.java | 4 +- .../user/lib/mock/InMemoryUsersRepository.java | 4 +- .../domainlist/memory/MemoryDomainList.java | 2 +- .../rrt/memory/MemoryRecipientRewriteTable.java | 2 +- .../user/memory/MemoryUsersRepository.java | 2 +- .../dnsservice/dnsjava/DNSJavaService.java | 37 +++++++++--------- .../dnsservice/dnsjava/DNSJavaServiceTest.java | 25 ++++++------ .../api/mock/MockMailetContext.java | 6 +-- .../mailetcontainer/api/mock/MockMatcher.java | 4 +- .../impl/JamesMailetContext.java | 8 ++-- .../mailetcontainer/impl/MailetConfigImpl.java | 12 +++--- .../impl/camel/MatcherSplitter.java | 10 ++--- .../jmx/JMXStateCompositeProcessorListener.java | 6 +-- .../jmx/JMXStateMailetProcessorListener.java | 8 ++-- .../impl/jmx/MailetManagement.java | 2 +- .../impl/matchers/GenericCompositeMatcher.java | 2 +- .../mailetcontainer/impl/matchers/Not.java | 2 +- .../james/mailetcontainer/impl/matchers/Or.java | 2 +- .../mailetcontainer/impl/matchers/Xor.java | 9 +++-- .../lib/AbstractStateCompositeProcessor.java | 2 +- .../lib/AbstractStateMailetProcessor.java | 6 +-- .../impl/MailetConfigImplTest.java | 11 +++--- .../mailets/AbstractRecipientRewriteTable.java | 8 ++-- .../james/transport/mailets/FromRepository.java | 2 +- .../james/transport/mailets/JDBCAlias.java | 4 +- .../transport/mailets/WhiteListManager.java | 6 +-- .../mailets/XMLRecipientRewriteTable.java | 2 +- .../mailets/delivery/MailDispatcher.java | 2 +- .../mailets/jsieve/ActionDispatcher.java | 11 +++--- .../mailets/jsieve/RedirectAction.java | 2 +- .../transport/mailets/jsieve/RejectAction.java | 2 +- .../mailets/jsieve/SieveMailAdapter.java | 18 ++++----- .../matchers/AbstractSQLWhitelistMatcher.java | 4 +- .../james/transport/matchers/IsOverQuota.java | 15 ++++---- .../matchers/NetworkIsInWhitelist.java | 4 +- .../transport/mailets/RecordingMailContext.java | 2 +- .../org/apache/james/fetchmail/Account.java | 2 +- .../org/apache/james/fetchmail/FetchMail.java | 35 ++++++++--------- .../apache/james/fetchmail/FetchScheduler.java | 2 +- .../james/fetchmail/MessageProcessor.java | 24 ++++++------ .../james/fetchmail/ParsedConfiguration.java | 2 +- .../jmap/json/MultipleClassesDeserializer.java | 2 +- .../apache/james/jmap/send/MailSpoolTest.java | 2 +- .../imapserver/netty/IMAPServerFactory.java | 2 +- .../james/imapserver/netty/NettyConstants.java | 2 +- .../imapserver/netty/NettyImapSession.java | 2 +- .../protocols/lib/ProtocolHandlerChainImpl.java | 2 +- .../AbstractCommandHandlerResultJMXMonitor.java | 10 +++-- .../AbstractConnectHandlerResultJMXMonitor.java | 8 ++-- .../AbstractLineHandlerResultJMXMonitor.java | 10 +++-- .../netty/AbstractConfigurableAsyncServer.java | 2 +- ...ledOrderedMemoryAwareThreadPoolExecutor.java | 2 +- .../lib/mock/MockProtocolHandlerLoader.java | 6 +-- .../james/lmtpserver/CoreCmdHandlerLoader.java | 2 +- .../james/lmtpserver/DataLineLMTPHandler.java | 16 ++++---- .../james/lmtpserver/jmx/JMXHandlersLoader.java | 2 +- .../lmtpserver/netty/LMTPServerFactory.java | 2 +- .../ManageSieveChannelUpstreamHandler.java | 9 +++-- .../netty/ManageSieveServerFactory.java | 2 +- .../pop3server/core/CoreCmdHandlerLoader.java | 2 +- .../james/pop3server/jmx/JMXHandlersLoader.java | 2 +- .../pop3server/mailbox/MailboxAdapter.java | 4 +- .../pop3server/netty/POP3ServerFactory.java | 2 +- .../james/smtpserver/CoreCmdHandlerLoader.java | 2 +- .../DataLineJamesMessageHookHandler.java | 28 +++++++------- .../james/smtpserver/MailPriorityHandler.java | 2 +- .../org/apache/james/smtpserver/TLDLookup.java | 4 +- .../smtpserver/fastfail/DNSRBLHandler.java | 4 +- .../fastfail/JDBCGreylistHandler.java | 6 +-- .../smtpserver/fastfail/URIRBLHandler.java | 4 +- .../james/smtpserver/fastfail/URIScanner.java | 2 +- .../smtpserver/jmx/HookResultJMXMonitor.java | 4 +- .../james/smtpserver/jmx/JMXHandlersLoader.java | 2 +- .../james/smtpserver/netty/SMTPServer.java | 2 +- .../smtpserver/netty/SMTPServerFactory.java | 2 +- .../apache/james/smtpserver/SMTPServerTest.java | 15 ++++---- .../apache/james/smtpserver/SPFHandlerTest.java | 10 +++-- .../smtpserver/SpamAssassinHandlerTest.java | 10 +++-- .../james/smtpserver/URIRBLHandlerTest.java | 17 +++++---- .../james/smtpserver/ValidRcptHandlerTest.java | 4 +- .../james/smtpserver/ValidRcptMXTest.java | 13 ++++--- .../james/smtpserver/mock/MockMimeMessage.java | 22 +++++------ .../james/smtpserver/mock/mailet/MockMail.java | 10 +++-- .../smtpserver/mock/mailet/MockMailContext.java | 2 +- .../james/queue/api/mock/MockMailQueue.java | 2 +- .../queue/api/mock/MockMailQueueFactory.java | 2 +- .../apache/james/queue/file/FileMailQueue.java | 4 +- .../james/queue/file/FileMailQueueFactory.java | 16 ++++---- .../apache/james/queue/jms/JMSMailQueue.java | 6 +-- .../queue/library/AbstractMailQueueFactory.java | 7 ++-- .../queue/library/MailQueueManagement.java | 37 +++++++++--------- 351 files changed, 1115 insertions(+), 1038 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/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 6baaa31..0c5b118 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 @@ -38,7 +38,7 @@ public class JpaTestCluster { } public static JpaTestCluster create(List<Class<?>> clazz) { - HashMap<String, String> properties = new HashMap<String, String>(); + HashMap<String, String> properties = new HashMap<>(); properties.put("openjpa.ConnectionDriverName", org.h2.Driver.class.getName()); properties.put("openjpa.ConnectionURL", "jdbc:h2:mem:mailboxintegrationtesting;DB_CLOSE_DELAY=-1"); // Memory H2 database properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)"); // Create Foreign Keys http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/api/src/main/java/org/apache/james/mailbox/acl/SimpleGroupMembershipResolver.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/acl/SimpleGroupMembershipResolver.java b/mailbox/api/src/main/java/org/apache/james/mailbox/acl/SimpleGroupMembershipResolver.java index 6924757..79b2a57 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/acl/SimpleGroupMembershipResolver.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/acl/SimpleGroupMembershipResolver.java @@ -68,7 +68,7 @@ public class SimpleGroupMembershipResolver implements GroupMembershipResolver { } - private final Set<Membership> memberships = new HashSet<SimpleGroupMembershipResolver.Membership>(32); + private final Set<Membership> memberships = new HashSet<>(32); public void addMembership(String group, String user) { memberships.add(new Membership(user, group)); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/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 b89ff67..7ba49ea 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 @@ -377,7 +377,7 @@ public class UnionMailboxACLResolver implements MailboxACLResolver { } private static MailboxACLRights[] toListRightsArray(MailboxACLRights implicitRights) throws UnsupportedRightException { - List<MailboxACLRights> result = new ArrayList<MailboxACL.MailboxACLRights>(Rfc4314Rights.FIELD_COUNT); + List<MailboxACLRights> result = new ArrayList<>(Rfc4314Rights.FIELD_COUNT); result.add(implicitRights); for (MailboxACLRight right : SimpleMailboxACL.FULL_RIGHTS) { if (!implicitRights.contains(right)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/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 81a3560..2f03b86 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 @@ -42,11 +42,11 @@ public class FetchGroupImpl implements MessageResult.FetchGroup { private Set<PartContentDescriptor> partContentDescriptors; public FetchGroupImpl() { - this(0, new HashSet<PartContentDescriptor>()); + this(0, new HashSet<>()); } public FetchGroupImpl(int content) { - this(content, new HashSet<PartContentDescriptor>()); + this(content, new HashSet<>()); } public FetchGroupImpl(int content, Set<PartContentDescriptor> partContentDescriptors) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxPath.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxPath.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxPath.java index 06a87b2..0f538ae 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxPath.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxPath.java @@ -121,7 +121,7 @@ public class MailboxPath { if (name == null) { return ImmutableList.of(this); } - ArrayList<MailboxPath> levels = new ArrayList<MailboxPath>(); + ArrayList<MailboxPath> levels = new ArrayList<>(); int index = name.indexOf(delimiter); while (index >= 0) { final String levelname = name.substring(0, index); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/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 c1c285a..a355cc6 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 @@ -158,8 +158,8 @@ public class MessageRange implements Iterable<MessageUid>{ * @return ranges */ public static List<MessageRange> toRanges(Collection<MessageUid> uidsCol) { - List<MessageRange> ranges = new ArrayList<MessageRange>(); - List<MessageUid> uids = new ArrayList<MessageUid>(uidsCol); + List<MessageRange> ranges = new ArrayList<>(); + List<MessageUid> uids = new ArrayList<>(uidsCol); Collections.sort(uids); long firstUid = 0; @@ -241,7 +241,7 @@ public class MessageRange implements Iterable<MessageUid>{ * {@link Type#RANGE}. */ public List<MessageRange> split(int maxItems) { - List<MessageRange> ranges = new ArrayList<MessageRange>(); + List<MessageRange> ranges = new ArrayList<>(); if (getType() == Type.RANGE) { long from = getUidFrom().asLong(); long to = getUidTo().asLong(); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java index 911063b..b6fa953 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java @@ -563,7 +563,7 @@ public class SearchQuery implements Serializable { * @return <code>Criterion</code>, not null */ public static Criterion or(Criterion one, Criterion two) { - final List<Criterion> criteria = new ArrayList<Criterion>(); + final List<Criterion> criteria = new ArrayList<>(); criteria.add(one); criteria.add(two); return new ConjunctionCriterion(Conjunction.OR, criteria); @@ -590,7 +590,7 @@ public class SearchQuery implements Serializable { * @return <code>Criterion</code>, not null */ public static Criterion and(Criterion one, Criterion two) { - final List<Criterion> criteria = new ArrayList<Criterion>(); + final List<Criterion> criteria = new ArrayList<>(); criteria.add(one); criteria.add(two); return new ConjunctionCriterion(Conjunction.AND, criteria); @@ -615,7 +615,7 @@ public class SearchQuery implements Serializable { * @return <code>Criterion</code>, not null */ public static Criterion not(Criterion criterion) { - final List<Criterion> criteria = new ArrayList<Criterion>(); + final List<Criterion> criteria = new ArrayList<>(); criteria.add(criterion); return new ConjunctionCriterion(Conjunction.NOR, criteria); } @@ -748,18 +748,18 @@ public class SearchQuery implements Serializable { return AllCriterion.all(); } - private final Set<MessageUid> recentMessageUids = new HashSet<MessageUid>(); + private final Set<MessageUid> recentMessageUids = new HashSet<>(); private final List<Criterion> criterias; private List<Sort> sorts = Collections.singletonList(new Sort(Sort.SortClause.Uid, Sort.Order.NATURAL)); public SearchQuery(Criterion... criterias) { - this(new ArrayList<Criterion>(Arrays.asList(criterias))); + this(new ArrayList<>(Arrays.asList(criterias))); } public SearchQuery() { - this(new ArrayList<Criterion>()); + this(new ArrayList<>()); } private SearchQuery(List<Criterion> criterias) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/api/src/main/java/org/apache/james/mailbox/model/SimpleMailboxACL.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/SimpleMailboxACL.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/SimpleMailboxACL.java index 540bdd8..884e625 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/SimpleMailboxACL.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/SimpleMailboxACL.java @@ -896,7 +896,7 @@ public class SimpleMailboxACL implements MailboxACL { */ public SimpleMailboxACL(Map.Entry<MailboxACLEntryKey, MailboxACLRights>[] entries) { if (entries != null) { - Map<MailboxACLEntryKey, MailboxACLRights> m = new HashMap<MailboxACLEntryKey, MailboxACLRights>(entries.length + entries.length / 2 + 1); + Map<MailboxACLEntryKey, MailboxACLRights> m = new HashMap<>(entries.length + entries.length / 2 + 1); for (Entry<MailboxACLEntryKey, MailboxACLRights> en : entries) { m.put(en.getKey(), en.getValue()); } @@ -914,7 +914,7 @@ public class SimpleMailboxACL implements MailboxACL { */ public SimpleMailboxACL(Map<MailboxACLEntryKey, MailboxACLRights> entries) { if (entries != null && entries.size() > 0) { - Map<MailboxACLEntryKey, MailboxACLRights> m = new HashMap<MailboxACLEntryKey, MailboxACLRights>(entries.size() + entries.size() / 2 + 1); + Map<MailboxACLEntryKey, MailboxACLRights> m = new HashMap<>(entries.size() + entries.size() / 2 + 1); for (Entry<MailboxACLEntryKey, MailboxACLRights> en : entries.entrySet()) { m.put(en.getKey(), en.getValue()); } @@ -949,7 +949,7 @@ public class SimpleMailboxACL implements MailboxACL { public SimpleMailboxACL(Properties props) throws UnsupportedRightException { super(); - Map<MailboxACLEntryKey, MailboxACLRights> m = new HashMap<MailboxACLEntryKey, MailboxACLRights>(props.size() + props.size() / 2 + 1); + Map<MailboxACLEntryKey, MailboxACLRights> m = new HashMap<>(props.size() + props.size() / 2 + 1); if (props != null) { for (Map.Entry<Object, Object> prop : props.entrySet()) { @@ -995,7 +995,7 @@ public class SimpleMailboxACL implements MailboxACL { return this; } else { Map<MailboxACLEntryKey, MailboxACLRights> otherEntries = other.getEntries(); - Map<MailboxACLEntryKey, MailboxACLRights> resultEntries = new HashMap<MailboxACLEntryKey, MailboxACLRights>(this.entries); + Map<MailboxACLEntryKey, MailboxACLRights> resultEntries = new HashMap<>(this.entries); for (Entry<MailboxACLEntryKey, MailboxACLRights> otherEntry : otherEntries.entrySet()) { MailboxACLEntryKey key = otherEntry.getKey(); MailboxACLRights thisRights = resultEntries.get(key); @@ -1020,7 +1020,7 @@ public class SimpleMailboxACL implements MailboxACL { * @see org.apache.james.mailbox.model.MailboxACL#except(org.apache.james.mailbox.model.MailboxACL.MailboxACLEntryKey, org.apache.james.mailbox.model.MailboxACL.MailboxACLRights) */ public MailboxACL except(MailboxACLEntryKey key, MailboxACLRights mailboxACLRights) throws UnsupportedRightException { - Map<MailboxACLEntryKey, MailboxACLRights> resultEntries = new HashMap<MailboxACLEntryKey, MailboxACLRights>(this.entries); + Map<MailboxACLEntryKey, MailboxACLRights> resultEntries = new HashMap<>(this.entries); MailboxACLRights thisRights = resultEntries.get(key); if (thisRights == null) { /* nothing to diff */ @@ -1058,7 +1058,7 @@ public class SimpleMailboxACL implements MailboxACL { */ @Override public MailboxACL replace(MailboxACLEntryKey key, MailboxACLRights replacement) throws UnsupportedRightException { - Map<MailboxACLEntryKey, MailboxACLRights> resultEntries = new HashMap<MailboxACLEntryKey, MailboxACLRights>(this.entries); + Map<MailboxACLEntryKey, MailboxACLRights> resultEntries = new HashMap<>(this.entries); if (replacement == null || replacement.isEmpty()) { resultEntries.remove(key); } else { @@ -1087,7 +1087,7 @@ public class SimpleMailboxACL implements MailboxACL { return other; } else { int cnt = otherEntries.size() + entries.size(); - Map<MailboxACLEntryKey, MailboxACLRights> resultEntries = new HashMap<MailboxACLEntryKey, MailboxACLRights>(cnt + cnt / 2 + 1); + Map<MailboxACLEntryKey, MailboxACLRights> resultEntries = new HashMap<>(cnt + cnt / 2 + 1); for (Entry<MailboxACLEntryKey, MailboxACLRights> otherEntry : otherEntries.entrySet()) { MailboxACLEntryKey key = otherEntry.getKey(); MailboxACLRights thisRights = entries.get(key); @@ -1114,7 +1114,7 @@ public class SimpleMailboxACL implements MailboxACL { * @see org.apache.james.mailbox.model.MailboxACL#union(org.apache.james.mailbox.model.MailboxACL.MailboxACLEntryKey, org.apache.james.mailbox.model.MailboxACL.MailboxACLRights) */ public MailboxACL union(MailboxACLEntryKey key, MailboxACLRights mailboxACLRights) throws UnsupportedRightException { - Map<MailboxACLEntryKey, MailboxACLRights> resultEntries = new HashMap<MailboxACLEntryKey, MailboxACLRights>(this.entries); + Map<MailboxACLEntryKey, MailboxACLRights> resultEntries = new HashMap<>(this.entries); MailboxACLRights thisRights = resultEntries.get(key); if (thisRights == null) { /* nothing to union */ http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java index d8276fe..41f9ab2 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java @@ -61,7 +61,7 @@ public abstract class MailboxManagerStressTest { final CountDownLatch latch = new CountDownLatch(APPEND_OPERATIONS); final ExecutorService pool = Executors.newFixedThreadPool(APPEND_OPERATIONS / 2); - final List<MessageUid> uList = new ArrayList<MessageUid>(); + final List<MessageUid> uList = new ArrayList<>(); final String username = "username"; MailboxSession session = mailboxManager.createSystemSession(username, LoggerFactory.getLogger("Test")); mailboxManager.startProcessingRequest(session); @@ -89,7 +89,7 @@ public abstract class MailboxManagerStressTest { mailboxManager.logout(session, false); final AtomicBoolean fail = new AtomicBoolean(false); - final ConcurrentHashMap<MessageUid, Object> uids = new ConcurrentHashMap<MessageUid, Object>(); + final ConcurrentHashMap<MessageUid, Object> uids = new ConcurrentHashMap<>(); // fire of 1000 append operations for (int i = 0; i < APPEND_OPERATIONS; i++) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/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 be13c68..a622d09 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 @@ -34,7 +34,7 @@ public class MockMailboxSession implements MailboxSession{ private final User user; private boolean close; - private final Map<Object, Object> attrs = new HashMap<Object, Object>(); + private final Map<Object, Object> attrs = new HashMap<>(); private final Logger log = LoggerFactory.getLogger("MockLog"); private final static Random RANDOM = new Random(); @@ -53,7 +53,7 @@ public class MockMailboxSession implements MailboxSession{ } public List<Locale> getLocalePreferences() { - return new ArrayList<Locale>(); + return new ArrayList<>(); } @Override @@ -95,7 +95,7 @@ public class MockMailboxSession implements MailboxSession{ } public Collection<String> getSharedSpaces() { - return new ArrayList<String>(); + return new ArrayList<>(); } public User getUser() { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/api/src/test/java/org/apache/james/mailbox/model/SimpleMailboxACLTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/SimpleMailboxACLTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/SimpleMailboxACLTest.java index 2d20fb5..9d22e27 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/SimpleMailboxACLTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/SimpleMailboxACLTest.java @@ -69,7 +69,7 @@ public class SimpleMailboxACLTest { @Test public void testUnionACLNew() throws UnsupportedRightException { - Map<MailboxACLEntryKey, MailboxACLRights> expectedEntries = new HashMap<MailboxACL.MailboxACLEntryKey, MailboxACL.MailboxACLRights>(u1u2g1g2ACL.getEntries()); + Map<MailboxACLEntryKey, MailboxACLRights> expectedEntries = new HashMap<>(u1u2g1g2ACL.getEntries()); expectedEntries.put(SimpleMailboxACL.OWNER_KEY, SimpleMailboxACL.FULL_RIGHTS); MailboxACL toAdd = SimpleMailboxACL.OWNER_FULL_ACL; @@ -83,7 +83,7 @@ public class SimpleMailboxACLTest { @Test public void testUnionEntryNew() throws UnsupportedRightException { - Map<MailboxACLEntryKey, MailboxACLRights> expectedEntries = new HashMap<MailboxACL.MailboxACLEntryKey, MailboxACL.MailboxACLRights>(u1u2g1g2ACL.getEntries()); + Map<MailboxACLEntryKey, MailboxACLRights> expectedEntries = new HashMap<>(u1u2g1g2ACL.getEntries()); expectedEntries.put(SimpleMailboxACL.OWNER_KEY, SimpleMailboxACL.FULL_RIGHTS); MailboxACL result = u1u2g1g2ACL.union(SimpleMailboxACL.OWNER_KEY, SimpleMailboxACL.FULL_RIGHTS); @@ -96,7 +96,7 @@ public class SimpleMailboxACLTest { @Test public void testUnionACLExisting() throws UnsupportedRightException { - Map<MailboxACLEntryKey, MailboxACLRights> expectedEntries = new HashMap<MailboxACL.MailboxACLEntryKey, MailboxACL.MailboxACLRights>(u1u2g1g2ACL.getEntries()); + Map<MailboxACLEntryKey, MailboxACLRights> expectedEntries = new HashMap<>(u1u2g1g2ACL.getEntries()); expectedEntries.put(new SimpleMailboxACLEntryKey(USER_1), new Rfc4314Rights(aeik + lprs)); MailboxACL toAdd = new SimpleMailboxACL(new SimpleMailboxACL.SimpleMailboxACLEntry[] { new SimpleMailboxACL.SimpleMailboxACLEntry(USER_1, lprs) }); @@ -110,7 +110,7 @@ public class SimpleMailboxACLTest { @Test public void testUnionEntryExisting() throws UnsupportedRightException { - Map<MailboxACLEntryKey, MailboxACLRights> expectedEntries = new HashMap<MailboxACL.MailboxACLEntryKey, MailboxACL.MailboxACLRights>(u1u2g1g2ACL.getEntries()); + Map<MailboxACLEntryKey, MailboxACLRights> expectedEntries = new HashMap<>(u1u2g1g2ACL.getEntries()); expectedEntries.put(new SimpleMailboxACLEntryKey(USER_1), new Rfc4314Rights(aeik + lprs)); MailboxACL result = u1u2g1g2ACL.union(new SimpleMailboxACLEntryKey(USER_1), new Rfc4314Rights(lprs)); @@ -134,7 +134,7 @@ public class SimpleMailboxACLTest { public void testExceptACLNew() throws UnsupportedRightException { /* actually no change expected */ - Map<MailboxACLEntryKey, MailboxACLRights> expectedEntries = new HashMap<MailboxACL.MailboxACLEntryKey, MailboxACL.MailboxACLRights>(u1u2g1g2ACL.getEntries()); + Map<MailboxACLEntryKey, MailboxACLRights> expectedEntries = new HashMap<>(u1u2g1g2ACL.getEntries()); MailboxACL toRemove = SimpleMailboxACL.OWNER_FULL_ACL; MailboxACL result = u1u2g1g2ACL.except(toRemove); @@ -148,7 +148,7 @@ public class SimpleMailboxACLTest { public void testExceptEntryNew() throws UnsupportedRightException { /* actually no change expected */ - Map<MailboxACLEntryKey, MailboxACLRights> expectedEntries = new HashMap<MailboxACL.MailboxACLEntryKey, MailboxACL.MailboxACLRights>(u1u2g1g2ACL.getEntries()); + Map<MailboxACLEntryKey, MailboxACLRights> expectedEntries = new HashMap<>(u1u2g1g2ACL.getEntries()); MailboxACL result = u1u2g1g2ACL.except(SimpleMailboxACL.OWNER_KEY, SimpleMailboxACL.FULL_RIGHTS); @@ -160,7 +160,7 @@ public class SimpleMailboxACLTest { @Test public void testExceptACLExisting() throws UnsupportedRightException { - Map<MailboxACLEntryKey, MailboxACLRights> expectedEntries = new HashMap<MailboxACL.MailboxACLEntryKey, MailboxACL.MailboxACLRights>(u1u2g1g2ACL.getEntries()); + Map<MailboxACLEntryKey, MailboxACLRights> expectedEntries = new HashMap<>(u1u2g1g2ACL.getEntries()); expectedEntries.put(new SimpleMailboxACLEntryKey(USER_1), new Rfc4314Rights(ik)); MailboxACL toRemove = new SimpleMailboxACL(new SimpleMailboxACL.SimpleMailboxACLEntry[] { new SimpleMailboxACL.SimpleMailboxACLEntry(USER_1, ae) }); @@ -174,7 +174,7 @@ public class SimpleMailboxACLTest { @Test public void testExceptEntryExisting() throws UnsupportedRightException { - Map<MailboxACLEntryKey, MailboxACLRights> expectedEntries = new HashMap<MailboxACL.MailboxACLEntryKey, MailboxACL.MailboxACLRights>(u1u2g1g2ACL.getEntries()); + Map<MailboxACLEntryKey, MailboxACLRights> expectedEntries = new HashMap<>(u1u2g1g2ACL.getEntries()); expectedEntries.put(new SimpleMailboxACLEntryKey(USER_1), new Rfc4314Rights(ik)); MailboxACL result = u1u2g1g2ACL.except(new SimpleMailboxACLEntryKey(USER_1), new Rfc4314Rights(ae)); @@ -187,7 +187,7 @@ public class SimpleMailboxACLTest { @Test public void testExceptACLFull() throws UnsupportedRightException { - Map<MailboxACLEntryKey, MailboxACLRights> expectedEntries = new HashMap<MailboxACL.MailboxACLEntryKey, MailboxACL.MailboxACLRights>(u1u2g1g2ACL.getEntries()); + Map<MailboxACLEntryKey, MailboxACLRights> expectedEntries = new HashMap<>(u1u2g1g2ACL.getEntries()); expectedEntries.remove(new SimpleMailboxACLEntryKey(USER_1)); MailboxACL toRemove = new SimpleMailboxACL(new SimpleMailboxACL.SimpleMailboxACLEntry[] { new SimpleMailboxACL.SimpleMailboxACLEntry(USER_1, SimpleMailboxACL.FULL_RIGHTS.serialize()) }); @@ -201,7 +201,7 @@ public class SimpleMailboxACLTest { @Test public void testExceptEntryFull() throws UnsupportedRightException { - Map<MailboxACLEntryKey, MailboxACLRights> expectedEntries = new HashMap<MailboxACL.MailboxACLEntryKey, MailboxACL.MailboxACLRights>(u1u2g1g2ACL.getEntries()); + Map<MailboxACLEntryKey, MailboxACLRights> expectedEntries = new HashMap<>(u1u2g1g2ACL.getEntries()); expectedEntries.remove(new SimpleMailboxACLEntryKey(USER_1)); MailboxACL result = u1u2g1g2ACL.except(new SimpleMailboxACLEntryKey(USER_1), SimpleMailboxACL.FULL_RIGHTS); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/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 77530fa..8a5a817 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 @@ -26,7 +26,7 @@ import org.apache.james.mailbox.MailboxListener; public class EventCollector implements MailboxListener { - private final List<Event> events = new ArrayList<Event>(); + private final List<Event> events = new ArrayList<>(); private final ListenerType listenerType; http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseUtils.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseUtils.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseUtils.java index 01640d8..fdb16ee 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseUtils.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseUtils.java @@ -257,7 +257,7 @@ public class HBaseUtils { public static MailboxMessage messageMetaFromResult(Configuration conf, Result result, MessageId.Factory messageIdFactory) { HBaseMailboxMessage message = null; Flags flags = new Flags(); - List<Property> propList = new ArrayList<Property>(); + List<Property> propList = new ArrayList<>(); KeyValue[] keys = result.raw(); String mediaType = null, subType = null; MessageUid uid; http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapper.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapper.java index 874175d..4b205fe 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapper.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapper.java @@ -193,7 +193,7 @@ public class HBaseMailboxMapper extends HBaseNonTransactionalMapper implements M scan.setFilter(filters); scanner = mailboxes.getScanner(scan); - List<Mailbox> mailboxList = new ArrayList<Mailbox>(); + List<Mailbox> mailboxList = new ArrayList<>(); for (Result result : scanner) { mailboxList.add(mailboxFromResult(result)); @@ -225,7 +225,7 @@ public class HBaseMailboxMapper extends HBaseNonTransactionalMapper implements M scan.setCaching(mailboxes.getConfiguration().getInt("hbase.client.scanner.caching", 1) * 2); scan.setMaxVersions(1); scanner = mailboxes.getScanner(scan); - List<Mailbox> mailboxList = new ArrayList<Mailbox>(); + List<Mailbox> mailboxList = new ArrayList<>(); Result result; while ((result = scanner.next()) != null) { @@ -361,7 +361,7 @@ public class HBaseMailboxMapper extends HBaseNonTransactionalMapper implements M scan.addColumn(MESSAGES_META_CF, MESSAGE_INTERNALDATE); scanner = messages.getScanner(scan); Result result; - List<Delete> deletes = new ArrayList<Delete>(); + List<Delete> deletes = new ArrayList<>(); while ((result = scanner.next()) != null) { deletes.add(new Delete(result.getRow())); } @@ -372,7 +372,7 @@ public class HBaseMailboxMapper extends HBaseNonTransactionalMapper implements M System.out.println("Just " + deletes.size() + " out of " + totalDeletes + " messages have been deleted"); //throw new RuntimeException("Just " + deletes.size() + " out of " + totalDeletes + " messages have been deleted"); } - List<Put> puts = new ArrayList<Put>(); + List<Put> puts = new ArrayList<>(); scan = new Scan(); scan.setMaxVersions(1); scan.addColumn(MAILBOX_CF, MAILBOX_MESSAGE_COUNT); @@ -401,7 +401,7 @@ public class HBaseMailboxMapper extends HBaseNonTransactionalMapper implements M scan.addColumn(MAILBOX_CF, MAILBOX_NAME); scanner = mailboxes.getScanner(scan); Result result; - List<Delete> deletes = new ArrayList<Delete>(); + List<Delete> deletes = new ArrayList<>(); while ((result = scanner.next()) != null) { deletes.add(new Delete(result.getRow())); } http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessage.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessage.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessage.java index d401e36..3ef781d 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessage.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessage.java @@ -106,7 +106,7 @@ public class HBaseMailboxMessage implements MailboxMessage { this.uid = uid; this.messageId = messageId; this.modSeq = modSeq; - this.userFlags = new ArrayList<String>(); + this.userFlags = new ArrayList<>(); setFlags(original.createFlags()); // A copy of a message is recent @@ -130,7 +130,7 @@ public class HBaseMailboxMessage implements MailboxMessage { this.mailboxId = mailboxId; this.messageId = messageId; this.internalDate = internalDate; - userFlags = new ArrayList<String>(); + userFlags = new ArrayList<>(); setFlags(flags); this.contentOctets = contentOctets; @@ -214,7 +214,7 @@ public class HBaseMailboxMessage implements MailboxMessage { */ @Override public List<Property> getProperties() { - return new ArrayList<Property>(properties); + return new ArrayList<>(properties); } /** http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java index b18579a..326275d 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java @@ -165,7 +165,7 @@ public class HBaseMessageMapper extends NonTransactionalMapper implements Messag } private List<MailboxMessage> findMessagesInMailbox(HBaseId mailboxId, int batchSize, boolean flaggedForDelete) throws IOException { - List<MailboxMessage> messageList = new ArrayList<MailboxMessage>(); + List<MailboxMessage> messageList = new ArrayList<>(); HTable messages = new HTable(conf, MESSAGES_TABLE); Scan scan = new Scan(minMessageRowKey(mailboxId), new PrefixFilter(mailboxId.toBytes())); @@ -194,7 +194,7 @@ public class HBaseMessageMapper extends NonTransactionalMapper implements Messag } private List<MailboxMessage> findMessagesInMailboxWithUID(HBaseId mailboxId, MessageUid from, boolean flaggedForDelete) throws IOException { - List<MailboxMessage> messageList = new ArrayList<MailboxMessage>(); + List<MailboxMessage> messageList = new ArrayList<>(); HTable messages = new HTable(conf, MESSAGES_TABLE); Get get = new Get(messageRowKey(mailboxId, from)); get.setMaxVersions(1); @@ -218,7 +218,7 @@ public class HBaseMessageMapper extends NonTransactionalMapper implements Messag } private List<MailboxMessage> findMessagesInMailboxAfterUID(HBaseId mailboxId, MessageUid messageUid, int batchSize, boolean flaggedForDelete) throws IOException { - List<MailboxMessage> messageList = new ArrayList<MailboxMessage>(); + List<MailboxMessage> messageList = new ArrayList<>(); HTable messages = new HTable(conf, MESSAGES_TABLE); // uids are stored in reverse so we need to search @@ -256,7 +256,7 @@ public class HBaseMessageMapper extends NonTransactionalMapper implements Messag } private List<MailboxMessage> findMessagesInMailboxBetweenUIDs(HBaseId mailboxId, MessageUid from, MessageUid to, int batchSize, boolean flaggedForDelete) throws IOException { - List<MailboxMessage> messageList = new ArrayList<MailboxMessage>(); + List<MailboxMessage> messageList = new ArrayList<>(); if (from.compareTo(to) > 0) { return messageList; } @@ -496,7 +496,7 @@ public class HBaseMessageMapper extends NonTransactionalMapper implements Messag scanner = messages.getScanner(scan); Result result; - List<MessageUid> uids = new ArrayList<MessageUid>(); + List<MessageUid> uids = new ArrayList<>(); while ((result = scanner.next()) != null) { uids.add(MessageUid.of(Long.MAX_VALUE - Bytes.toLong(result.getRow(), 16, 8))); } @@ -540,7 +540,7 @@ public class HBaseMessageMapper extends NonTransactionalMapper implements Messag @Override public Iterator<UpdatedFlags> updateFlags(Mailbox mailbox, FlagsUpdateCalculator flagsUpdateCalculator, MessageRange set) throws MailboxException { - final List<UpdatedFlags> updatedFlags = new ArrayList<UpdatedFlags>(); + final List<UpdatedFlags> updatedFlags = new ArrayList<>(); Iterator<MailboxMessage> messagesFound = findInMailbox(mailbox, set, FetchType.Metadata, -1); HTable messages = null; @@ -725,7 +725,7 @@ public class HBaseMessageMapper extends NonTransactionalMapper implements Messag private void deleteDeletedMessagesInMailboxBetweenUIDs(HBaseId mailboxId, MessageUid fromUid, MessageUid toUid) throws IOException { HTable messages = new HTable(conf, MESSAGES_TABLE); HTable mailboxes = new HTable(conf, MAILBOXES_TABLE); - List<Delete> deletes = new ArrayList<Delete>(); + List<Delete> deletes = new ArrayList<>(); /*TODO: check if Between should be inclusive or exclusive regarding limits. * HBase scan operaion are exclusive to the upper bound when providing stop row key. */ @@ -751,7 +751,7 @@ public class HBaseMessageMapper extends NonTransactionalMapper implements Messag private void deleteDeletedMessagesInMailboxAfterUID(HBaseId mailboxId, MessageUid fromUid) throws IOException { HTable messages = new HTable(conf, MESSAGES_TABLE); HTable mailboxes = new HTable(conf, MAILBOXES_TABLE); - List<Delete> deletes = new ArrayList<Delete>(); + List<Delete> deletes = new ArrayList<>(); /*TODO: check if Between should be inclusive or exclusive regarding limits. * HBase scan operaion are exclusive to the upper bound when providing stop row key. */ @@ -777,7 +777,7 @@ public class HBaseMessageMapper extends NonTransactionalMapper implements Messag private void deleteDeletedMessagesInMailbox(HBaseId mailboxId) throws IOException { HTable messages = new HTable(conf, MESSAGES_TABLE); HTable mailboxes = new HTable(conf, MAILBOXES_TABLE); - List<Delete> deletes = new ArrayList<Delete>(); + List<Delete> deletes = new ArrayList<>(); /*TODO: check if Between should be inclusive or exclusive regarding limits. * HBase scan operaion are exclusive to the upper bound when providing stop row key. */ @@ -802,7 +802,7 @@ public class HBaseMessageMapper extends NonTransactionalMapper implements Messag } private Map<MessageUid, MessageMetaData> createMetaData(List<MailboxMessage> uids) { - final Map<MessageUid, MessageMetaData> data = new HashMap<MessageUid, MessageMetaData>(); + final Map<MessageUid, MessageMetaData> data = new HashMap<>(); for (MailboxMessage m : uids) { data.put(m.getUid(), new SimpleMessageMetaData(m)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapper.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapper.java index 33a3f58..d7f0fdb 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapper.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapper.java @@ -121,7 +121,7 @@ public class HBaseSubscriptionMapper extends HBaseNonTransactionalMapper impleme HTable subscriptions = null; try { subscriptions = new HTable(conf, SUBSCRIPTIONS_TABLE); - List<Subscription> subscriptionList = new ArrayList<Subscription>(); + List<Subscription> subscriptionList = new ArrayList<>(); Get get = new Get(Bytes.toBytes(user)); get.addFamily(SUBSCRIPTION_CF); Result result = subscriptions.get(get); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapperTest.java b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapperTest.java index 35dc9ff..078824c 100644 --- a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapperTest.java +++ b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapperTest.java @@ -313,9 +313,9 @@ public class HBaseMailboxMapperTest { } private static void fillMailboxList() { - mailboxList = new ArrayList<HBaseMailbox>(); - pathsList = new ArrayList<MailboxPath>(); - idsList = new ArrayList<HBaseId>(); + mailboxList = new ArrayList<>(); + pathsList = new ArrayList<>(); + idsList = new ArrayList<>(); MailboxPath path; String name; for (int i = 0; i < NAMESPACES; i++) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessageMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessageMapperTest.java b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessageMapperTest.java index 50b6d27..a788a94 100644 --- a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessageMapperTest.java +++ b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessageMapperTest.java @@ -70,9 +70,9 @@ public class HBaseMailboxMessageMapperTest { private static HBaseUidProvider uidProvider; private static HBaseModSeqProvider modSeqProvider; private static HBaseMessageMapper messageMapper; - private static final List<MailboxPath> MBOX_PATHS = new ArrayList<MailboxPath>(); - private static final List<Mailbox> MBOXES = new ArrayList<Mailbox>(); - private static final List<MailboxMessage> MESSAGE_NO = new ArrayList<MailboxMessage>(); + private static final List<MailboxPath> MBOX_PATHS = new ArrayList<>(); + private static final List<Mailbox> MBOXES = new ArrayList<>(); + private static final List<MailboxMessage> MESSAGE_NO = new ArrayList<>(); private static final int COUNT = 5; private static Configuration conf; private DefaultMessageId.Factory messageIdFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseUidAndModSeqProviderTest.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseUidAndModSeqProviderTest.java b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseUidAndModSeqProviderTest.java index 80c4695..6b6f995 100644 --- a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseUidAndModSeqProviderTest.java +++ b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseUidAndModSeqProviderTest.java @@ -18,17 +18,29 @@ ****************************************************************/ package org.apache.james.mailbox.hbase.mail; +import static org.apache.james.mailbox.hbase.HBaseNames.MAILBOXES; +import static org.apache.james.mailbox.hbase.HBaseNames.MAILBOXES_TABLE; +import static org.apache.james.mailbox.hbase.HBaseNames.MAILBOX_CF; +import static org.apache.james.mailbox.hbase.HBaseNames.MESSAGES; +import static org.apache.james.mailbox.hbase.HBaseNames.MESSAGES_META_CF; +import static org.apache.james.mailbox.hbase.HBaseNames.MESSAGES_TABLE; +import static org.apache.james.mailbox.hbase.HBaseNames.MESSAGE_DATA_BODY_CF; +import static org.apache.james.mailbox.hbase.HBaseNames.MESSAGE_DATA_HEADERS_CF; +import static org.apache.james.mailbox.hbase.HBaseNames.SUBSCRIPTIONS; +import static org.apache.james.mailbox.hbase.HBaseNames.SUBSCRIPTIONS_TABLE; +import static org.apache.james.mailbox.hbase.HBaseNames.SUBSCRIPTION_CF; +import static org.junit.Assert.assertEquals; + import java.io.IOException; import java.util.ArrayList; import java.util.List; + import org.apache.hadoop.conf.Configuration; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.hbase.HBaseClusterSingleton; -import static org.apache.james.mailbox.hbase.HBaseNames.*; import org.apache.james.mailbox.hbase.mail.model.HBaseMailbox; import org.apache.james.mailbox.model.MailboxPath; -import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; @@ -83,8 +95,8 @@ public class HBaseUidAndModSeqProviderTest { } private static void fillMailboxList() { - mailboxList = new ArrayList<HBaseMailbox>(); - pathsList = new ArrayList<MailboxPath>(); + mailboxList = new ArrayList<>(); + pathsList = new ArrayList<>(); MailboxPath path; String name; for (int i = 0; i < NAMESPACES; i++) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapperTest.java b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapperTest.java index c4feb6e..7a8cc8b 100644 --- a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapperTest.java +++ b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapperTest.java @@ -18,6 +18,22 @@ ****************************************************************/ package org.apache.james.mailbox.hbase.user; +import static org.apache.james.mailbox.hbase.HBaseNames.MAILBOXES; +import static org.apache.james.mailbox.hbase.HBaseNames.MAILBOXES_TABLE; +import static org.apache.james.mailbox.hbase.HBaseNames.MAILBOX_CF; +import static org.apache.james.mailbox.hbase.HBaseNames.MESSAGES; +import static org.apache.james.mailbox.hbase.HBaseNames.MESSAGES_META_CF; +import static org.apache.james.mailbox.hbase.HBaseNames.MESSAGES_TABLE; +import static org.apache.james.mailbox.hbase.HBaseNames.MESSAGE_DATA_BODY_CF; +import static org.apache.james.mailbox.hbase.HBaseNames.MESSAGE_DATA_HEADERS_CF; +import static org.apache.james.mailbox.hbase.HBaseNames.SUBSCRIPTIONS; +import static org.apache.james.mailbox.hbase.HBaseNames.SUBSCRIPTIONS_TABLE; +import static org.apache.james.mailbox.hbase.HBaseNames.SUBSCRIPTION_CF; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; @@ -33,15 +49,9 @@ import org.apache.james.mailbox.exception.SubscriptionException; import org.apache.james.mailbox.hbase.HBaseClusterSingleton; import org.apache.james.mailbox.hbase.HBaseMailboxSessionMapperFactory; import org.apache.james.mailbox.model.MessageId; - -import static org.apache.james.mailbox.hbase.HBaseNames.*; - import org.apache.james.mailbox.store.mail.model.DefaultMessageId; import org.apache.james.mailbox.store.user.model.Subscription; import org.apache.james.mailbox.store.user.model.impl.SimpleSubscription; - -import static org.junit.Assert.*; - import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; @@ -90,10 +100,10 @@ public class HBaseSubscriptionMapperTest { LOG.info("Creating subscription list"); SimpleSubscription subscription; String user, mailbox; - subscriptionList = new HashMap<String, List<SimpleSubscription>>(); + subscriptionList = new HashMap<>(); for (int i = 0; i < USERS; i++) { user = "user" + i; - final List<SimpleSubscription> mailboxes = new ArrayList<SimpleSubscription>(); + final List<SimpleSubscription> mailboxes = new ArrayList<>(); subscriptionList.put(user, mailboxes); for (int j = 0; j < MAILBOX_NO; j++) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/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 761a2ac..0e0be80 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 @@ -127,7 +127,7 @@ public class JCRMailboxMapper extends AbstractJCRScalingMapper implements Mailbo * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxWithPathLike(org.apache.james.imap.api.MailboxPath) */ public List<Mailbox> findMailboxWithPathLike(MailboxPath path) throws MailboxException { - List<Mailbox> mailboxList = new ArrayList<Mailbox>(); + List<Mailbox> mailboxList = new ArrayList<>(); try { String name = Text.escapeIllegalXpathSearchChars(path.getName()); String user = path.getUser(); @@ -235,7 +235,7 @@ public class JCRMailboxMapper extends AbstractJCRScalingMapper implements Mailbo */ public List<Mailbox> list() throws MailboxException { try { - List<Mailbox> mList = new ArrayList<Mailbox>(); + List<Mailbox> mList = new ArrayList<>(); QueryManager manager = getSession().getWorkspace().getQueryManager(); String queryString = "/jcr:root/" + MAILBOXES_PATH + "//element(*,jamesMailbox:mailbox)"; http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java index ee2e506..f11520a 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java @@ -339,7 +339,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo try { - List<MessageUid> list = new ArrayList<MessageUid>(); + List<MessageUid> list = new ArrayList<>(); String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message)[@" + JCRMailboxMessage.RECENT_PROPERTY + "='true'] order by @" + JCRMailboxMessage.UID_PROPERTY; @@ -404,7 +404,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo results = findDeletedMessagesInMailboxBetweenUIDs(mailbox, from, to); break; } - Map<MessageUid, MessageMetaData> uids = new HashMap<MessageUid, MessageMetaData>(); + Map<MessageUid, MessageMetaData> uids = new HashMap<>(); for (MailboxMessage m : results) { MessageUid uid = m.getUid(); uids.put(uid, new SimpleMessageMetaData(m)); @@ -555,7 +555,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo private List<MailboxMessage> findMessagesInMailboxAfterUID(Mailbox mailbox, MessageUid from, int batchSize) throws RepositoryException { - List<MailboxMessage> list = new ArrayList<MailboxMessage>(); + List<MailboxMessage> list = new ArrayList<>(); String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message)[@" + JCRMailboxMessage.UID_PROPERTY + ">=" + from + "] order by @" + JCRMailboxMessage.UID_PROPERTY; @@ -574,7 +574,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo private List<MailboxMessage> findMessageInMailboxWithUID(Mailbox mailbox, MessageUid from) throws RepositoryException { - List<MailboxMessage> list = new ArrayList<MailboxMessage>(); + List<MailboxMessage> list = new ArrayList<>(); String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message)[@" + JCRMailboxMessage.UID_PROPERTY + "=" + from + "]"; @@ -591,7 +591,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo private List<MailboxMessage> findMessagesInMailboxBetweenUIDs(Mailbox mailbox, MessageUid from, MessageUid to, int batchSize) throws RepositoryException { - List<MailboxMessage> list = new ArrayList<MailboxMessage>(); + List<MailboxMessage> list = new ArrayList<>(); String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message)[@" + JCRMailboxMessage.UID_PROPERTY + ">=" + from + " and @" + JCRMailboxMessage.UID_PROPERTY + "<=" + to + "] order by @" + JCRMailboxMessage.UID_PROPERTY; @@ -611,7 +611,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo private List<MailboxMessage> findMessagesInMailbox(Mailbox mailbox, int batchSize) throws RepositoryException { - List<MailboxMessage> list = new ArrayList<MailboxMessage>(); + List<MailboxMessage> list = new ArrayList<>(); String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message) order by @" + JCRMailboxMessage.UID_PROPERTY; @@ -630,7 +630,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo private List<MailboxMessage> findDeletedMessagesInMailboxAfterUID(Mailbox mailbox, MessageUid from) throws RepositoryException { - List<MailboxMessage> list = new ArrayList<MailboxMessage>(); + List<MailboxMessage> list = new ArrayList<>(); String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message)[@" + JCRMailboxMessage.UID_PROPERTY + ">=" + from + " and @" + JCRMailboxMessage.DELETED_PROPERTY + "='true'] order by @" + JCRMailboxMessage.UID_PROPERTY; @@ -647,7 +647,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo private List<MailboxMessage> findDeletedMessageInMailboxWithUID(Mailbox mailbox, MessageUid from) throws RepositoryException { - List<MailboxMessage> list = new ArrayList<MailboxMessage>(); + List<MailboxMessage> list = new ArrayList<>(); String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message)[@" + JCRMailboxMessage.UID_PROPERTY + "=" + from + " and @" + JCRMailboxMessage.DELETED_PROPERTY + "='true']"; QueryManager manager = getSession().getWorkspace().getQueryManager(); @@ -665,7 +665,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo private List<MailboxMessage> findDeletedMessagesInMailboxBetweenUIDs(Mailbox mailbox, MessageUid from, MessageUid to) throws RepositoryException { - List<MailboxMessage> list = new ArrayList<MailboxMessage>(); + List<MailboxMessage> list = new ArrayList<>(); String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message)[@" + JCRMailboxMessage.UID_PROPERTY + ">=" + from + " and @" + JCRMailboxMessage.UID_PROPERTY + "<=" + to + " and @" + JCRMailboxMessage.DELETED_PROPERTY + "='true'] order by @" + JCRMailboxMessage.UID_PROPERTY; @@ -682,7 +682,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo private List<MailboxMessage> findDeletedMessagesInMailbox(Mailbox mailbox) throws RepositoryException { - List<MailboxMessage> list = new ArrayList<MailboxMessage>(); + List<MailboxMessage> list = new ArrayList<>(); String queryString = "/jcr:root" + getMailboxPath(mailbox) + "//element(*,jamesMailbox:message)[@" + JCRMailboxMessage.DELETED_PROPERTY + "='true'] order by @" + JCRMailboxMessage.UID_PROPERTY; http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java index 7ffabb6..2431826 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java @@ -126,7 +126,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers this.mediaType = propertyBuilder.getMediaType(); this.subType = propertyBuilder.getSubType(); final List<Property> properties = propertyBuilder.toProperties(); - this.properties = new ArrayList<JCRProperty>(properties.size()); + this.properties = new ArrayList<>(properties.size()); for (Property property:properties) { this.properties.add(new JCRProperty(property,logger)); } @@ -158,7 +158,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers this.mediaType = message.getMediaType(); this.subType = message.getSubType(); final List<Property> properties = pBuilder.toProperties(); - this.properties = new ArrayList<JCRProperty>(properties.size()); + this.properties = new ArrayList<>(properties.size()); for (Property property:properties) { this.properties.add(new JCRProperty(property, logger)); } @@ -195,7 +195,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers public List<Property> getProperties() { if (isPersistent()) { try { - List<Property> properties = new ArrayList<Property>(); + List<Property> properties = new ArrayList<>(); NodeIterator nodeIt = node.getNodes("messageProperty"); while (nodeIt.hasNext()) { properties.add(new JCRProperty(nodeIt.nextNode(), logger)); @@ -205,7 +205,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers logger.error("Unable to retrieve nodes messageProperty", e); } } - return new ArrayList<Property>(properties); + return new ArrayList<>(properties); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java index 4da5b10..f83ac54 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java @@ -71,7 +71,7 @@ public class JCRSubscriptionMapper extends AbstractJCRScalingMapper implements S if (node != null) { Property prop = node.getProperty(JCRSubscription.MAILBOXES_PROPERTY); Value[] values = prop.getValues(); - List<String> newValues = new ArrayList<String>(); + List<String> newValues = new ArrayList<>(); for (Value value : values) { String m = value.getString(); if (m.equals(sub.getMailbox()) == false) { @@ -127,7 +127,7 @@ public class JCRSubscriptionMapper extends AbstractJCRScalingMapper implements S * (java.lang.String) */ public List<Subscription> findSubscriptionsForUser(String user) throws SubscriptionException { - List<Subscription> subList = new ArrayList<Subscription>(); + List<Subscription> subList = new ArrayList<>(); try { String queryString = "/jcr:root/" + MAILBOXES_PATH + "//element(*,jamesMailbox:user)[@" + JCRSubscription.USERNAME_PROPERTY + "='" + user + "']"; http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java index e465cda..18616d8 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java @@ -111,7 +111,7 @@ public class JCRSubscription implements Subscription, Persistent, JCRImapConstan node.setProperty(USERNAME_PROPERTY, getUser()); if (node.hasProperty(MAILBOXES_PROPERTY)) { Value[] mailboxes = node.getProperty(MAILBOXES_PROPERTY).getValues(); - List<String>newMailboxes = new ArrayList<String>(); + List<String>newMailboxes = new ArrayList<>(); for (Value mailbox : mailboxes) { String m = mailbox.getString(); newMailboxes.add(m); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java index 3cf6cf3..70341e6 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java @@ -390,7 +390,7 @@ public class JPAMessageMapper extends JPATransactionalMapper implements MessageM } private Map<MessageUid, MessageMetaData> createMetaData(List<MailboxMessage> uids) { - final Map<MessageUid, MessageMetaData> data = new HashMap<MessageUid, MessageMetaData>(); + final Map<MessageUid, MessageMetaData> data = new HashMap<>(); for (MailboxMessage m : uids) { data.put(m.getUid(), new SimpleMessageMetaData(m)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java index 2b27598..1a13ef1 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java @@ -240,7 +240,7 @@ public abstract class AbstractJPAMailboxMessage implements MailboxMessage { int bodyStartOctet, PropertyBuilder propertyBuilder) { this.mailbox = mailbox; this.internalDate = internalDate; - userFlags = new ArrayList<JPAUserFlag>(); + userFlags = new ArrayList<>(); setFlags(flags); this.contentOctets = contentOctets; @@ -249,7 +249,7 @@ public abstract class AbstractJPAMailboxMessage implements MailboxMessage { this.mediaType = propertyBuilder.getMediaType(); this.subType = propertyBuilder.getSubType(); final List<Property> properties = propertyBuilder.toProperties(); - this.properties = new ArrayList<JPAProperty>(properties.size()); + this.properties = new ArrayList<>(properties.size()); int order = 0; for (Property property : properties) { this.properties.add(new JPAProperty(property, order++)); @@ -276,7 +276,7 @@ public abstract class AbstractJPAMailboxMessage implements MailboxMessage { this.mailbox = mailbox; this.uid = uid.asLong(); this.modSeq = modSeq; - this.userFlags = new ArrayList<JPAUserFlag>(); + this.userFlags = new ArrayList<>(); setFlags(original.createFlags()); // A copy of a message is recent @@ -292,7 +292,7 @@ public abstract class AbstractJPAMailboxMessage implements MailboxMessage { this.mediaType = original.getMediaType(); this.subType = original.getSubType(); final List<Property> properties = pBuilder.toProperties(); - this.properties = new ArrayList<JPAProperty>(properties.size()); + this.properties = new ArrayList<>(properties.size()); int order = 0; for (Property property : properties) { this.properties.add(new JPAProperty(property, order++)); @@ -354,7 +354,7 @@ public abstract class AbstractJPAMailboxMessage implements MailboxMessage { * @return unmodifiable list of meta-data, not null */ public List<Property> getProperties() { - return new ArrayList<Property>(properties); + return new ArrayList<>(properties); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
