You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2018/01/11 11:08:18 UTC
[1/4] james-project git commit: JAMES-2282 Re-order singleton
bindings in CassandraMailboxModule
Repository: james-project
Updated Branches:
refs/heads/master c80beefc4 -> 2e0dc2986
JAMES-2282 Re-order singleton bindings in CassandraMailboxModule
- Separate DAO, manager and other entities
- Alphabatically order it
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2040af71
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2040af71
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2040af71
Branch: refs/heads/master
Commit: 2040af711d523e5f6f5780fd549f7036ffa435f4
Parents: 8c26272
Author: benwa <bt...@linagora.com>
Authored: Tue Jan 9 11:16:44 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Tue Jan 9 11:16:44 2018 +0700
----------------------------------------------------------------------
.../modules/mailbox/CassandraMailboxModule.java | 41 +++++++++++---------
1 file changed, 22 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/2040af71/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
----------------------------------------------------------------------
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 18789c6..c5bb7f2 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
@@ -87,31 +87,34 @@ public class CassandraMailboxModule extends AbstractModule {
install(new DefaultEventModule());
install(new CassandraQuotaModule());
- bind(CassandraMailboxSessionMapperFactory.class).in(Scopes.SINGLETON);
+ bind(CassandraAttachmentDAO.class).in(Scopes.SINGLETON);
+ bind(CassandraAttachmentDAOV2.class).in(Scopes.SINGLETON);
+ bind(CassandraAttachmentMessageIdDAO.class).in(Scopes.SINGLETON);
+ bind(CassandraBlobsDAO.class).in(Scopes.SINGLETON);
+ bind(CassandraMessageDAO.class).in(Scopes.SINGLETON);
+ bind(CassandraMessageIdDAO.class).in(Scopes.SINGLETON);
+ bind(CassandraMessageIdToImapUidDAO.class).in(Scopes.SINGLETON);
+ bind(CassandraUserMailboxRightsDAO.class).in(Scopes.SINGLETON);
+
bind(CassandraMailboxManager.class).in(Scopes.SINGLETON);
- bind(NoMailboxPathLocker.class).in(Scopes.SINGLETON);
bind(CassandraSubscriptionManager.class).in(Scopes.SINGLETON);
+ bind(StoreAttachmentManager.class).in(Scopes.SINGLETON);
+ bind(StoreBlobManager.class).in(Scopes.SINGLETON);
+ bind(StoreMessageIdManager.class).in(Scopes.SINGLETON);
+ bind(StoreRightManager.class).in(Scopes.SINGLETON);
+
+ bind(CassandraACLMapper.class).in(Scopes.SINGLETON);
+ bind(CassandraMailboxMapper.class).in(Scopes.SINGLETON);
+
+ bind(CassandraId.Factory.class).in(Scopes.SINGLETON);
+ bind(CassandraMailboxSessionMapperFactory.class).in(Scopes.SINGLETON);
+ bind(CassandraMessageId.Factory.class).in(Scopes.SINGLETON);
bind(CassandraModSeqProvider.class).in(Scopes.SINGLETON);
bind(CassandraUidProvider.class).in(Scopes.SINGLETON);
+ bind(MailboxEventDispatcher.class).in(Scopes.SINGLETON);
+ bind(NoMailboxPathLocker.class).in(Scopes.SINGLETON);
bind(UserRepositoryAuthenticator.class).in(Scopes.SINGLETON);
bind(UserRepositoryAuthorizator.class).in(Scopes.SINGLETON);
- bind(CassandraId.Factory.class).in(Scopes.SINGLETON);
- bind(CassandraMessageId.Factory.class).in(Scopes.SINGLETON);
- bind(CassandraMessageIdDAO.class).in(Scopes.SINGLETON);
- bind(CassandraMessageIdToImapUidDAO.class).in(Scopes.SINGLETON);
- bind(MailboxEventDispatcher.class).in(Scopes.SINGLETON);
- bind(StoreMessageIdManager.class).in(Scopes.SINGLETON);
- bind(StoreAttachmentManager.class).in(Scopes.SINGLETON);
- bind(CassandraMailboxMapper.class).in(Scopes.SINGLETON);
- bind(CassandraMessageDAO.class).in(Scopes.SINGLETON);
- bind(CassandraBlobsDAO.class).in(Scopes.SINGLETON);
- bind(CassandraAttachmentDAO.class).in(Scopes.SINGLETON);
- bind(CassandraAttachmentMessageIdDAO.class).in(Scopes.SINGLETON);
- bind(CassandraAttachmentDAOV2.class).in(Scopes.SINGLETON);
- bind(CassandraUserMailboxRightsDAO.class).in(Scopes.SINGLETON);
- bind(CassandraACLMapper.class).in(Scopes.SINGLETON);
- bind(StoreBlobManager.class).in(Scopes.SINGLETON);
- bind(StoreRightManager.class).in(Scopes.SINGLETON);
bind(BlobManager.class).to(StoreBlobManager.class);
bind(MessageMapperFactory.class).to(CassandraMailboxSessionMapperFactory.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[4/4] james-project git commit: Merge remote-tracking branch
'benoit/JAMES-2282'
Posted by ro...@apache.org.
Merge remote-tracking branch 'benoit/JAMES-2282'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2e0dc298
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2e0dc298
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2e0dc298
Branch: refs/heads/master
Commit: 2e0dc298643dec6fdfc15ecca9bef85a04ceb5b5
Parents: c80beef a289767
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Thu Jan 11 12:00:41 2018 +0100
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Thu Jan 11 12:00:41 2018 +0100
----------------------------------------------------------------------
.../modules/mailbox/CassandraMailboxModule.java | 76 ++++++++++++--------
1 file changed, 46 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/2e0dc298/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/4] james-project git commit: JAMES-2282 Re-order CassandraModule
multi-bindings alphabetically
Posted by ro...@apache.org.
JAMES-2282 Re-order CassandraModule multi-bindings alphabetically
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a2897679
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a2897679
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a2897679
Branch: refs/heads/master
Commit: a28976799d90da386d19b93f95d8720a0625131c
Parents: 712ea12
Author: benwa <bt...@linagora.com>
Authored: Tue Jan 9 11:24:38 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Tue Jan 9 11:24:38 2018 +0700
----------------------------------------------------------------------
.../modules/mailbox/CassandraMailboxModule.java | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/a2897679/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
----------------------------------------------------------------------
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 2988f72..da14c6e 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
@@ -156,22 +156,19 @@ public class CassandraMailboxModule extends AbstractModule {
Multibinder<CassandraModule> cassandraDataDefinitions = Multibinder.newSetBinder(binder(), CassandraModule.class);
cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraAclModule.class);
- cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraMailboxCounterModule.class);
- cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraMailboxRecentsModule.class);
+ cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraAnnotationModule.class);
+ cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraApplicableFlagsModule.class);
+ cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraAttachmentModule.class);
+ cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraBlobModule.class);
+ cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraDeletedMessageModule.class);
cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraFirstUnseenModule.class);
+ cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraMailboxCounterModule.class);
cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraMailboxModule.class);
+ cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraMailboxRecentsModule.class);
cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraMessageModule.class);
- cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraBlobModule.class);
+ cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraModSeqModule.class);
cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraSubscriptionModule.class);
cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraUidModule.class);
- cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraModSeqModule.class);
- cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraAttachmentModule.class);
- cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraAnnotationModule.class);
-
- cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraApplicableFlagsModule.class);
-
- cassandraDataDefinitions.addBinding().to(org.apache.james.mailbox.cassandra.modules.CassandraDeletedMessageModule.class);
-
Multibinder.newSetBinder(binder(), MailboxManagerDefinition.class).addBinding().to(CassandraMailboxManagerDefinition.class);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/4] james-project git commit: JAMES-2282 Bind in Singleton all
Cassandra DAO
Posted by ro...@apache.org.
JAMES-2282 Bind in Singleton all Cassandra DAO
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/712ea122
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/712ea122
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/712ea122
Branch: refs/heads/master
Commit: 712ea12203c9b4505a5d175fd5518cf03e024697
Parents: 2040af7
Author: benwa <bt...@linagora.com>
Authored: Tue Jan 9 11:19:55 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Tue Jan 9 11:19:55 2018 +0700
----------------------------------------------------------------------
.../modules/mailbox/CassandraMailboxModule.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/712ea122/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
----------------------------------------------------------------------
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 c5bb7f2..2988f72 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
@@ -38,11 +38,19 @@ import org.apache.james.mailbox.cassandra.MailboxOperationLoggingListener;
import org.apache.james.mailbox.cassandra.ids.CassandraId;
import org.apache.james.mailbox.cassandra.ids.CassandraMessageId;
import org.apache.james.mailbox.cassandra.mail.CassandraACLMapper;
+import org.apache.james.mailbox.cassandra.mail.CassandraApplicableFlagDAO;
import org.apache.james.mailbox.cassandra.mail.CassandraAttachmentDAO;
import org.apache.james.mailbox.cassandra.mail.CassandraAttachmentDAOV2;
import org.apache.james.mailbox.cassandra.mail.CassandraAttachmentMessageIdDAO;
+import org.apache.james.mailbox.cassandra.mail.CassandraAttachmentOwnerDAO;
import org.apache.james.mailbox.cassandra.mail.CassandraBlobsDAO;
+import org.apache.james.mailbox.cassandra.mail.CassandraDeletedMessageDAO;
+import org.apache.james.mailbox.cassandra.mail.CassandraFirstUnseenDAO;
+import org.apache.james.mailbox.cassandra.mail.CassandraMailboxCounterDAO;
+import org.apache.james.mailbox.cassandra.mail.CassandraMailboxDAO;
import org.apache.james.mailbox.cassandra.mail.CassandraMailboxMapper;
+import org.apache.james.mailbox.cassandra.mail.CassandraMailboxPathDAO;
+import org.apache.james.mailbox.cassandra.mail.CassandraMailboxRecentsDAO;
import org.apache.james.mailbox.cassandra.mail.CassandraMessageDAO;
import org.apache.james.mailbox.cassandra.mail.CassandraMessageIdDAO;
import org.apache.james.mailbox.cassandra.mail.CassandraMessageIdToImapUidDAO;
@@ -87,10 +95,18 @@ public class CassandraMailboxModule extends AbstractModule {
install(new DefaultEventModule());
install(new CassandraQuotaModule());
+ bind(CassandraApplicableFlagDAO.class).in(Scopes.SINGLETON);
bind(CassandraAttachmentDAO.class).in(Scopes.SINGLETON);
bind(CassandraAttachmentDAOV2.class).in(Scopes.SINGLETON);
bind(CassandraAttachmentMessageIdDAO.class).in(Scopes.SINGLETON);
+ bind(CassandraAttachmentOwnerDAO.class).in(Scopes.SINGLETON);
bind(CassandraBlobsDAO.class).in(Scopes.SINGLETON);
+ bind(CassandraDeletedMessageDAO.class).in(Scopes.SINGLETON);
+ bind(CassandraFirstUnseenDAO.class).in(Scopes.SINGLETON);
+ bind(CassandraMailboxCounterDAO.class).in(Scopes.SINGLETON);
+ bind(CassandraMailboxDAO.class).in(Scopes.SINGLETON);
+ bind(CassandraMailboxPathDAO.class).in(Scopes.SINGLETON);
+ bind(CassandraMailboxRecentsDAO.class).in(Scopes.SINGLETON);
bind(CassandraMessageDAO.class).in(Scopes.SINGLETON);
bind(CassandraMessageIdDAO.class).in(Scopes.SINGLETON);
bind(CassandraMessageIdToImapUidDAO.class).in(Scopes.SINGLETON);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org