Merge pull request #15 from ivanjunckes/cassandra_changes

Cassandra improvements

Author: Otávio Santana

cassandra-driver/pom.xml

@@ -57,6 +57,21 @@
             <artifactId>cassandra-driver-core</artifactId>
             <version>3.0.3</version>
         </dependency>
+        <dependency>
+            <groupId>org.cassandraunit</groupId>
+            <artifactId>cassandra-unit</artifactId>
+            <version>3.1.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>19.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.fusesource</groupId>
+            <artifactId>sigar</artifactId>
+            <version>1.6.4</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

cassandra-driver/src/main/java/org/jnosql/diana/cassandra/column/CassandraProperties.java

@@ -36,6 +36,7 @@ class CassandraProperties {
 
     private static final String DEFAULT_THREADS_NUMBER = Integer.toString(Runtime.getRuntime().availableProcessors());
     private static final String CASSANDRA_HOSTER = "cassandra-host";
+    private static final String CASSANDRA_PORT = "cassandra-port";
     private static final String CASSANDRA_QUERY = "cassandra-query";
     private static final String CASSANDRA_THREADS_NUMBER = "cassandra-threads-number";
     private static final String CASSANDRA_SSL = "cassandra-ssl";
@@ -106,6 +107,8 @@ public static CassandraProperties of(Map<String, String> configurations) {
 
         configurations.keySet().stream().filter(s -> s.startsWith(CASSANDRA_QUERY))
                 .sorted().map(configurations::get).forEach(cp::addQuery);
+
+        cp.port = OptionalInt.of(Integer.valueOf(configurations.getOrDefault(CASSANDRA_PORT, "9042")));
         cp.numTreads = configurations.getOrDefault(CASSANDRA_THREADS_NUMBER, DEFAULT_THREADS_NUMBER);
         cp.withSSL = Boolean.valueOf(configurations.getOrDefault(CASSANDRA_SSL, FALSE.toString()));
         cp.withoutMetrics = Boolean.valueOf(configurations.getOrDefault(CASSANDRA_METRICS, FALSE.toString()));

cassandra-driver/src/test/java/org/jnosql/diana/cassandra/column/CassandraColumnFamilyManagerAsyncTest.java

@@ -20,12 +20,16 @@
 package org.jnosql.diana.cassandra.column;
 
 import com.datastax.driver.core.ConsistencyLevel;
+import org.apache.thrift.transport.TTransportException;
+import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
 import org.jnosql.diana.api.column.Column;
 import org.jnosql.diana.api.column.ColumnEntity;
 import org.jnosql.diana.api.column.Columns;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -42,7 +46,8 @@ public class CassandraColumnFamilyManagerAsyncTest {
     private CassandraColumnFamilyManagerAsync columnEntityManager;
 
     @Before
-    public void setUp() {
+    public void setUp() throws InterruptedException, IOException, TTransportException {
+        EmbeddedCassandraServerHelper.startEmbeddedCassandra();
         CassandraConfiguration cassandraConfiguration = new CassandraConfiguration();
         CassandraDocumentEntityManagerFactory entityManagerFactory = cassandraConfiguration.get();
         columnEntityManager = entityManagerFactory.getAsync(KEY_SPACE);
@@ -78,4 +83,9 @@ private ColumnEntity getColumnFamily() {
         columns.forEach(columnFamily::add);
         return columnFamily;
     }
+
+    @After
+    public void end(){
+        EmbeddedCassandraServerHelper.cleanEmbeddedCassandra();
+    }
 }

cassandra-driver/src/test/java/org/jnosql/diana/cassandra/column/CassandraColumnFamilyManagerFactoryTest.java

@@ -21,12 +21,15 @@
 package org.jnosql.diana.cassandra.column;
 
 import com.datastax.driver.core.Cluster;
+import org.apache.thrift.transport.TTransportException;
+import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
 import org.jnosql.diana.api.column.ColumnFamilyManager;
 import org.jnosql.diana.api.column.ColumnFamilyManagerAsync;
-import org.jnosql.diana.api.column.ColumnFamilyManagerFactory;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -39,10 +42,12 @@ public class CassandraColumnFamilyManagerFactoryTest {
     private CassandraDocumentEntityManagerFactory subject;
 
     @Before
-    public void setUp() {
+    public void setUp() throws InterruptedException, IOException, TTransportException {
         Map<String, String> configurations = new HashMap<>();
         configurations.put("cassandra-hoster-1", "localhost");
-        configurations.put("cassandra-initial-query-1", " CREATE KEYSPACE IF NOT EXISTS newKeySpace WITH replication = {'class': 'SimpleStrategy', 'replication_factor' : 3};");
+        configurations.put("cassandra-port", "9142");
+        configurations.put("cassandra-query-1", " CREATE KEYSPACE IF NOT EXISTS newKeySpace WITH replication = {'class': 'SimpleStrategy', 'replication_factor' : 3};");
+        EmbeddedCassandraServerHelper.startEmbeddedCassandra();
         CassandraConfiguration cassandraConfiguration = new CassandraConfiguration();
         subject = cassandraConfiguration.getManagerFactory(configurations);
     }
@@ -67,4 +72,8 @@ public void shouldCloseNode() throws Exception {
         assertTrue(cluster.isClosed());
     }
 
+    @After
+    public void end(){
+        EmbeddedCassandraServerHelper.cleanEmbeddedCassandra();
+    }
 }

cassandra-driver/src/test/java/org/jnosql/diana/cassandra/column/CassandraColumnFamilyManagerTest.java

@@ -22,17 +22,21 @@
 
 import com.datastax.driver.core.ConsistencyLevel;
 import com.datastax.driver.core.Session;
+import org.apache.thrift.transport.TTransportException;
+import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
 import org.jnosql.diana.api.Value;
 import org.jnosql.diana.api.column.Column;
 import org.jnosql.diana.api.column.ColumnCondition;
 import org.jnosql.diana.api.column.ColumnDeleteQuery;
 import org.jnosql.diana.api.column.ColumnEntity;
 import org.jnosql.diana.api.column.ColumnQuery;
 import org.jnosql.diana.api.column.Columns;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -55,7 +59,8 @@ public class CassandraColumnFamilyManagerTest {
     private CassandraColumnFamilyManager columnEntityManager;
 
     @Before
-    public void setUp() {
+    public void setUp() throws InterruptedException, IOException, TTransportException {
+        EmbeddedCassandraServerHelper.startEmbeddedCassandra();
         CassandraConfiguration cassandraConfiguration = new CassandraConfiguration();
         CassandraDocumentEntityManagerFactory entityManagerFactory = cassandraConfiguration.get();
         columnEntityManager = entityManagerFactory.get(KEY_SPACE);
@@ -196,4 +201,8 @@ private ColumnEntity getColumnFamily() {
         return columnFamily;
     }
 
+    @After
+    public void end(){
+        EmbeddedCassandraServerHelper.cleanEmbeddedCassandra();
+    }
 }

cassandra-driver/src/test/java/org/jnosql/diana/cassandra/column/CassandraConfigurationTest.java

@@ -21,9 +21,13 @@
 package org.jnosql.diana.cassandra.column;
 
 
+import org.apache.thrift.transport.TTransportException;
+import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
 import org.jnosql.diana.api.column.ColumnFamilyManagerFactory;
+import org.junit.After;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -32,9 +36,11 @@
 public class CassandraConfigurationTest {
 
     @Test
-    public void shoudlCreateDocumentEntityManagerFactory() {
+    public void shoudlCreateDocumentEntityManagerFactory() throws InterruptedException, IOException, TTransportException {
         Map<String, String> configurations = new HashMap<>();
         configurations.put("cassandra-hoster-1", "localhost");
+        configurations.put("cassandra-port", "9142");
+        EmbeddedCassandraServerHelper.startEmbeddedCassandra();
         CassandraConfiguration cassandraConfiguration = new CassandraConfiguration();
         ColumnFamilyManagerFactory entityManagerFactory = cassandraConfiguration.getManagerFactory(configurations);
         assertNotNull(entityManagerFactory);
@@ -52,4 +58,9 @@ public void shouldReturnNPEWhenMapIsNull() {
         CassandraConfiguration cassandraConfiguration = new CassandraConfiguration();
         cassandraConfiguration.getManagerFactory(null);
     }
+
+    @After
+    public void end(){
+        EmbeddedCassandraServerHelper.cleanEmbeddedCassandra();
+    }
 }

cassandra-driver/src/test/resources/diana-cassandra.properties

@@ -19,6 +19,7 @@
 #
 
 cassandra-host-1=localhost
+cassandra-port=9142
 cassandra-threads-number=4
 cassandra-query-1=CREATE KEYSPACE IF NOT EXISTS newKeySpace WITH replication = {'class': 'SimpleStrategy', 'replication_factor' : 3};
 cassandra-query-2=DROP TABLE IF EXISTS newKeySpace.newColumnFamily;

docker.sh

@@ -1,5 +1,4 @@
 docker run -e ARANGO_NO_AUTH=1 -d --name arangodb-instance -p 8529:8529 -d arangodb/arangodb
-docker run --name cassandra-instance -p 9042:9042 -d cassandra
 docker run -d --name couchbase-instance -p 8091-8094:8091-8094 -p 11210:11210 couchbase
 docker run --name elasticsearch-instance -p 9300:9300 -p 9200:9200 -d elasticsearch
 docker run --name mongo-instance -p 27017:27017 -d mongo