You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/01/21 03:06:23 UTC
[5/5] james-project git commit: JAMES-2646 list sources cassandra
table, DAO and tests
JAMES-2646 list sources cassandra table, DAO and tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d4e56936
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d4e56936
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d4e56936
Branch: refs/heads/master
Commit: d4e569361b47d683871161ce1759da29c1aea285
Parents: 7f2f8fe
Author: Rene Cordier <rc...@linagora.com>
Authored: Fri Jan 18 15:02:48 2019 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Mon Jan 21 10:04:49 2019 +0700
----------------------------------------------------------------------
.../java/org/apache/james/rrt/lib/Mapping.java | 7 ++
.../cassandra/CassandraMappingsSourcesDAO.java | 101 +++++++++++++++++++
.../james/rrt/cassandra/CassandraRRTModule.java | 13 ++-
.../CassandraRecipientRewriteTable.java | 24 +++--
.../tables/CassandraMappingsSourcesTable.java | 29 ++++++
.../CassandraMappingsSourcesDAOTest.java | 80 +++++++++++++++
.../CassandraRecipientRewriteTableDAOTest.java | 53 ++++++----
.../CassandraRecipientRewriteTableTest.java | 3 +-
.../james/rrt/cassandra/CassandraStepdefs.java | 3 +-
9 files changed, 281 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4e56936/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java
----------------------------------------------------------------------
diff --git a/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java b/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java
index 379c9e7..b87b228 100644
--- a/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java
+++ b/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java
@@ -241,6 +241,11 @@ public interface Mapping {
}
@Override
+ public String getMappingValue() {
+ return mapping;
+ }
+
+ @Override
public String getErrorMessage() {
Preconditions.checkState(getType() == Type.Error);
return mapping;
@@ -284,6 +289,8 @@ public interface Mapping {
}
Type getType();
+
+ String getMappingValue();
String asString();
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4e56936/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraMappingsSourcesDAO.java
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraMappingsSourcesDAO.java b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraMappingsSourcesDAO.java
new file mode 100644
index 0000000..777a50e
--- /dev/null
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraMappingsSourcesDAO.java
@@ -0,0 +1,101 @@
+/****************************************************************
+ * 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.rrt.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.rrt.cassandra.tables.CassandraMappingsSourcesTable.MAPPING_TYPE;
+import static org.apache.james.rrt.cassandra.tables.CassandraMappingsSourcesTable.MAPPING_VALUE;
+import static org.apache.james.rrt.cassandra.tables.CassandraMappingsSourcesTable.SOURCE;
+import static org.apache.james.rrt.cassandra.tables.CassandraMappingsSourcesTable.TABLE_NAME;
+
+import javax.inject.Inject;
+
+import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor;
+import org.apache.james.rrt.lib.Mapping;
+import org.apache.james.rrt.lib.MappingSource;
+
+import com.datastax.driver.core.PreparedStatement;
+import com.datastax.driver.core.Session;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+class CassandraMappingsSourcesDAO {
+ private final CassandraAsyncExecutor executor;
+ private final PreparedStatement insertStatement;
+ private final PreparedStatement deleteStatement;
+ private final PreparedStatement retrieveSourcesStatement;
+
+ @Inject
+ CassandraMappingsSourcesDAO(Session session) {
+ this.executor = new CassandraAsyncExecutor(session);
+ this.insertStatement = prepareInsertStatement(session);
+ this.deleteStatement = prepareDelete(session);
+ this.retrieveSourcesStatement = prepareRetrieveSourcesStatement(session);
+ }
+
+ private PreparedStatement prepareInsertStatement(Session session) {
+ return session.prepare(insertInto(TABLE_NAME)
+ .value(MAPPING_TYPE, bindMarker(MAPPING_TYPE))
+ .value(MAPPING_VALUE, bindMarker(MAPPING_VALUE))
+ .value(SOURCE, bindMarker(SOURCE)));
+ }
+
+ private PreparedStatement prepareDelete(Session session) {
+ return session.prepare(delete()
+ .from(TABLE_NAME)
+ .where(eq(MAPPING_TYPE, bindMarker(MAPPING_TYPE)))
+ .and(eq(MAPPING_VALUE, bindMarker(MAPPING_VALUE)))
+ .and(eq(SOURCE, bindMarker(SOURCE))));
+ }
+
+ private PreparedStatement prepareRetrieveSourcesStatement(Session session) {
+ return session.prepare(select(SOURCE)
+ .from(TABLE_NAME)
+ .where(eq(MAPPING_TYPE, bindMarker(MAPPING_TYPE)))
+ .and(eq(MAPPING_VALUE, bindMarker(MAPPING_VALUE))));
+ }
+
+ Mono<Void> addMapping(Mapping mapping, MappingSource source) {
+ return executor.executeVoidReactor(insertStatement.bind()
+ .setString(MAPPING_TYPE, mapping.getType().asPrefix())
+ .setString(MAPPING_VALUE, mapping.getMappingValue())
+ .setString(SOURCE, source.asMailAddressString()));
+ }
+
+ Mono<Void> removeMapping(Mapping mapping, MappingSource source) {
+ return executor.executeVoidReactor(deleteStatement.bind()
+ .setString(MAPPING_TYPE, mapping.getType().asPrefix())
+ .setString(MAPPING_VALUE, mapping.getMappingValue())
+ .setString(SOURCE, source.asMailAddressString()));
+ }
+
+ Flux<MappingSource> retrieveSources(Mapping mapping) {
+ return executor.executeReactor(retrieveSourcesStatement.bind()
+ .setString(MAPPING_TYPE, mapping.getType().asPrefix())
+ .setString(MAPPING_VALUE, mapping.getMappingValue()))
+ .flatMapMany(Flux::fromIterable)
+ .map(row -> MappingSource.parse(row.getString(SOURCE)));
+ }
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4e56936/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRRTModule.java
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRRTModule.java b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRRTModule.java
index 87a469b..102c9b6 100644
--- a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRRTModule.java
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRRTModule.java
@@ -23,12 +23,14 @@ import static com.datastax.driver.core.DataType.text;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.utils.CassandraConstants;
+import org.apache.james.rrt.cassandra.tables.CassandraMappingsSourcesTable;
import org.apache.james.rrt.cassandra.tables.CassandraRecipientRewriteTableTable;
import com.datastax.driver.core.schemabuilder.SchemaBuilder;
public interface CassandraRRTModule {
- CassandraModule MODULE = CassandraModule.table(CassandraRecipientRewriteTableTable.TABLE_NAME)
+ CassandraModule MODULE = CassandraModule.builder()
+ .table(CassandraRecipientRewriteTableTable.TABLE_NAME)
.comment("Holds address re-writing rules.")
.options(options -> options
.caching(SchemaBuilder.KeyCaching.ALL,
@@ -37,5 +39,14 @@ public interface CassandraRRTModule {
.addPartitionKey(CassandraRecipientRewriteTableTable.USER, text())
.addClusteringColumn(CassandraRecipientRewriteTableTable.DOMAIN, text())
.addClusteringColumn(CassandraRecipientRewriteTableTable.MAPPING, text()))
+ .table(CassandraMappingsSourcesTable.TABLE_NAME)
+ .comment("Projection table for retrieving sources associated with given mappings.")
+ .options(options -> options
+ .caching(SchemaBuilder.KeyCaching.ALL,
+ SchemaBuilder.rows(CassandraConstants.DEFAULT_CACHED_ROW_PER_PARTITION)))
+ .statement(statement -> statement
+ .addPartitionKey(CassandraMappingsSourcesTable.MAPPING_TYPE, text())
+ .addPartitionKey(CassandraMappingsSourcesTable.MAPPING_VALUE, text())
+ .addClusteringColumn(CassandraMappingsSourcesTable.SOURCE, text()))
.build();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4e56936/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTable.java b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTable.java
index 27bc7d4..4c7a92b 100644
--- a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTable.java
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTable.java
@@ -31,40 +31,46 @@ import org.apache.james.rrt.lib.MappingsImpl;
import org.apache.james.util.OptionalUtils;
public class CassandraRecipientRewriteTable extends AbstractRecipientRewriteTable {
- private final CassandraRecipientRewriteTableDAO dao;
+ private final CassandraRecipientRewriteTableDAO cassandraRecipientRewriteTableDAO;
+ private final CassandraMappingsSourcesDAO cassandraMappingsSourcesDAO;
@Inject
- public CassandraRecipientRewriteTable(CassandraRecipientRewriteTableDAO dao) {
- this.dao = dao;
+ public CassandraRecipientRewriteTable(CassandraRecipientRewriteTableDAO cassandraRecipientRewriteTableDAO, CassandraMappingsSourcesDAO cassandraMappingsSourcesDAO) {
+ this.cassandraRecipientRewriteTableDAO = cassandraRecipientRewriteTableDAO;
+ this.cassandraMappingsSourcesDAO = cassandraMappingsSourcesDAO;
}
@Override
public void addMapping(MappingSource source, Mapping mapping) {
- dao.addMapping(source, mapping).block();
+ cassandraRecipientRewriteTableDAO.addMapping(source, mapping)
+ .then(cassandraMappingsSourcesDAO.addMapping(mapping, source))
+ .block();
}
@Override
public void removeMapping(MappingSource source, Mapping mapping) {
- dao.removeMapping(source, mapping).block();
+ cassandraRecipientRewriteTableDAO.removeMapping(source, mapping)
+ .then(cassandraMappingsSourcesDAO.removeMapping(mapping, source))
+ .block();
}
@Override
public Mappings getStoredMappings(MappingSource source) {
- return dao.retrieveMappings(source)
+ return cassandraRecipientRewriteTableDAO.retrieveMappings(source)
.blockOptional()
.orElse(MappingsImpl.empty());
}
@Override
public Map<MappingSource, Mappings> getAllMappings() {
- return dao.getAllMappings().block();
+ return cassandraRecipientRewriteTableDAO.getAllMappings().block();
}
@Override
protected Mappings mapAddress(String user, Domain domain) {
return OptionalUtils.orSuppliers(
- () -> dao.retrieveMappings(MappingSource.fromUser(user, domain)).blockOptional(),
- () -> dao.retrieveMappings(MappingSource.fromDomain(domain)).blockOptional())
+ () -> cassandraRecipientRewriteTableDAO.retrieveMappings(MappingSource.fromUser(user, domain)).blockOptional(),
+ () -> cassandraRecipientRewriteTableDAO.retrieveMappings(MappingSource.fromDomain(domain)).blockOptional())
.orElse(MappingsImpl.empty());
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4e56936/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/tables/CassandraMappingsSourcesTable.java
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/tables/CassandraMappingsSourcesTable.java b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/tables/CassandraMappingsSourcesTable.java
new file mode 100644
index 0000000..81a3c31
--- /dev/null
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/tables/CassandraMappingsSourcesTable.java
@@ -0,0 +1,29 @@
+/****************************************************************
+ * 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.rrt.cassandra.tables;
+
+public interface CassandraMappingsSourcesTable {
+
+ String TABLE_NAME = "mappings_sources";
+
+ String MAPPING_TYPE = "mapping_type";
+ String MAPPING_VALUE = "mapping_value";
+ String SOURCE = "source";
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4e56936/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraMappingsSourcesDAOTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraMappingsSourcesDAOTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraMappingsSourcesDAOTest.java
new file mode 100644
index 0000000..5d0a125
--- /dev/null
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraMappingsSourcesDAOTest.java
@@ -0,0 +1,80 @@
+/****************************************************************
+ * 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.rrt.cassandra;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.apache.james.backends.cassandra.CassandraCluster;
+import org.apache.james.backends.cassandra.CassandraClusterExtension;
+import org.apache.james.backends.cassandra.utils.CassandraUtils;
+import org.apache.james.core.Domain;
+import org.apache.james.rrt.lib.Mapping;
+import org.apache.james.rrt.lib.MappingSource;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+class CassandraMappingsSourcesDAOTest {
+ private static final String USER = "test";
+ private static final String ADDRESS = "test@domain";
+ private static final MappingSource SOURCE = MappingSource.fromUser(USER, Domain.LOCALHOST);
+ private static final Mapping MAPPING = Mapping.alias(ADDRESS);
+
+ @RegisterExtension
+ static CassandraClusterExtension cassandraCluster = new CassandraClusterExtension(CassandraRRTModule.MODULE);
+
+ private static CassandraMappingsSourcesDAO dao;
+
+ @BeforeEach
+ void setUp(CassandraCluster cassandra) {
+ dao = new CassandraMappingsSourcesDAO(cassandra.getConf());
+ }
+
+ @Test
+ void retrieveSourcesShouldReturnEmptyByDefault() {
+ assertThat(dao.retrieveSources(MAPPING).collectList().block()).isEmpty();
+ }
+
+ @Test
+ void retrieveSourcesShouldReturnStoredMappingSource() {
+ dao.addMapping(MAPPING, SOURCE).block();
+
+ assertThat(dao.retrieveSources(MAPPING).collectList().block()).containsOnly(SOURCE);
+ }
+
+ @Test
+ void retrieveSourcesShouldNotReturnRemovedMapping() {
+ dao.addMapping(MAPPING, SOURCE).block();
+
+ dao.removeMapping(MAPPING, SOURCE).block();
+
+ assertThat(dao.retrieveSources(MAPPING).collectList().block()).isEmpty();
+ }
+
+ @Test
+ void retrieveSourcesShouldReturnMultipleStoredMappingSourcesForMapping() {
+ MappingSource source2 = MappingSource.fromUser("bob", Domain.LOCALHOST);
+
+ dao.addMapping(MAPPING, SOURCE).block();
+ dao.addMapping(MAPPING, source2).block();
+
+ assertThat(dao.retrieveSources(MAPPING).collectList().block()).containsOnly(SOURCE, source2);
+ }
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4e56936/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableDAOTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableDAOTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableDAOTest.java
index 0d2f096..3abc541 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableDAOTest.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableDAOTest.java
@@ -36,65 +36,78 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class CassandraRecipientRewriteTableDAOTest {
private static final String USER = "test";
private static final String ADDRESS = "test@domain";
+ private static final String ADDRESS_2 = "test2@domain";
private static final MappingSource SOURCE = MappingSource.fromUser(USER, Domain.LOCALHOST);
private static final Mapping MAPPING = Mapping.alias(ADDRESS);
+ private static final Mapping MAPPING_2 = Mapping.alias(ADDRESS_2);
@RegisterExtension
static CassandraClusterExtension cassandraCluster = new CassandraClusterExtension(CassandraRRTModule.MODULE);
- private CassandraRecipientRewriteTableDAO cassandraRecipientRewriteTableDAO;
+ private CassandraRecipientRewriteTableDAO dao;
@BeforeEach
void setUp(CassandraCluster cassandra) {
- cassandraRecipientRewriteTableDAO = new CassandraRecipientRewriteTableDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION);
+ dao = new CassandraRecipientRewriteTableDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION);
}
@Test
void retrieveMappingsShouldReturnEmptyByDefault() {
- assertThat(cassandraRecipientRewriteTableDAO.retrieveMappings(SOURCE).blockOptional())
- .isEmpty();
+ assertThat(dao.retrieveMappings(SOURCE).blockOptional()).isEmpty();
}
@Test
void getAllMappingsShouldReturnEmptyByDefault() {
- assertThat(cassandraRecipientRewriteTableDAO.getAllMappings().block())
- .isEmpty();
+ assertThat(dao.getAllMappings().block()).isEmpty();
}
@Test
void retrieveMappingsShouldReturnStoredMapping() {
- cassandraRecipientRewriteTableDAO.addMapping(SOURCE, MAPPING).block();
+ dao.addMapping(SOURCE, MAPPING).block();
- assertThat(cassandraRecipientRewriteTableDAO.retrieveMappings(SOURCE).blockOptional())
- .contains(MappingsImpl.fromMappings(MAPPING));
+ assertThat(dao.retrieveMappings(SOURCE).blockOptional()).contains(MappingsImpl.fromMappings(MAPPING));
}
@Test
void getAllMappingsShouldReturnStoredMapping() {
- cassandraRecipientRewriteTableDAO.addMapping(SOURCE, MAPPING).block();
+ dao.addMapping(SOURCE, MAPPING).block();
- assertThat(cassandraRecipientRewriteTableDAO.getAllMappings().block())
- .contains(Pair.of(SOURCE, MappingsImpl.fromMappings(MAPPING)));
+ assertThat(dao.getAllMappings().block()).contains(Pair.of(SOURCE, MappingsImpl.fromMappings(MAPPING)));
}
@Test
void retrieveMappingsShouldNotReturnRemovedMapping() {
- cassandraRecipientRewriteTableDAO.addMapping(SOURCE, MAPPING).block();
+ dao.addMapping(SOURCE, MAPPING).block();
- cassandraRecipientRewriteTableDAO.removeMapping(SOURCE, MAPPING).block();
+ dao.removeMapping(SOURCE, MAPPING).block();
- assertThat(cassandraRecipientRewriteTableDAO.retrieveMappings(SOURCE).blockOptional())
- .isEmpty();
+ assertThat(dao.retrieveMappings(SOURCE).blockOptional()).isEmpty();
}
@Test
void getAllMappingsShouldNotReturnRemovedMapping() {
- cassandraRecipientRewriteTableDAO.addMapping(SOURCE, MAPPING).block();
+ dao.addMapping(SOURCE, MAPPING).block();
- cassandraRecipientRewriteTableDAO.removeMapping(SOURCE, MAPPING).block();
+ dao.removeMapping(SOURCE, MAPPING).block();
- assertThat(cassandraRecipientRewriteTableDAO.getAllMappings().block())
- .isEmpty();
+ assertThat(dao.getAllMappings().block()).isEmpty();
}
+ @Test
+ void retrieveMappingsShouldReturnMultipleStoredMappingsOfSource() {
+ dao.addMapping(SOURCE, MAPPING).block();
+ dao.addMapping(SOURCE, MAPPING_2).block();
+
+ assertThat(dao.retrieveMappings(SOURCE).blockOptional())
+ .contains(MappingsImpl.fromMappings(MAPPING, MAPPING_2));
+ }
+
+ @Test
+ void getAllMappingsShouldReturnMultipleStoredMappings() {
+ dao.addMapping(SOURCE, MAPPING).block();
+ dao.addMapping(SOURCE, MAPPING_2).block();
+
+ assertThat(dao.getAllMappings().block())
+ .contains(Pair.of(SOURCE, MappingsImpl.fromMappings(MAPPING, MAPPING_2)));
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4e56936/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java
index d0bc05c..f9d27a1 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java
@@ -62,7 +62,8 @@ public class CassandraRecipientRewriteTableTest extends AbstractRecipientRewrite
@Override
protected AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception {
CassandraRecipientRewriteTable rrt = new CassandraRecipientRewriteTable(
- new CassandraRecipientRewriteTableDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION));
+ new CassandraRecipientRewriteTableDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION),
+ new CassandraMappingsSourcesDAO(cassandra.getConf()));
rrt.configure(new DefaultConfigurationBuilder());
return rrt;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4e56936/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java
index edec0ca..d9aeac4 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java
@@ -50,7 +50,8 @@ public class CassandraStepdefs {
private AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception {
CassandraRecipientRewriteTable rrt = new CassandraRecipientRewriteTable(
- new CassandraRecipientRewriteTableDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION));
+ new CassandraRecipientRewriteTableDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION),
+ new CassandraMappingsSourcesDAO(cassandra.getConf()));
rrt.configure(new DefaultConfigurationBuilder());
return rrt;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org