JAMES-1772 Make something like a builder in ClusterWithKeyspaceCreate…

…dFactory
apache · Jun 21, 2016 · 68ddd58 · 68ddd58
1 parent 1590e60
commit 68ddd58
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 23 deletions.
diff --git a/...main/java/org/apache/james/backends/cassandra/init/ClusterWithKeyspaceCreatedFactory.java b/...main/java/org/apache/james/backends/cassandra/init/ClusterWithKeyspaceCreatedFactory.java
@@ -25,24 +25,40 @@
 public class ClusterWithKeyspaceCreatedFactory {
 
     private final static int DEFAULT_REPLICATION_FACTOR = 1;
-
+
-    public static Cluster clusterWithInitializedKeyspaceWithoutDurableWrites(Cluster cluster, String keyspace, int replicationFactor) {
+    public static Configuration config(Cluster cluster, String keyspace) {
-        return clusterWithInitializedKeyspace(cluster, keyspace, replicationFactor, false);
+        return new Configuration(cluster, keyspace);
-    }
-
-    public static Cluster clusterWithInitializedKeyspace(Cluster cluster, String keyspace, int replicationFactor) {
-        return clusterWithInitializedKeyspace(cluster, keyspace, replicationFactor, true);
     }
-
+
-    private static Cluster clusterWithInitializedKeyspace(Cluster cluster, String keyspace, int replicationFactor, boolean durableWrites) {
+    public static class Configuration {
-        if (isKeyspacePresent(cluster, keyspace)) {
+        private Cluster cluster;
-            createKeyspace(cluster, keyspace, replicationFactor, durableWrites);
+        private String keyspace;
+        private boolean durableWrites;
+        private int replicationFactor;
+
+        private Configuration(Cluster cluster, String keyspace) {
+            this.cluster = cluster;
+            this.keyspace = keyspace;
+            this.durableWrites = true;
+            this.replicationFactor = DEFAULT_REPLICATION_FACTOR;
+        }
+
+        public Configuration disableDurableWrites() {
+            this.durableWrites = false;
+            return this;
+        }
+
+        public Configuration replicationFactor(int replicationFactor) {
+            this.replicationFactor = replicationFactor;
+            return this;
+        }
+
+        public Cluster clusterWithInitializedKeyspace() {
+            if (isKeyspacePresent(cluster, keyspace)) {
+                createKeyspace(cluster, keyspace, replicationFactor, durableWrites);
+            }
+            return cluster;
         }
-        return cluster;
-    }
-
-    public static Cluster clusterWithInitializedKeyspace(Cluster cluster, String keyspace) {
-        return clusterWithInitializedKeyspace(cluster, keyspace, DEFAULT_REPLICATION_FACTOR);
     }
 
     private static boolean isKeyspacePresent(Cluster cluster, String keyspace) {

diff --git a/...-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java b/...-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
@@ -80,7 +80,10 @@ public void clearAllTables() {
     private Optional<Session> tryInitializeSession() {
         try {
             Cluster clusterWithInitializedKeyspace = ClusterWithKeyspaceCreatedFactory
-                .clusterWithInitializedKeyspaceWithoutDurableWrites(getCluster(), KEYSPACE_NAME, REPLICATION_FACTOR);
+                .config(getCluster(), KEYSPACE_NAME)
+                .replicationFactor(REPLICATION_FACTOR)
+                .disableDurableWrites()
+                .clusterWithInitializedKeyspace();
             return Optional.of(new SessionWithInitializedTablesFactory(module).createSession(clusterWithInitializedKeyspace, KEYSPACE_NAME));
         } catch (NoHostAvailableException exception) {
             sleep(SLEEP_BEFORE_RETRY);

diff --git a/...assandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraSessionModule.java b/...assandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraSessionModule.java
@@ -76,12 +76,14 @@ Cluster provideCluster(FileSystem fileSystem, AsyncRetryExecutor executor) throw
         PropertiesConfiguration configuration = getConfiguration(fileSystem);
 
         return getRetryer(executor, configuration)
-                .getWithRetry(ctx -> ClusterWithKeyspaceCreatedFactory.clusterWithInitializedKeyspace(
+                .getWithRetry(ctx -> ClusterWithKeyspaceCreatedFactory
-                        ClusterFactory.createClusterForSingleServerWithoutPassWord(
+                        .config(
-                                configuration.getString("cassandra.ip"),
+                            ClusterFactory.createClusterForSingleServerWithoutPassWord(
-                                configuration.getInt("cassandra.port")),
+                                    configuration.getString("cassandra.ip"),
-                        configuration.getString("cassandra.keyspace"),
+                                    configuration.getInt("cassandra.port")),
-                        configuration.getInt("cassandra.replication.factor")))
+                            configuration.getString("cassandra.keyspace"))
+                        .replicationFactor(configuration.getInt("cassandra.replication.factor"))
+                        .clusterWithInitializedKeyspace())
                 .get();
     }