JAMES-2092 Correct injections
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/890d0c0e Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/890d0c0e Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/890d0c0e Branch: refs/heads/master Commit: 890d0c0e56399a1239d62f215791a1af4c3b39ee Parents: 59c673a Author: benwa <btell...@linagora.com> Authored: Fri Jul 7 12:03:00 2017 +0700 Committer: Antoine Duprat <adup...@linagora.com> Committed: Mon Jul 10 14:23:57 2017 +0200 ---------------------------------------------------------------------- .../james/mailbox/cassandra/mail/CassandraAttachmentMapper.java | 3 +++ .../james/mailbox/cassandra/mail/CassandraMailboxMapper.java | 3 +++ .../org/apache/james/modules/mailbox/CassandraMailboxModule.java | 2 ++ 3 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/890d0c0e/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapper.java index 61edbba..1e661ce 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapper.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapper.java @@ -37,6 +37,8 @@ import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.stream.Stream; +import javax.inject.Inject; + import org.apache.commons.io.IOUtils; import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor; import org.apache.james.mailbox.exception.AttachmentNotFoundException; @@ -58,6 +60,7 @@ public class CassandraAttachmentMapper implements AttachmentMapper { private final CassandraAsyncExecutor cassandraAsyncExecutor; + @Inject public CassandraAttachmentMapper(Session session) { this.cassandraAsyncExecutor = new CassandraAsyncExecutor(session); } http://git-wip-us.apache.org/repos/asf/james-project/blob/890d0c0e/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java index 82429b3..1dd6760 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java @@ -28,6 +28,8 @@ import java.util.concurrent.CompletionException; import java.util.regex.Pattern; import java.util.stream.Collectors; +import javax.inject.Inject; + import org.apache.commons.lang3.StringUtils; import org.apache.james.backends.cassandra.CassandraConfiguration; import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor; @@ -62,6 +64,7 @@ public class CassandraMailboxMapper implements MailboxMapper { private final Session session; private final CassandraConfiguration cassandraConfiguration; + @Inject public CassandraMailboxMapper(Session session, CassandraMailboxDAO mailboxDAO, CassandraMailboxPathDAO mailboxPathDAO, CassandraConfiguration cassandraConfiguration) { this.cassandraAsyncExecutor = new CassandraAsyncExecutor(session); this.mailboxDAO = mailboxDAO; http://git-wip-us.apache.org/repos/asf/james-project/blob/890d0c0e/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 f31b94e..2d06dbb 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,6 +34,7 @@ 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.CassandraMailboxDAO; +import org.apache.james.mailbox.cassandra.mail.CassandraMailboxMapper; import org.apache.james.mailbox.cassandra.mail.CassandraMessageDAO; import org.apache.james.mailbox.cassandra.mail.CassandraMessageIdDAO; import org.apache.james.mailbox.cassandra.mail.CassandraMessageIdToImapUidDAO; @@ -91,6 +92,7 @@ public class CassandraMailboxModule extends AbstractModule { 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(MessageMapperFactory.class).to(CassandraMailboxSessionMapperFactory.class); bind(MailboxMapperFactory.class).to(CassandraMailboxSessionMapperFactory.class); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
