This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit b380c1aff6598f8696af7298252c0985a391f2e3 Author: quanth <[email protected]> AuthorDate: Mon Jul 5 17:33:58 2021 +0700 JAMES-3516 Rename NaiveThreadIdGuessingAlgorithm NaiveThreadIdGuessingAlgorithmImpl -> NaiveThreadIdGuessingAlgorithm --- .../james/mailbox/cassandra/CassandraMailboxManagerProvider.java | 4 ++-- .../apache/james/mailbox/cassandra/CassandraTestSystemFixture.java | 4 ++-- .../cassandra/mail/CassandraMailboxManagerAttachmentTest.java | 4 ++-- mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml | 2 +- .../org/apache/james/mailbox/jpa/JpaMailboxManagerProvider.java | 4 ++-- .../maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml | 2 +- .../apache/james/mailbox/maildir/MaildirMailboxManagerProvider.java | 4 ++-- .../memory/src/main/resources/META-INF/spring/mailbox-memory.xml | 2 +- .../mailbox/inmemory/manager/InMemoryIntegrationResources.java | 4 ++-- ...essingAlgorithmImpl.java => NaiveThreadIdGuessingAlgorithm.java} | 4 +++- .../james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java | 4 ++-- .../org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java | 4 ++-- .../james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java | 4 ++-- .../org/apache/james/modules/mailbox/CassandraMailboxModule.java | 6 +++--- .../java/org/apache/james/modules/mailbox/JPAMailboxModule.java | 6 +++--- .../java/org/apache/james/modules/mailbox/MemoryMailboxModule.java | 4 ++-- 16 files changed, 32 insertions(+), 30 deletions(-) diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java index dc52f59..cad1f34 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java @@ -48,7 +48,7 @@ import org.apache.james.mailbox.store.StoreMailboxAnnotationManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.event.MailboxAnnotationListener; import org.apache.james.mailbox.store.extractor.DefaultTextExtractor; -import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithmImpl; +import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm; import org.apache.james.mailbox.store.mail.ThreadIdGuessingAlgorithm; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.apache.james.mailbox.store.quota.DefaultUserQuotaRootResolver; @@ -82,7 +82,7 @@ public class CassandraMailboxManagerProvider { CassandraConfiguration cassandraConfiguration, MailboxManagerConfiguration mailboxManagerConfiguration) { CassandraMessageId.Factory messageIdFactory = new CassandraMessageId.Factory(); - ThreadIdGuessingAlgorithm threadIdGuessingAlgorithm = new NaiveThreadIdGuessingAlgorithmImpl(); + ThreadIdGuessingAlgorithm threadIdGuessingAlgorithm = new NaiveThreadIdGuessingAlgorithm(); CassandraMailboxSessionMapperFactory mapperFactory = TestCassandraMailboxSessionMapperFactory.forTests( cassandra, diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java index b6532dc..7806baf 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java @@ -50,7 +50,7 @@ import org.apache.james.mailbox.store.StoreMessageIdManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.event.MailboxAnnotationListener; import org.apache.james.mailbox.store.extractor.DefaultTextExtractor; -import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithmImpl; +import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.apache.james.mailbox.store.quota.DefaultUserQuotaRootResolver; import org.apache.james.mailbox.store.quota.QuotaComponents; @@ -79,7 +79,7 @@ public class CassandraTestSystemFixture { CassandraMailboxManager cassandraMailboxManager = new CassandraMailboxManager(mapperFactory, sessionProvider, new NoMailboxPathLocker(), new MessageParser(), new CassandraMessageId.Factory(), eventBus, annotationManager, storeRightManager, quotaComponents, index, MailboxManagerConfiguration.DEFAULT, PreDeletionHooks.NO_PRE_DELETION_HOOK, - new NaiveThreadIdGuessingAlgorithmImpl()); + new NaiveThreadIdGuessingAlgorithm()); eventBus.register(new MailboxAnnotationListener(mapperFactory, sessionProvider)); eventBus.register(mapperFactory.deleteMessageListener()); diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java index 73b8130..9745536 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java @@ -49,7 +49,7 @@ import org.apache.james.mailbox.store.StoreMailboxAnnotationManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.extractor.DefaultTextExtractor; import org.apache.james.mailbox.store.mail.AttachmentMapperFactory; -import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithmImpl; +import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm; import org.apache.james.mailbox.store.mail.ThreadIdGuessingAlgorithm; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.apache.james.mailbox.store.quota.QuotaComponents; @@ -75,7 +75,7 @@ class CassandraMailboxManagerAttachmentTest extends AbstractMailboxManagerAttach private void initSystemUnderTest() throws Exception { CassandraMessageId.Factory messageIdFactory = new CassandraMessageId.Factory(); - ThreadIdGuessingAlgorithm threadIdGuessingAlgorithm = new NaiveThreadIdGuessingAlgorithmImpl(); + ThreadIdGuessingAlgorithm threadIdGuessingAlgorithm = new NaiveThreadIdGuessingAlgorithm(); mailboxSessionMapperFactory = TestCassandraMailboxSessionMapperFactory.forTests( cassandraCluster.getCassandraCluster(), diff --git a/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml b/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml index ea8e896..6d717dc 100644 --- a/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml +++ b/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml @@ -44,7 +44,7 @@ <constructor-arg index="9" ref="threadIdGuessingAlgorithm" /> </bean> - <bean id="threadIdGuessingAlgorithm" class="org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithmImpl" /> + <bean id="threadIdGuessingAlgorithm" class="org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm" /> <bean id ="jpa-subscriptionManager" class="org.apache.james.mailbox.store.StoreSubscriptionManager"> <constructor-arg index="0" ref="jpa-sessionMapperFactory"/> diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerProvider.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerProvider.java index e7582f3..ab0bbf8 100644 --- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerProvider.java +++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerProvider.java @@ -39,7 +39,7 @@ import org.apache.james.mailbox.store.SessionProviderImpl; import org.apache.james.mailbox.store.StoreMailboxAnnotationManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.extractor.DefaultTextExtractor; -import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithmImpl; +import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm; import org.apache.james.mailbox.store.mail.model.DefaultMessageId; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.apache.james.mailbox.store.quota.QuotaComponents; @@ -74,6 +74,6 @@ public class JpaMailboxManagerProvider { return new OpenJPAMailboxManager(mf, sessionProvider, messageParser, new DefaultMessageId.Factory(), eventBus, annotationManager, - storeRightManager, quotaComponents, index, new NaiveThreadIdGuessingAlgorithmImpl()); + storeRightManager, quotaComponents, index, new NaiveThreadIdGuessingAlgorithm()); } } diff --git a/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml b/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml index baf4dfd..247b28a 100644 --- a/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml +++ b/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml @@ -51,7 +51,7 @@ </bean> <bean id ="no-mailbox-configuration" class="org.apache.james.mailbox.store.MailboxManagerConfiguration.NoMailboxConfiguration"/> - <bean id ="threadIdGuessingAlgorithm" class="org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithmImpl"/> + <bean id ="threadIdGuessingAlgorithm" class="org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm"/> <bean id ="maildir-subscriptionManager" class="org.apache.james.mailbox.store.StoreSubscriptionManager"> <constructor-arg index="0" ref="maildir-sessionMapperFactory"/> diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerProvider.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerProvider.java index 388d7fc..2862403 100644 --- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerProvider.java +++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerProvider.java @@ -39,7 +39,7 @@ import org.apache.james.mailbox.store.StoreMailboxAnnotationManager; import org.apache.james.mailbox.store.StoreMailboxManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.extractor.DefaultTextExtractor; -import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithmImpl; +import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm; import org.apache.james.mailbox.store.mail.model.DefaultMessageId; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.apache.james.mailbox.store.quota.QuotaComponents; @@ -70,7 +70,7 @@ public class MaildirMailboxManagerProvider { StoreMailboxManager manager = new StoreMailboxManager(mf, sessionProvider, new JVMMailboxPathLocker(), messageParser, new DefaultMessageId.Factory(), annotationManager, eventBus, storeRightManager, - quotaComponents, index, MailboxManagerConfiguration.DEFAULT, PreDeletionHooks.NO_PRE_DELETION_HOOK, new NaiveThreadIdGuessingAlgorithmImpl()); + quotaComponents, index, MailboxManagerConfiguration.DEFAULT, PreDeletionHooks.NO_PRE_DELETION_HOOK, new NaiveThreadIdGuessingAlgorithm()); return manager; } diff --git a/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml b/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml index 3ef6ec1..6f5ba0c 100644 --- a/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml +++ b/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml @@ -51,7 +51,7 @@ </bean> <bean id="memory-sessionMapperFactory" class="org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory" /> - <bean id="threadIdGuessingAlgorithm" class="org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithmImpl"/> + <bean id="threadIdGuessingAlgorithm" class="org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm"/> <alias name="jvm-locker" alias="memory-locker"/> diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java index 9446b1c..fdc3be0 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java @@ -62,7 +62,7 @@ import org.apache.james.mailbox.store.StoreMessageIdManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.event.MailboxAnnotationListener; import org.apache.james.mailbox.store.extractor.DefaultTextExtractor; -import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithmImpl; +import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm; import org.apache.james.mailbox.store.mail.ThreadIdGuessingAlgorithm; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.apache.james.mailbox.store.quota.CurrentQuotaCalculator; @@ -315,7 +315,7 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM QuotaComponents quotaComponents = new QuotaComponents(maxQuotaManager, quotaManager, quotaRootResolver); InMemoryMessageId.Factory messageIdFactory = new InMemoryMessageId.Factory(); - ThreadIdGuessingAlgorithm threadIdGuessingAlgorithm = new NaiveThreadIdGuessingAlgorithmImpl(); + ThreadIdGuessingAlgorithm threadIdGuessingAlgorithm = new NaiveThreadIdGuessingAlgorithm(); MailboxManagerPreInstanciationStage preInstanciationStage = new MailboxManagerPreInstanciationStage(mailboxSessionMapperFactory, sessionProvider); PreDeletionHooks hooks = createHooks(preInstanciationStage); diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/NaiveThreadIdGuessingAlgorithmImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/NaiveThreadIdGuessingAlgorithm.java similarity index 94% rename from mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/NaiveThreadIdGuessingAlgorithmImpl.java rename to mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/NaiveThreadIdGuessingAlgorithm.java index ebf5ed5..c725c58 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/NaiveThreadIdGuessingAlgorithmImpl.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/NaiveThreadIdGuessingAlgorithm.java @@ -28,7 +28,9 @@ import org.apache.james.mailbox.model.ThreadId; import org.apache.james.mailbox.store.mail.model.MimeMessageId; import org.apache.james.mailbox.store.mail.model.Subject; -public class NaiveThreadIdGuessingAlgorithmImpl implements ThreadIdGuessingAlgorithm { +import reactor.core.publisher.Mono; + +public class NaiveThreadIdGuessingAlgorithm implements ThreadIdGuessingAlgorithm { @Override public ThreadId guessThreadId(Username username, MessageId messageId, Optional<MimeMessageId> thisMimeMessageId, Optional<MimeMessageId> inReplyTo, Optional<List<MimeMessageId>> references, Optional<Subject> subject) { return ThreadId.fromBaseMessageId(messageId); diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java index b859cb0..bdc05e4 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java @@ -53,7 +53,7 @@ import org.apache.james.mailbox.store.StoreMessageIdManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.StoreSubscriptionManager; import org.apache.james.mailbox.store.extractor.DefaultTextExtractor; -import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithmImpl; +import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm; import org.apache.james.mailbox.store.mail.ThreadIdGuessingAlgorithm; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.apache.james.mailbox.store.quota.DefaultUserQuotaRootResolver; @@ -97,7 +97,7 @@ public class CassandraHostSystem extends JamesImapHostSystem { cassandra = CassandraCluster.create(MailboxAggregateModule.MODULE_WITH_QUOTA, cassandraHost); com.datastax.driver.core.Session session = cassandra.getConf(); CassandraMessageId.Factory messageIdFactory = new CassandraMessageId.Factory(); - ThreadIdGuessingAlgorithm threadIdGuessingAlgorithm = new NaiveThreadIdGuessingAlgorithmImpl(); + ThreadIdGuessingAlgorithm threadIdGuessingAlgorithm = new NaiveThreadIdGuessingAlgorithm(); CassandraMailboxSessionMapperFactory mapperFactory = TestCassandraMailboxSessionMapperFactory.forTests( cassandra, messageIdFactory); diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java index 442ad46..deeed4e 100644 --- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java +++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java @@ -53,7 +53,7 @@ import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.StoreSubscriptionManager; import org.apache.james.mailbox.store.event.MailboxAnnotationListener; import org.apache.james.mailbox.store.extractor.DefaultTextExtractor; -import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithmImpl; +import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm; import org.apache.james.mailbox.store.mail.model.DefaultMessageId; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.apache.james.mailbox.store.quota.DefaultUserQuotaRootResolver; @@ -119,7 +119,7 @@ public class JPAHostSystem extends JamesImapHostSystem { MessageSearchIndex index = new SimpleMessageSearchIndex(mapperFactory, mapperFactory, new DefaultTextExtractor(), attachmentContentLoader); mailboxManager = new OpenJPAMailboxManager(mapperFactory, sessionProvider, messageParser, new DefaultMessageId.Factory(), - eventBus, annotationManager, storeRightManager, quotaComponents, index, new NaiveThreadIdGuessingAlgorithmImpl()); + eventBus, annotationManager, storeRightManager, quotaComponents, index, new NaiveThreadIdGuessingAlgorithm()); eventBus.register(quotaUpdater); eventBus.register(new MailboxAnnotationListener(mapperFactory, sessionProvider)); diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java index 05cce99..d192e9f 100644 --- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java +++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java @@ -48,7 +48,7 @@ import org.apache.james.mailbox.store.StoreMailboxManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.StoreSubscriptionManager; import org.apache.james.mailbox.store.extractor.DefaultTextExtractor; -import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithmImpl; +import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm; import org.apache.james.mailbox.store.mail.model.DefaultMessageId; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.apache.james.mailbox.store.quota.QuotaComponents; @@ -89,7 +89,7 @@ public class MaildirHostSystem extends JamesImapHostSystem { mailboxManager = new StoreMailboxManager(mailboxSessionMapperFactory, sessionProvider, locker, messageParser, new DefaultMessageId.Factory(), annotationManager, eventBus, storeRightManager, quotaComponents, - index, MailboxManagerConfiguration.DEFAULT, PreDeletionHooks.NO_PRE_DELETION_HOOK, new NaiveThreadIdGuessingAlgorithmImpl()); + index, MailboxManagerConfiguration.DEFAULT, PreDeletionHooks.NO_PRE_DELETION_HOOK, new NaiveThreadIdGuessingAlgorithm()); ImapProcessor defaultImapProcessorFactory = DefaultImapProcessorFactory.createDefaultProcessor( diff --git a/server/container/guice/cassandra/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java b/server/container/guice/cassandra/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java index 0425534..0c94c90 100644 --- a/server/container/guice/cassandra/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java +++ b/server/container/guice/cassandra/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java @@ -107,7 +107,7 @@ import org.apache.james.mailbox.store.mail.AttachmentMapperFactory; import org.apache.james.mailbox.store.mail.MailboxMapperFactory; import org.apache.james.mailbox.store.mail.MessageMapperFactory; import org.apache.james.mailbox.store.mail.ModSeqProvider; -import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithmImpl; +import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm; import org.apache.james.mailbox.store.mail.ThreadIdGuessingAlgorithm; import org.apache.james.mailbox.store.mail.UidProvider; import org.apache.james.mailbox.store.user.SubscriptionMapperFactory; @@ -162,7 +162,7 @@ public class CassandraMailboxModule extends AbstractModule { bind(CassandraId.Factory.class).in(Scopes.SINGLETON); bind(CassandraMailboxSessionMapperFactory.class).in(Scopes.SINGLETON); bind(CassandraMessageId.Factory.class).in(Scopes.SINGLETON); - bind(NaiveThreadIdGuessingAlgorithmImpl.class).in(Scopes.SINGLETON); + bind(NaiveThreadIdGuessingAlgorithm.class).in(Scopes.SINGLETON); bind(CassandraModSeqProvider.class).in(Scopes.SINGLETON); bind(CassandraUidProvider.class).in(Scopes.SINGLETON); bind(NoMailboxPathLocker.class).in(Scopes.SINGLETON); @@ -196,7 +196,7 @@ public class CassandraMailboxModule extends AbstractModule { bind(MailboxId.Factory.class).to(CassandraId.Factory.class); bind(State.Factory.class).to(CassandraStateFactory.class); bind(MessageId.Factory.class).to(CassandraMessageId.Factory.class); - bind(ThreadIdGuessingAlgorithm.class).to(NaiveThreadIdGuessingAlgorithmImpl.class); + bind(ThreadIdGuessingAlgorithm.class).to(NaiveThreadIdGuessingAlgorithm.class); bind(MessageIdManager.class).to(StoreMessageIdManager.class); bind(AttachmentManager.class).to(StoreAttachmentManager.class); bind(RightManager.class).to(StoreRightManager.class); diff --git a/server/container/guice/mailbox-jpa/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java b/server/container/guice/mailbox-jpa/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java index e6eb6b2..6d8e896 100644 --- a/server/container/guice/mailbox-jpa/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java +++ b/server/container/guice/mailbox-jpa/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java @@ -55,7 +55,7 @@ import org.apache.james.mailbox.store.event.MailboxAnnotationListener; import org.apache.james.mailbox.store.mail.MailboxMapperFactory; import org.apache.james.mailbox.store.mail.MessageMapperFactory; import org.apache.james.mailbox.store.mail.ModSeqProvider; -import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithmImpl; +import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm; import org.apache.james.mailbox.store.mail.ThreadIdGuessingAlgorithm; import org.apache.james.mailbox.store.mail.UidProvider; import org.apache.james.mailbox.store.mail.model.DefaultMessageId; @@ -90,7 +90,7 @@ public class JPAMailboxModule extends AbstractModule { bind(SimpleGroupMembershipResolver.class).in(Scopes.SINGLETON); bind(UnionMailboxACLResolver.class).in(Scopes.SINGLETON); bind(DefaultMessageId.Factory.class).in(Scopes.SINGLETON); - bind(NaiveThreadIdGuessingAlgorithmImpl.class).in(Scopes.SINGLETON); + bind(NaiveThreadIdGuessingAlgorithm.class).in(Scopes.SINGLETON); bind(ReIndexerImpl.class).in(Scopes.SINGLETON); bind(SessionProviderImpl.class).in(Scopes.SINGLETON); @@ -99,7 +99,7 @@ public class JPAMailboxModule extends AbstractModule { bind(MailboxMapperFactory.class).to(JPAMailboxSessionMapperFactory.class); bind(MailboxSessionMapperFactory.class).to(JPAMailboxSessionMapperFactory.class); bind(MessageId.Factory.class).to(DefaultMessageId.Factory.class); - bind(ThreadIdGuessingAlgorithm.class).to(NaiveThreadIdGuessingAlgorithmImpl.class); + bind(ThreadIdGuessingAlgorithm.class).to(NaiveThreadIdGuessingAlgorithm.class); bind(ModSeqProvider.class).to(JPAModSeqProvider.class); bind(UidProvider.class).to(JPAUidProvider.class); diff --git a/server/container/guice/memory/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java b/server/container/guice/memory/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java index 0eaa025..fb2a4b9 100644 --- a/server/container/guice/memory/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java +++ b/server/container/guice/memory/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java @@ -68,7 +68,7 @@ import org.apache.james.mailbox.store.mail.AttachmentMapperFactory; import org.apache.james.mailbox.store.mail.MailboxMapperFactory; import org.apache.james.mailbox.store.mail.MessageMapperFactory; import org.apache.james.mailbox.store.mail.ModSeqProvider; -import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithmImpl; +import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm; import org.apache.james.mailbox.store.mail.ThreadIdGuessingAlgorithm; import org.apache.james.mailbox.store.mail.UidProvider; import org.apache.james.mailbox.store.search.MessageSearchIndex; @@ -101,7 +101,7 @@ public class MemoryMailboxModule extends AbstractModule { bind(UidProvider.class).to(InMemoryUidProvider.class); bind(MailboxId.Factory.class).to(InMemoryId.Factory.class); bind(MessageId.Factory.class).to(InMemoryMessageId.Factory.class); - bind(ThreadIdGuessingAlgorithm.class).to(NaiveThreadIdGuessingAlgorithmImpl.class); + bind(ThreadIdGuessingAlgorithm.class).to(NaiveThreadIdGuessingAlgorithm.class); bind(State.Factory.class).to(State.DefaultFactory.class); bind(BlobManager.class).to(StoreBlobManager.class); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
