JAMES-2608 finally bind MergingCassandraMailRepositoryMailDao and enable the broken test
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/31dd1b25 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/31dd1b25 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/31dd1b25 Branch: refs/heads/master Commit: 31dd1b251d2e98deb8758318aef8027f784473ef Parents: 48b99bf Author: Matthieu Baechler <[email protected]> Authored: Wed Nov 28 19:17:12 2018 +0100 Committer: Raphael Ouazana <[email protected]> Committed: Wed Dec 19 09:24:12 2018 +0100 ---------------------------------------------------------------------- .../james/modules/data/CassandraMailRepositoryModule.java | 6 ++++++ .../apache/james/mailrepository/MailRepositoryContract.java | 2 -- .../mailrepository/cassandra/CassandraMailRepositoryTest.java | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/31dd1b25/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraMailRepositoryModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraMailRepositoryModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraMailRepositoryModule.java index 176c39b..60fa72f 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraMailRepositoryModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraMailRepositoryModule.java @@ -25,9 +25,12 @@ import org.apache.james.mailrepository.api.MailRepositoryUrlStore; import org.apache.james.mailrepository.cassandra.CassandraMailRepositoryCountDAO; import org.apache.james.mailrepository.cassandra.CassandraMailRepositoryKeysDAO; import org.apache.james.mailrepository.cassandra.CassandraMailRepositoryMailDAO; +import org.apache.james.mailrepository.cassandra.CassandraMailRepositoryMailDaoAPI; +import org.apache.james.mailrepository.cassandra.CassandraMailRepositoryMailDaoV2; import org.apache.james.mailrepository.cassandra.CassandraMailRepositoryProvider; import org.apache.james.mailrepository.cassandra.CassandraMailRepositoryUrlModule; import org.apache.james.mailrepository.cassandra.CassandraMailRepositoryUrlStore; +import org.apache.james.mailrepository.cassandra.MergingCassandraMailRepositoryMailDao; import com.google.inject.AbstractModule; import com.google.inject.Scopes; @@ -40,7 +43,10 @@ public class CassandraMailRepositoryModule extends AbstractModule { bind(CassandraMailRepositoryKeysDAO.class).in(Scopes.SINGLETON); bind(CassandraMailRepositoryCountDAO.class).in(Scopes.SINGLETON); bind(CassandraMailRepositoryMailDAO.class).in(Scopes.SINGLETON); + bind(CassandraMailRepositoryMailDaoV2.class).in(Scopes.SINGLETON); + bind(MergingCassandraMailRepositoryMailDao.class).in(Scopes.SINGLETON); + bind(CassandraMailRepositoryMailDaoAPI.class).to(MergingCassandraMailRepositoryMailDao.class); bind(MailRepositoryUrlStore.class).to(CassandraMailRepositoryUrlStore.class); Multibinder<MailRepositoryProvider> multibinder = Multibinder.newSetBinder(binder(), MailRepositoryProvider.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/31dd1b25/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/MailRepositoryContract.java ---------------------------------------------------------------------- diff --git a/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/MailRepositoryContract.java b/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/MailRepositoryContract.java index e106015..ee74d10 100644 --- a/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/MailRepositoryContract.java +++ b/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/MailRepositoryContract.java @@ -46,7 +46,6 @@ import org.apache.mailet.Mail; import org.apache.mailet.PerRecipientHeaders; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.Test; @@ -421,7 +420,6 @@ public interface MailRepositoryContract { } - @Disabled("JAMES-2608") @Test default void storingMessageWithPerRecipientHeadersShouldAllowMultipleHeadersPerUser() throws Exception { http://git-wip-us.apache.org/repos/asf/james-project/blob/31dd1b25/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryTest.java b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryTest.java index b0c059e..dbd39a3 100644 --- a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryTest.java +++ b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryTest.java @@ -52,7 +52,9 @@ class CassandraMailRepositoryTest implements MailRepositoryContract { @BeforeEach void setup(CassandraCluster cassandra) { - CassandraMailRepositoryMailDAO mailDAO = new CassandraMailRepositoryMailDAO(cassandra.getConf(), BLOB_ID_FACTORY, cassandra.getTypesProvider()); + CassandraMailRepositoryMailDAO v1 = new CassandraMailRepositoryMailDAO(cassandra.getConf(), BLOB_ID_FACTORY, cassandra.getTypesProvider()); + CassandraMailRepositoryMailDaoV2 v2 = new CassandraMailRepositoryMailDaoV2(cassandra.getConf(), BLOB_ID_FACTORY); + CassandraMailRepositoryMailDaoAPI mailDAO = new MergingCassandraMailRepositoryMailDao(v1, v2); CassandraMailRepositoryKeysDAO keysDAO = new CassandraMailRepositoryKeysDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION); CassandraMailRepositoryCountDAO countDAO = new CassandraMailRepositoryCountDAO(cassandra.getConf()); CassandraBlobsDAO blobsDAO = new CassandraBlobsDAO(cassandra.getConf()); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
