JAMES-2291 Introduce Mail repositories keys DAO
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/203b3d21 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/203b3d21 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/203b3d21 Branch: refs/heads/master Commit: 203b3d21da6a77183e80f6a2d60ae275ae5f3386 Parents: 5a983ca Author: benwa <[email protected]> Authored: Wed Jan 24 10:24:24 2018 +0700 Committer: benwa <[email protected]> Committed: Thu Jan 25 16:27:20 2018 +0700 ---------------------------------------------------------------------- .../CassandraMailRepositoryKeysDAO.java | 94 +++++++++++++++ .../CassandraMailRepositoryKeysDAOTest.java | 117 +++++++++++++++++++ 2 files changed, 211 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/203b3d21/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryKeysDAO.java ---------------------------------------------------------------------- diff --git a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryKeysDAO.java b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryKeysDAO.java new file mode 100644 index 0000000..0dd8d4b --- /dev/null +++ b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryKeysDAO.java @@ -0,0 +1,94 @@ +/**************************************************************** + * 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.mailrepository.cassandra; + +import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker; +import static com.datastax.driver.core.querybuilder.QueryBuilder.delete; +import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; +import static com.datastax.driver.core.querybuilder.QueryBuilder.insertInto; +import static com.datastax.driver.core.querybuilder.QueryBuilder.select; +import static org.apache.james.mailrepository.cassandra.MailRepositoryTable.KEYS_TABLE_NAME; +import static org.apache.james.mailrepository.cassandra.MailRepositoryTable.MAIL_KEY; +import static org.apache.james.mailrepository.cassandra.MailRepositoryTable.REPOSITORY_NAME; + +import java.util.concurrent.CompletableFuture; +import java.util.stream.Stream; + +import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor; +import org.apache.james.backends.cassandra.utils.CassandraUtils; + +import com.datastax.driver.core.PreparedStatement; +import com.datastax.driver.core.Session; + +public class CassandraMailRepositoryKeysDAO { + + private final CassandraAsyncExecutor executor; + private final CassandraUtils cassandraUtils; + private final PreparedStatement insertKey; + private final PreparedStatement deleteKey; + private final PreparedStatement listKeys; + + public CassandraMailRepositoryKeysDAO(Session session, CassandraUtils cassandraUtils) { + this.executor = new CassandraAsyncExecutor(session); + this.cassandraUtils = cassandraUtils; + + this.insertKey = prepareInsert(session); + this.deleteKey = prepareDelete(session); + this.listKeys = prepareList(session); + } + + private PreparedStatement prepareList(Session session) { + return session.prepare(select(MAIL_KEY) + .from(KEYS_TABLE_NAME) + .where(eq(REPOSITORY_NAME, bindMarker(REPOSITORY_NAME)))); + } + + private PreparedStatement prepareDelete(Session session) { + return session.prepare(delete() + .from(KEYS_TABLE_NAME) + .where(eq(REPOSITORY_NAME, bindMarker(REPOSITORY_NAME))) + .and(eq(MAIL_KEY, bindMarker(MAIL_KEY)))); + } + + private PreparedStatement prepareInsert(Session session) { + return session.prepare(insertInto(KEYS_TABLE_NAME) + .value(REPOSITORY_NAME, bindMarker(REPOSITORY_NAME)) + .value(MAIL_KEY, bindMarker(MAIL_KEY))); + } + + public CompletableFuture<Void> store(String url, String key) { + return executor.executeVoid(insertKey.bind() + .setString(REPOSITORY_NAME, url) + .setString(MAIL_KEY, key)); + } + + public CompletableFuture<Stream<String>> list(String url) { + return executor.execute(listKeys.bind() + .setString(REPOSITORY_NAME, url)) + .thenApply(cassandraUtils::convertToStream) + .thenApply(stream -> stream.map(row -> row.getString(MAIL_KEY))); + } + + public CompletableFuture<Void> remove(String url, String key) { + return executor.executeVoid(deleteKey.bind() + .setString(REPOSITORY_NAME, url) + .setString(MAIL_KEY, key)); + } +} http://git-wip-us.apache.org/repos/asf/james-project/blob/203b3d21/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryKeysDAOTest.java ---------------------------------------------------------------------- diff --git a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryKeysDAOTest.java b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryKeysDAOTest.java new file mode 100644 index 0000000..b261d48 --- /dev/null +++ b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryKeysDAOTest.java @@ -0,0 +1,117 @@ +/**************************************************************** + * 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.mailrepository.cassandra; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.apache.james.backends.cassandra.CassandraCluster; +import org.apache.james.backends.cassandra.DockerCassandraExtension; +import org.apache.james.backends.cassandra.utils.CassandraUtils; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +@ExtendWith(DockerCassandraExtension.class) +public class CassandraMailRepositoryKeysDAOTest { + + + static final String URL = "url"; + static final String URL2 = "url2"; + static final String KEY_1 = "key1"; + static final String KEY_2 = "key2"; + static final String KEY_3 = "key3"; + + CassandraCluster cassandra; + CassandraMailRepositoryKeysDAO testee; + + @BeforeEach + public void setUp(DockerCassandraExtension.DockerCassandra dockerCassandra) { + cassandra = CassandraCluster.create( + new CassandraMailRepositoryModule(), dockerCassandra.getIp(), dockerCassandra.getBindingPort()); + + testee = new CassandraMailRepositoryKeysDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION); + } + + @AfterEach + public void tearDown() { + cassandra.close(); + } + + @Test + public void test() { + assertThat(testee.list(URL).join()) + .isEmpty(); + } + + @Test + public void listShouldReturnEmptyByDefault() { + testee.store(URL, KEY_1).join(); + + assertThat(testee.list(URL).join()) + .containsOnly(KEY_1); + } + + @Test + public void listShouldNotReturnElementsOfOtherRepositories() { + testee.store(URL, KEY_1).join(); + + assertThat(testee.list(URL2).join()) + .isEmpty(); + } + + @Test + public void listShouldReturnSeveralElements() { + testee.store(URL, KEY_1).join(); + testee.store(URL, KEY_2).join(); + testee.store(URL, KEY_3).join(); + + assertThat(testee.list(URL).join()) + .containsOnly(KEY_1, KEY_2, KEY_3); + } + + @Test + public void listShouldNotReturnRemovedElements() { + testee.store(URL, KEY_1).join(); + testee.store(URL, KEY_2).join(); + testee.store(URL, KEY_3).join(); + + testee.remove(URL, KEY_2).join(); + + assertThat(testee.list(URL).join()) + .containsOnly(KEY_1, KEY_3); + } + + @Test + public void removeShouldBeIdempotent() { + testee.remove(URL, KEY_2).join(); + } + + @Test + public void removeShouldNotAffectOtherRepositories() { + testee.store(URL, KEY_1).join(); + + testee.remove(URL2, KEY_2).join(); + + assertThat(testee.list(URL).join()) + .containsOnly(KEY_1); + } + +} \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
