This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit ff850eac496b19ac149ff7940ffc979558cb563f Author: Benoit Tellier <[email protected]> AuthorDate: Fri Jul 24 11:56:43 2020 +0700 JAMES-3319 Simplify CassandraMailRepository constructors --- .../james/mailrepository/cassandra/CassandraMailRepository.java | 8 +------- .../mailrepository/cassandra/CassandraMailRepositoryTest.java | 4 ++-- .../CassandraMailRepositoryWithFakeImplementationsTest.java | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepository.java b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepository.java index 134d969..f2b5168 100644 --- a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepository.java +++ b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepository.java @@ -51,17 +51,11 @@ public class CassandraMailRepository implements MailRepository { CassandraMailRepository(MailRepositoryUrl url, CassandraMailRepositoryKeysDAO keysDAO, CassandraMailRepositoryCountDAO countDAO, CassandraMailRepositoryMailDaoAPI mailDAO, MimeMessageStore.Factory mimeMessageStoreFactory) { - this(url, keysDAO, countDAO, mailDAO, mimeMessageStoreFactory.mimeMessageStore()); - } - - CassandraMailRepository(MailRepositoryUrl url, CassandraMailRepositoryKeysDAO keysDAO, - CassandraMailRepositoryCountDAO countDAO, CassandraMailRepositoryMailDaoAPI mailDAO, - Store<MimeMessage, MimeMessagePartsId> mimeMessageStore) { this.url = url; this.keysDAO = keysDAO; this.countDAO = countDAO; this.mailDAO = mailDAO; - this.mimeMessageStore = mimeMessageStore; + this.mimeMessageStore = mimeMessageStoreFactory.mimeMessageStore(); } @Override 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 9ff4496..6d6e443 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 @@ -70,7 +70,7 @@ class CassandraMailRepositoryTest { .passthrough(); cassandraMailRepository = new CassandraMailRepository(URL, - keysDAO, countDAO, mailDAO, MimeMessageStore.factory(blobStore).mimeMessageStore()); + keysDAO, countDAO, mailDAO, MimeMessageStore.factory(blobStore)); } @Override @@ -111,7 +111,7 @@ class CassandraMailRepositoryTest { .deduplication(); cassandraMailRepository = new CassandraMailRepository(URL, - keysDAO, countDAO, mailDAO, MimeMessageStore.factory(blobStore).mimeMessageStore()); + keysDAO, countDAO, mailDAO, MimeMessageStore.factory(blobStore)); } @Override diff --git a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryWithFakeImplementationsTest.java b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryWithFakeImplementationsTest.java index 027f1e9..a420ac5 100644 --- a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryWithFakeImplementationsTest.java +++ b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryWithFakeImplementationsTest.java @@ -70,7 +70,7 @@ class CassandraMailRepositoryWithFakeImplementationsTest { .passthrough(); cassandraMailRepository = new CassandraMailRepository(URL, - keysDAO, countDAO, mailDAO, MimeMessageStore.factory(blobStore).mimeMessageStore()); + keysDAO, countDAO, mailDAO, MimeMessageStore.factory(blobStore)); } @Nested --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
