This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 984dc0fb77da12cf8eb7cdab2c7790646b6de46e Author: Benoit Tellier <[email protected]> AuthorDate: Mon Mar 30 17:48:52 2020 +0700 JAMES-2648 Rely on CassandraSchemaVersionManager for version computation --- .../rrt/cassandra/CassandraRecipientRewriteTable.java | 17 +++++------------ .../cassandra/CassandraRecipientRewriteTableV6Test.java | 9 ++++----- .../cassandra/CassandraRecipientRewriteTableV7Test.java | 9 ++++----- .../apache/james/rrt/cassandra/CassandraStepdefs.java | 6 ++++-- 4 files changed, 17 insertions(+), 24 deletions(-) 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 d28e2e2..1997e53 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 @@ -23,7 +23,6 @@ import java.util.stream.Stream; import javax.inject.Inject; -import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionDAO; import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionManager; import org.apache.james.backends.cassandra.versions.SchemaVersion; import org.apache.james.core.Domain; @@ -43,18 +42,18 @@ public class CassandraRecipientRewriteTable extends AbstractRecipientRewriteTabl private final CassandraRecipientRewriteTableDAO cassandraRecipientRewriteTableDAO; private final CassandraMappingsSourcesDAO cassandraMappingsSourcesDAO; - private final CassandraSchemaVersionDAO cassandraSchemaVersionDAO; + private final CassandraSchemaVersionManager versionManager; private final SchemaVersion initialSchemaVersion; @Inject CassandraRecipientRewriteTable(CassandraRecipientRewriteTableDAO cassandraRecipientRewriteTableDAO, CassandraMappingsSourcesDAO cassandraMappingsSourcesDAO, - CassandraSchemaVersionDAO cassandraSchemaVersionDAO) { + CassandraSchemaVersionManager versionManager) { this.cassandraRecipientRewriteTableDAO = cassandraRecipientRewriteTableDAO; this.cassandraMappingsSourcesDAO = cassandraMappingsSourcesDAO; - this.cassandraSchemaVersionDAO = cassandraSchemaVersionDAO; + this.versionManager = versionManager; - initialSchemaVersion = retrieveCurrentSchemaVersion(); + initialSchemaVersion = versionManager.computeVersion(); } @Override @@ -111,16 +110,10 @@ public class CassandraRecipientRewriteTable extends AbstractRecipientRewriteTabl private boolean isLegacy() { return isLegacy(initialSchemaVersion) // If we started with a legacy james then maybe schema version had been updated since then - || isLegacy(retrieveCurrentSchemaVersion()); + || isLegacy(versionManager.computeVersion()); } private boolean isLegacy(SchemaVersion schemaVersion) { return schemaVersion.isBefore(MAPPINGS_SOURCES_SUPPORTED_VERSION); } - - private SchemaVersion retrieveCurrentSchemaVersion() { - return cassandraSchemaVersionDAO.getCurrentSchemaVersion() - .block() - .orElse(CassandraSchemaVersionManager.MIN_VERSION); - } } diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV6Test.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV6Test.java index 34e51ad..69aea33 100644 --- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV6Test.java +++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV6Test.java @@ -19,12 +19,12 @@ package org.apache.james.rrt.cassandra; -import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.utils.CassandraUtils; import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionDAO; +import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionManager; import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule; import org.apache.james.backends.cassandra.versions.SchemaVersion; import org.apache.james.rrt.lib.AbstractRecipientRewriteTable; @@ -60,15 +60,14 @@ public class CassandraRecipientRewriteTableV6Test extends AbstractRecipientRewri } @Override - protected AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception { + protected AbstractRecipientRewriteTable getRecipientRewriteTable() { CassandraSchemaVersionDAO cassandraSchemaVersionDAO = new CassandraSchemaVersionDAO( - cassandra.getConf() - ); + cassandra.getConf()); CassandraRecipientRewriteTable rrt = new CassandraRecipientRewriteTable( new CassandraRecipientRewriteTableDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION), new CassandraMappingsSourcesDAO(cassandra.getConf()), - cassandraSchemaVersionDAO); + new CassandraSchemaVersionManager(cassandraSchemaVersionDAO)); cassandraSchemaVersionDAO.updateVersion(SCHEMA_VERSION_V6); diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7Test.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7Test.java index 2c6a205..063cb83 100644 --- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7Test.java +++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7Test.java @@ -19,12 +19,12 @@ package org.apache.james.rrt.cassandra; -import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.utils.CassandraUtils; import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionDAO; +import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionManager; import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule; import org.apache.james.backends.cassandra.versions.SchemaVersion; import org.apache.james.rrt.lib.AbstractRecipientRewriteTable; @@ -60,15 +60,14 @@ public class CassandraRecipientRewriteTableV7Test extends AbstractRecipientRewri } @Override - protected AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception { + protected AbstractRecipientRewriteTable getRecipientRewriteTable() { CassandraSchemaVersionDAO cassandraSchemaVersionDAO = new CassandraSchemaVersionDAO( - cassandra.getConf() - ); + cassandra.getConf()); CassandraRecipientRewriteTable rrt = new CassandraRecipientRewriteTable( new CassandraRecipientRewriteTableDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION), new CassandraMappingsSourcesDAO(cassandra.getConf()), - cassandraSchemaVersionDAO); + new CassandraSchemaVersionManager(cassandraSchemaVersionDAO)); cassandraSchemaVersionDAO.updateVersion(SCHEMA_VERSION_V7); 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 eb16b46..6738118 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 @@ -23,6 +23,7 @@ import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.utils.CassandraUtils; import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionDAO; +import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionManager; import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule; import org.apache.james.rrt.lib.AbstractRecipientRewriteTable; import org.apache.james.rrt.lib.RecipientRewriteTableFixture; @@ -30,6 +31,7 @@ import org.apache.james.rrt.lib.RewriteTablesStepdefs; import org.junit.Rule; import com.github.fge.lambdas.Throwing; + import cucumber.api.java.After; import cucumber.api.java.Before; @@ -47,7 +49,7 @@ public class CassandraStepdefs { } @Before - public void setup() throws Throwable { + public void setup() { cassandra = CassandraCluster.create( CassandraModule.aggregateModules(CassandraRRTModule.MODULE, CassandraSchemaVersionModule.MODULE), cassandraServer.getHost()); @@ -63,7 +65,7 @@ public class CassandraStepdefs { CassandraRecipientRewriteTable rrt = new CassandraRecipientRewriteTable( new CassandraRecipientRewriteTableDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION), new CassandraMappingsSourcesDAO(cassandra.getConf()), - new CassandraSchemaVersionDAO(cassandra.getConf())); + new CassandraSchemaVersionManager(new CassandraSchemaVersionDAO(cassandra.getConf()))); rrt.setDomainList(RecipientRewriteTableFixture.domainListForCucumberTests()); return rrt; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
