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 ad...@apache.org on 2017/09/13 10:57:34 UTC
[08/24] james-project git commit: JAMES-2143 Guice injections for
StoreBlobManager
JAMES-2143 Guice injections for StoreBlobManager
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/55dcb3df
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/55dcb3df
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/55dcb3df
Branch: refs/heads/master
Commit: 55dcb3df3d136070a31f0fb7a21e77906403d5c5
Parents: a688e34
Author: benwa <bt...@linagora.com>
Authored: Mon Sep 11 16:24:22 2017 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Wed Sep 13 10:19:53 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/james/mailbox/store/StoreBlobManager.java | 3 +++
.../org/apache/james/modules/mailbox/CassandraMailboxModule.java | 4 ++++
.../org/apache/james/modules/mailbox/MemoryMailboxModule.java | 4 ++++
3 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/55dcb3df/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreBlobManager.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreBlobManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreBlobManager.java
index e1474e3..2869354 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreBlobManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreBlobManager.java
@@ -22,6 +22,8 @@ package org.apache.james.mailbox.store;
import java.io.IOException;
import java.util.Optional;
+import javax.inject.Inject;
+
import org.apache.commons.io.IOUtils;
import org.apache.james.mailbox.AttachmentManager;
import org.apache.james.mailbox.BlobManager;
@@ -47,6 +49,7 @@ public class StoreBlobManager implements BlobManager {
private final MessageIdManager messageIdManager;
private final MessageId.Factory messageIdFactory;
+ @Inject
public StoreBlobManager(AttachmentManager attachmentManager, MessageIdManager messageIdManager, MessageId.Factory messageIdFactory) {
this.attachmentManager = attachmentManager;
this.messageIdManager = messageIdManager;
http://git-wip-us.apache.org/repos/asf/james-project/blob/55dcb3df/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 732b3ff..75d4bd0 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
@@ -24,6 +24,7 @@ import org.apache.james.adapter.mailbox.store.UserRepositoryAuthenticator;
import org.apache.james.adapter.mailbox.store.UserRepositoryAuthorizator;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.mailbox.AttachmentManager;
+import org.apache.james.mailbox.BlobManager;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxPathLocker;
import org.apache.james.mailbox.MessageIdManager;
@@ -53,6 +54,7 @@ import org.apache.james.mailbox.store.BatchSizes;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
import org.apache.james.mailbox.store.NoMailboxPathLocker;
import org.apache.james.mailbox.store.StoreAttachmentManager;
+import org.apache.james.mailbox.store.StoreBlobManager;
import org.apache.james.mailbox.store.StoreMessageIdManager;
import org.apache.james.mailbox.store.event.MailboxEventDispatcher;
import org.apache.james.mailbox.store.mail.AttachmentMapperFactory;
@@ -98,7 +100,9 @@ public class CassandraMailboxModule extends AbstractModule {
bind(CassandraBlobsDAO.class).in(Scopes.SINGLETON);
bind(CassandraAttachmentDAO.class).in(Scopes.SINGLETON);
bind(CassandraAttachmentDAOV2.class).in(Scopes.SINGLETON);
+ bind(StoreBlobManager.class).in(Scopes.SINGLETON);
+ bind(BlobManager.class).to(StoreBlobManager.class);
bind(MessageMapperFactory.class).to(CassandraMailboxSessionMapperFactory.class);
bind(MailboxMapperFactory.class).to(CassandraMailboxSessionMapperFactory.class);
bind(AttachmentMapperFactory.class).to(CassandraMailboxSessionMapperFactory.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/55dcb3df/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java
index 0b28b08..a786be9 100644
--- a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java
+++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java
@@ -24,6 +24,7 @@ import javax.inject.Singleton;
import org.apache.james.adapter.mailbox.store.UserRepositoryAuthenticator;
import org.apache.james.adapter.mailbox.store.UserRepositoryAuthorizator;
import org.apache.james.mailbox.AttachmentManager;
+import org.apache.james.mailbox.BlobManager;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxPathLocker;
import org.apache.james.mailbox.MessageIdManager;
@@ -51,6 +52,7 @@ import org.apache.james.mailbox.store.Authorizator;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
import org.apache.james.mailbox.store.StoreAttachmentManager;
+import org.apache.james.mailbox.store.StoreBlobManager;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
import org.apache.james.mailbox.store.event.MailboxEventDispatcher;
import org.apache.james.mailbox.store.mail.AttachmentMapperFactory;
@@ -88,6 +90,7 @@ public class MemoryMailboxModule extends AbstractModule {
bind(MailboxId.Factory.class).to(InMemoryId.Factory.class);
bind(MessageId.Factory.class).to(InMemoryMessageId.Factory.class);
+ bind(BlobManager.class).to(StoreBlobManager.class);
bind(SubscriptionManager.class).to(StoreSubscriptionManager.class);
bind(SubscriptionMapperFactory.class).to(InMemoryMailboxSessionMapperFactory.class);
bind(MailboxSessionMapperFactory.class).to(InMemoryMailboxSessionMapperFactory.class);
@@ -103,6 +106,7 @@ public class MemoryMailboxModule extends AbstractModule {
bind(MessageSearchIndex.class).to(SimpleMessageSearchIndex.class);
bind(TextExtractor.class).to(JsoupTextExtractor.class);
+ bind(StoreBlobManager.class).in(Scopes.SINGLETON);
bind(InMemoryMailboxSessionMapperFactory.class).in(Scopes.SINGLETON);
bind(InMemoryModSeqProvider.class).in(Scopes.SINGLETON);
bind(InMemoryUidProvider.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