This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit e7ac327338adc72e97d8d25a5948f037dfa82a4c Author: Benoit Tellier <btell...@linagora.com> AuthorDate: Fri Nov 22 10:52:55 2019 +0700 [Refactoring] Remove JPASubscriptionManager --- .../james/mailbox/jpa/JPASubscriptionManager.java | 35 ---------------------- .../main/resources/META-INF/spring/mailbox-jpa.xml | 2 +- .../mailbox/jpa/JPASubscriptionManagerTest.java | 3 +- .../mpt/imapmailbox/jpa/host/JPAHostSystem.java | 4 +-- .../james/modules/mailbox/JPAMailboxModule.java | 8 +++-- 5 files changed, 10 insertions(+), 42 deletions(-) diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java deleted file mode 100644 index 1cd1bad..0000000 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ -package org.apache.james.mailbox.jpa; - -import javax.inject.Inject; - -import org.apache.james.mailbox.store.StoreSubscriptionManager; - -/** - * JPA implementation of {@link StoreSubscriptionManager} - */ -public class JPASubscriptionManager extends StoreSubscriptionManager { - - @Inject - public JPASubscriptionManager(JPAMailboxSessionMapperFactory mapperFactory) { - super(mapperFactory); - } - -} 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 d41a13d..8dd4aba 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="8" ref="indexer" /> </bean> - <bean id ="jpa-subscriptionManager" class="org.apache.james.mailbox.jpa.JPASubscriptionManager"> + <bean id ="jpa-subscriptionManager" class="org.apache.james.mailbox.store.StoreSubscriptionManager"> <constructor-arg index="0" ref="jpa-sessionMapperFactory"/> </bean> <bean id="jpa-sessionMapperFactory" class="org.apache.james.mailbox.jpa.JPAMailboxSessionMapperFactory"> diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java index d799321..cda60c3 100644 --- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java +++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java @@ -25,6 +25,7 @@ import org.apache.james.mailbox.SubscriptionManager; import org.apache.james.mailbox.SubscriptionManagerContract; import org.apache.james.mailbox.jpa.mail.JPAModSeqProvider; import org.apache.james.mailbox.jpa.mail.JPAUidProvider; +import org.apache.james.mailbox.store.StoreSubscriptionManager; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -47,7 +48,7 @@ class JPASubscriptionManagerTest implements SubscriptionManagerContract { new JPAUidProvider(entityManagerFactory), new JPAModSeqProvider(entityManagerFactory)); - subscriptionManager = new JPASubscriptionManager(mapperFactory); + subscriptionManager = new StoreSubscriptionManager(mapperFactory); } @AfterEach 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 6689e3c..afcef57 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 @@ -38,7 +38,6 @@ import org.apache.james.mailbox.events.InVMEventBus; import org.apache.james.mailbox.events.delivery.InVmEventDelivery; import org.apache.james.mailbox.jpa.JPAMailboxFixture; import org.apache.james.mailbox.jpa.JPAMailboxSessionMapperFactory; -import org.apache.james.mailbox.jpa.JPASubscriptionManager; import org.apache.james.mailbox.jpa.mail.JPAModSeqProvider; import org.apache.james.mailbox.jpa.mail.JPAUidProvider; import org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager; @@ -48,6 +47,7 @@ import org.apache.james.mailbox.jpa.quota.JpaCurrentQuotaManager; import org.apache.james.mailbox.store.SessionProvider; import org.apache.james.mailbox.store.StoreMailboxAnnotationManager; 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.model.DefaultMessageId; @@ -119,7 +119,7 @@ public class JPAHostSystem extends JamesImapHostSystem { eventBus.register(quotaUpdater); eventBus.register(new MailboxAnnotationListener(mapperFactory, sessionProvider)); - SubscriptionManager subscriptionManager = new JPASubscriptionManager(mapperFactory); + SubscriptionManager subscriptionManager = new StoreSubscriptionManager(mapperFactory); ImapProcessor defaultImapProcessorFactory = DefaultImapProcessorFactory.createDefaultProcessor( diff --git a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java b/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java index b3afb95..16dce61 100644 --- a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java +++ b/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java @@ -35,7 +35,6 @@ import org.apache.james.mailbox.events.MailboxListener; import org.apache.james.mailbox.indexer.ReIndexer; import org.apache.james.mailbox.jpa.JPAId; import org.apache.james.mailbox.jpa.JPAMailboxSessionMapperFactory; -import org.apache.james.mailbox.jpa.JPASubscriptionManager; import org.apache.james.mailbox.jpa.mail.JPAModSeqProvider; import org.apache.james.mailbox.jpa.mail.JPAUidProvider; import org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager; @@ -47,12 +46,14 @@ import org.apache.james.mailbox.store.JVMMailboxPathLocker; import org.apache.james.mailbox.store.MailboxManagerConfiguration; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.StoreMailboxManager; +import org.apache.james.mailbox.store.StoreSubscriptionManager; 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.UidProvider; import org.apache.james.mailbox.store.mail.model.DefaultMessageId; +import org.apache.james.mailbox.store.user.SubscriptionMapperFactory; import org.apache.james.modules.data.JPAEntityManagerModule; import org.apache.james.utils.MailboxManagerDefinition; import org.apache.mailbox.tools.indexer.ReIndexerImpl; @@ -74,7 +75,7 @@ public class JPAMailboxModule extends AbstractModule { bind(JPAMailboxSessionMapperFactory.class).in(Scopes.SINGLETON); bind(OpenJPAMailboxManager.class).in(Scopes.SINGLETON); bind(JVMMailboxPathLocker.class).in(Scopes.SINGLETON); - bind(JPASubscriptionManager.class).in(Scopes.SINGLETON); + bind(StoreSubscriptionManager.class).in(Scopes.SINGLETON); bind(JPAModSeqProvider.class).in(Scopes.SINGLETON); bind(JPAUidProvider.class).in(Scopes.SINGLETON); bind(UserRepositoryAuthenticator.class).in(Scopes.SINGLETON); @@ -85,6 +86,7 @@ public class JPAMailboxModule extends AbstractModule { bind(DefaultMessageId.Factory.class).in(Scopes.SINGLETON); bind(ReIndexerImpl.class).in(Scopes.SINGLETON); + bind(SubscriptionMapperFactory.class).to(JPAMailboxSessionMapperFactory.class); bind(MessageMapperFactory.class).to(JPAMailboxSessionMapperFactory.class); bind(MailboxMapperFactory.class).to(JPAMailboxSessionMapperFactory.class); bind(MailboxSessionMapperFactory.class).to(JPAMailboxSessionMapperFactory.class); @@ -92,7 +94,7 @@ public class JPAMailboxModule extends AbstractModule { bind(ModSeqProvider.class).to(JPAModSeqProvider.class); bind(UidProvider.class).to(JPAUidProvider.class); - bind(SubscriptionManager.class).to(JPASubscriptionManager.class); + bind(SubscriptionManager.class).to(StoreSubscriptionManager.class); bind(MailboxPathLocker.class).to(JVMMailboxPathLocker.class); bind(Authenticator.class).to(UserRepositoryAuthenticator.class); bind(MailboxManager.class).to(OpenJPAMailboxManager.class); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org