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 1060cb0f12769961295e4d765e2fe5052e35a7e4 Author: Benoit Tellier <[email protected]> AuthorDate: Tue Oct 20 10:21:29 2020 +0700 [REFACTORING] Solve intelliJ warnings in CassandraMessageDAO --- .../cassandra/mail/CassandraMessageDAO.java | 34 +++++----------------- .../cassandra/CassandraMailboxManagerTest.java | 1 - .../cassandra/mail/CassandraMessageDAOTest.java | 1 - 3 files changed, 7 insertions(+), 29 deletions(-) diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java index 7e7f06b..a321551 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java @@ -48,7 +48,6 @@ import javax.mail.util.SharedByteArrayInputStream; import org.apache.commons.io.IOUtils; import org.apache.james.backends.cassandra.init.CassandraTypesProvider; -import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration; import org.apache.james.backends.cassandra.init.configuration.CassandraConsistenciesConfiguration; import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor; import org.apache.james.blob.api.BlobId; @@ -76,7 +75,6 @@ import com.datastax.driver.core.Session; import com.datastax.driver.core.UDTValue; import com.datastax.driver.core.querybuilder.QueryBuilder; import com.github.steveash.guavate.Guavate; -import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Bytes; @@ -91,54 +89,36 @@ public class CassandraMessageDAO { private final CassandraTypesProvider typesProvider; private final BlobStore blobStore; private final BlobId.Factory blobIdFactory; - private final CassandraConfiguration configuration; - private final CassandraMessageId.Factory messageIdFactory; private final PreparedStatement insert; private final PreparedStatement delete; private final PreparedStatement select; - private final PreparedStatement selectAllMessagesWithAttachment; private final Cid.CidParser cidParser; private final ConsistencyLevel consistencyLevel; @Inject - public CassandraMessageDAO(Session session, CassandraTypesProvider typesProvider, BlobStore blobStore, - BlobId.Factory blobIdFactory, CassandraConfiguration cassandraConfiguration, - CassandraConsistenciesConfiguration consistenciesConfiguration, - CassandraMessageId.Factory messageIdFactory) { + public CassandraMessageDAO(Session session, + CassandraTypesProvider typesProvider, + BlobStore blobStore, + BlobId.Factory blobIdFactory, + CassandraConsistenciesConfiguration consistenciesConfiguration) { this.cassandraAsyncExecutor = new CassandraAsyncExecutor(session); this.consistencyLevel = consistenciesConfiguration.getRegular(); this.typesProvider = typesProvider; this.blobStore = blobStore; this.blobIdFactory = blobIdFactory; - this.configuration = cassandraConfiguration; - this.messageIdFactory = messageIdFactory; this.insert = prepareInsert(session); this.delete = prepareDelete(session); this.select = prepareSelect(session); - this.selectAllMessagesWithAttachment = prepareSelectAllMessagesWithAttachment(session); this.cidParser = Cid.parser().relaxed(); } - @VisibleForTesting - public CassandraMessageDAO(Session session, CassandraTypesProvider typesProvider, BlobStore blobStore, - BlobId.Factory blobIdFactory, CassandraMessageId.Factory messageIdFactory, - CassandraConsistenciesConfiguration consistenciesConfiguration) { - this(session, typesProvider, blobStore, blobIdFactory, CassandraConfiguration.DEFAULT_CONFIGURATION, - consistenciesConfiguration, messageIdFactory); - } - private PreparedStatement prepareSelect(Session session) { return session.prepare(select() .from(TABLE_NAME) .where(eq(MESSAGE_ID, bindMarker(MESSAGE_ID)))); } - private PreparedStatement prepareSelectAllMessagesWithAttachment(Session session) { - return session.prepare(select(MESSAGE_ID, ATTACHMENTS) - .from(TABLE_NAME)); - } - private PreparedStatement prepareInsert(Session session) { return session.prepare(insertInto(TABLE_NAME) .value(MESSAGE_ID, bindMarker(MESSAGE_ID)) @@ -227,11 +207,11 @@ public class CassandraMessageDAO { } public Mono<MessageRepresentation> retrieveMessage(CassandraMessageId cassandraMessageId, FetchType fetchType) { - return retrieveRow(cassandraMessageId, fetchType) + return retrieveRow(cassandraMessageId) .flatMap(resultSet -> message(resultSet, cassandraMessageId, fetchType)); } - private Mono<ResultSet> retrieveRow(CassandraMessageId messageId, FetchType fetchType) { + private Mono<ResultSet> retrieveRow(CassandraMessageId messageId) { return cassandraAsyncExecutor.execute(select .bind() .setUUID(MESSAGE_ID, messageId.get()) diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java index f2a98f2..83e024e 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java @@ -826,7 +826,6 @@ public class CassandraMailboxManagerTest extends MailboxManagerTest<CassandraMai cassandraCluster.getTypesProvider(), mock(BlobStore.class), new HashBlobId.Factory(), - new CassandraMessageId.Factory(), cassandra.getCassandraConsistenciesConfiguration()); } } diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAOTest.java index 7fa6f49..b255ac7 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAOTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAOTest.java @@ -94,7 +94,6 @@ class CassandraMessageDAOTest { cassandra.getTypesProvider(), blobStore, blobIdFactory, - new CassandraMessageId.Factory(), cassandraCluster.getCassandraConsistenciesConfiguration()); messageIdWithMetadata = ComposedMessageIdWithMetaData.builder() --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
