Merge pull request #9 from Sammers21/add_contact_point

Add addContactPoint fluent method to CassandraClientOptions - fixes #3
vert-x3 · May 23, 2018 · 666d11a · 666d11a
2 parents 4a0f6af + faecf04
commit 666d11a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 9 deletions.
diff --git a/src/main/java/io/vertx/cassandra/CassandraClientOptions.java b/src/main/java/io/vertx/cassandra/CassandraClientOptions.java
@@ -26,14 +26,12 @@
  */
 @DataObject(generateConverter = true)
 public class CassandraClientOptions {
-
-  public static final List<String> DEFAULT_CONTACT_POINTS = new ArrayList<String>(1) {{
-    add("localhost");
-  }};
-
+
   public static final int DEFAULT_PORT = 9042;
 
-  private List<String> contactPoints = DEFAULT_CONTACT_POINTS;
+  public static final String DEFAULT_HOST = "localhost";
+
+  private List<String> contactPoints = new ArrayList<>();
 
   private int port = DEFAULT_PORT;
 
@@ -55,7 +53,15 @@ public CassandraClientOptions setPort(int port) {
     return this;
   }
 
+  public CassandraClientOptions addContactPoint(String address) {
+    contactPoints().add(address);
+    return this;
+  }
+
   public List<String> contactPoints() {
+    if (contactPoints == null) {
+      contactPoints = new ArrayList<>();
+    }
     return contactPoints;
   }
 

diff --git a/src/main/java/io/vertx/cassandra/impl/CassandraClientImpl.java b/src/main/java/io/vertx/cassandra/impl/CassandraClientImpl.java
@@ -50,8 +50,12 @@ public CassandraClient connect(String keyspace, Handler<AsyncResult<Void>> conne
     session.set(null);
     Cluster.Builder builder = Cluster.builder();
 
-    for (String contactPoint : options.contactPoints()) {
-      builder.addContactPoint(contactPoint);
+    if (options.contactPoints().isEmpty()) {
+      builder.addContactPoint(CassandraClientOptions.DEFAULT_HOST);
+    } else {
+      for (String contactPoint : options.contactPoints()) {
+        builder.addContactPoint(contactPoint);
+      }
     }
 
     Cluster build = builder.withPort(options.port()).build();

diff --git a/src/test/java/io/vertx/cassandra/ConnectionTest.java b/src/test/java/io/vertx/cassandra/ConnectionTest.java
@@ -30,9 +30,23 @@ public class ConnectionTest extends CassandraServiceBase {
 
   @Test
   public void connectDisconnectTest(TestContext context) {
+    CassandraClientOptions options = new CassandraClientOptions()
+      .addContactPoint(HOST)
+      .setPort(NATIVE_TRANSPORT_PORT);
+    connectAndDisconnect(context, options);
+  }
+
+  @Test
+  public void defaultContactPointShouldWorks(TestContext context) {
+    CassandraClientOptions options = new CassandraClientOptions()
+      .setPort(NATIVE_TRANSPORT_PORT);
+    connectAndDisconnect(context, options);
+  }
+
+  private void connectAndDisconnect(TestContext context, CassandraClientOptions options) {
     CassandraClient cassandraClient = CassandraClient.create(
       vertx,
-      new CassandraClientOptions().setPort(NATIVE_TRANSPORT_PORT)
+      options
     );
     Async async = context.async(2);
     cassandraClient.connect("system", connectEvent -> {