JAMES-2287 Guice injections for object store
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/4db46a88 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4db46a88 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4db46a88 Branch: refs/heads/master Commit: 4db46a880c2a0de25ef6c957b5b5756528a78403 Parents: 63a6a14 Author: benwa <[email protected]> Authored: Wed Jan 17 11:57:04 2018 +0700 Committer: benwa <[email protected]> Committed: Fri Jan 19 09:07:28 2018 +0700 ---------------------------------------------------------------------- server/container/guice/cassandra-guice/pom.xml | 5 +++ .../modules/mailbox/CassandraMailboxModule.java | 3 +- .../mailbox/CassandraObjectStoreModule.java | 39 ++++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/4db46a88/server/container/guice/cassandra-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml index aba7dd0..db90008 100644 --- a/server/container/guice/cassandra-guice/pom.xml +++ b/server/container/guice/cassandra-guice/pom.xml @@ -93,6 +93,11 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>blob-cassandra</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-data-cassandra</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/4db46a88/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 3d1c404..0bd19a1 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 @@ -23,7 +23,6 @@ import javax.inject.Singleton; 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.blob.cassandra.CassandraBlobsDAO; import org.apache.james.mailbox.AttachmentManager; import org.apache.james.mailbox.BlobManager; import org.apache.james.mailbox.MailboxListener; @@ -94,13 +93,13 @@ public class CassandraMailboxModule extends AbstractModule { protected void configure() { install(new DefaultEventModule()); install(new CassandraQuotaModule()); + install(new CassandraObjectStoreModule()); 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); http://git-wip-us.apache.org/repos/asf/james-project/blob/4db46a88/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraObjectStoreModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraObjectStoreModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraObjectStoreModule.java new file mode 100644 index 0000000..4fad8e3 --- /dev/null +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraObjectStoreModule.java @@ -0,0 +1,39 @@ +/**************************************************************** + * 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.modules.mailbox; + +import org.apache.james.blob.api.BlobId; +import org.apache.james.blob.api.ObjectStore; +import org.apache.james.blob.cassandra.CassandraBlobId; +import org.apache.james.blob.cassandra.CassandraBlobsDAO; + +import com.google.inject.AbstractModule; +import com.google.inject.Scopes; + +public class CassandraObjectStoreModule extends AbstractModule { + @Override + protected void configure() { + bind(CassandraBlobsDAO.class).in(Scopes.SINGLETON); + bind(CassandraBlobId.Factory.class).in(Scopes.SINGLETON); + + bind(ObjectStore.class).to(CassandraBlobsDAO.class); + bind(BlobId.Factory.class).to(CassandraBlobId.Factory.class); + } +} --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
