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 11b953b2913c98711f6f85b5781bb03f92aa1a37 Author: Benoit Tellier <btell...@linagora.com> AuthorDate: Thu Nov 14 14:47:59 2019 +0700 JAMES-2949 Remove CassandraSubscriptionManager This class did not add any behaviour and can be dropped in replaced by StoreSubscriptionManager --- .../cassandra/CassandraSubscriptionManager.java | 44 ---------------------- .../CassandraSubscriptionManagerTest.java | 3 +- .../modules/mailbox/CassandraMailboxModule.java | 8 ++-- 3 files changed, 7 insertions(+), 48 deletions(-) diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManager.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManager.java deleted file mode 100644 index c1da5cd..0000000 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManager.java +++ /dev/null @@ -1,44 +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.cassandra; - -import javax.inject.Inject; - -import org.apache.james.mailbox.MailboxSession; -import org.apache.james.mailbox.store.StoreSubscriptionManager; -import org.apache.james.mailbox.store.user.model.Subscription; -import org.apache.james.mailbox.store.user.model.impl.SimpleSubscription; - -/** - * Cassandra implementation of {@link StoreSubscriptionManager} - * - */ -public class CassandraSubscriptionManager extends StoreSubscriptionManager { - - @Inject - public CassandraSubscriptionManager(CassandraMailboxSessionMapperFactory mapperFactory) { - super(mapperFactory); - } - - @Override - protected Subscription createSubscription(MailboxSession session, String mailbox) { - return new SimpleSubscription(session.getUser().asString(), mailbox); - } -} diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java index 80a0ac6..8dc2ad8 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java @@ -46,6 +46,7 @@ import org.apache.james.mailbox.cassandra.mail.CassandraModSeqProvider; import org.apache.james.mailbox.cassandra.mail.CassandraUidProvider; import org.apache.james.mailbox.cassandra.mail.CassandraUserMailboxRightsDAO; import org.apache.james.mailbox.cassandra.modules.CassandraSubscriptionModule; +import org.apache.james.mailbox.store.StoreSubscriptionManager; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.RegisterExtension; @@ -80,7 +81,7 @@ class CassandraSubscriptionManagerTest extends AbstractSubscriptionManagerTest { BlobStore blobStore = null; CassandraUidProvider uidProvider = null; CassandraModSeqProvider modSeqProvider = null; - return new CassandraSubscriptionManager( + return new StoreSubscriptionManager( new CassandraMailboxSessionMapperFactory( uidProvider, modSeqProvider, diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java index d621194..81d0ca3 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java @@ -34,7 +34,6 @@ import org.apache.james.mailbox.RightManager; import org.apache.james.mailbox.SubscriptionManager; import org.apache.james.mailbox.cassandra.CassandraMailboxManager; import org.apache.james.mailbox.cassandra.CassandraMailboxSessionMapperFactory; -import org.apache.james.mailbox.cassandra.CassandraSubscriptionManager; import org.apache.james.mailbox.cassandra.ids.CassandraId; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; import org.apache.james.mailbox.cassandra.mail.CassandraACLMapper; @@ -83,12 +82,14 @@ import org.apache.james.mailbox.store.StoreBlobManager; import org.apache.james.mailbox.store.StoreMailboxManager; 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.event.MailboxAnnotationListener; 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.UidProvider; +import org.apache.james.mailbox.store.user.SubscriptionMapperFactory; import org.apache.james.utils.MailboxManagerDefinition; import org.apache.mailbox.tools.indexer.MessageIdReIndexerImpl; import org.apache.mailbox.tools.indexer.ReIndexerImpl; @@ -125,7 +126,7 @@ public class CassandraMailboxModule extends AbstractModule { bind(CassandraUserMailboxRightsDAO.class).in(Scopes.SINGLETON); bind(CassandraMailboxManager.class).in(Scopes.SINGLETON); - bind(CassandraSubscriptionManager.class).in(Scopes.SINGLETON); + bind(StoreSubscriptionManager.class).in(Scopes.SINGLETON); bind(StoreAttachmentManager.class).in(Scopes.SINGLETON); bind(StoreBlobManager.class).in(Scopes.SINGLETON); bind(StoreMessageIdManager.class).in(Scopes.SINGLETON); @@ -151,10 +152,11 @@ public class CassandraMailboxModule extends AbstractModule { bind(MailboxMapperFactory.class).to(CassandraMailboxSessionMapperFactory.class); bind(AttachmentMapperFactory.class).to(CassandraMailboxSessionMapperFactory.class); bind(MailboxSessionMapperFactory.class).to(CassandraMailboxSessionMapperFactory.class); + bind(SubscriptionMapperFactory.class).to(CassandraMailboxSessionMapperFactory.class); bind(ModSeqProvider.class).to(CassandraModSeqProvider.class); bind(UidProvider.class).to(CassandraUidProvider.class); - bind(SubscriptionManager.class).to(CassandraSubscriptionManager.class); + bind(SubscriptionManager.class).to(StoreSubscriptionManager.class); bind(MailboxPathLocker.class).to(NoMailboxPathLocker.class); bind(Authenticator.class).to(UserRepositoryAuthenticator.class); bind(Authorizator.class).to(UserRepositoryAuthorizator.class); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org