Adds supports to date at Cassandra

Author: Otavio Santana

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

@@ -21,6 +21,7 @@
 package org.jnosql.diana.cassandra.column;
 
 import com.datastax.driver.core.ConsistencyLevel;
+import com.datastax.driver.core.LocalDate;
 import com.datastax.driver.core.Session;
 import org.apache.thrift.transport.TTransportException;
 import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
@@ -35,15 +36,18 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.Month;
+import java.time.ZoneId;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
@@ -62,7 +66,7 @@ public class CassandraColumnFamilyManagerTest {
     public static final ConsistencyLevel CONSISTENCY_LEVEL = ConsistencyLevel.ONE;
     private CassandraColumnFamilyManager columnEntityManager;
 
-      @Before
+    @Before
     public void setUp() throws InterruptedException, IOException, TTransportException {
         EmbeddedCassandraServerHelper.startEmbeddedCassandra();
         CassandraConfiguration cassandraConfiguration = new CassandraConfiguration();
@@ -88,7 +92,6 @@ public void shouldInsertJustKey() {
     }
 
 
-
     @Test
     public void shouldInsertColumns() {
         ColumnEntity columnEntity = getColumnFamily();
@@ -102,7 +105,6 @@ public void shouldInsertColumnsWithConsistencyLevel() {
     }
 
 
-
     @Test
     public void shouldFindById() {
 
@@ -199,7 +201,7 @@ private List<ColumnEntity> getEntities() {
     public void shouldSupportUDT() {
         ColumnEntity entity = ColumnEntity.of("users");
         entity.add(Column.of("nickname", "ada"));
-        List<Column> columns =new ArrayList<>();
+        List<Column> columns = new ArrayList<>();
         columns.add(Column.of("firstname", "Ada"));
         columns.add(Column.of("lastname", "Lovelace"));
         UDT udt = UDT.builder().withName("name")
@@ -222,7 +224,7 @@ public void shouldSupportUDT() {
     public void shouldSupportAnUDTElement() {
         ColumnEntity entity = ColumnEntity.of("users");
         entity.add(Column.of("nickname", "Ioda"));
-        List<Column> columns =new ArrayList<>();
+        List<Column> columns = new ArrayList<>();
         columns.add(Column.of("firstname", "Ioda"));
         UDT udt = UDT.builder().withName("name")
                 .withTypeName("fullname")
@@ -240,6 +242,24 @@ public void shouldSupportAnUDTElement() {
     }
 
 
+    @Test
+    public void shouldSupportDate() {
+        ColumnEntity entity = ColumnEntity.of("history");
+        entity.add(Column.of("name", "World war II"));
+        ZoneId defaultZoneId = ZoneId.systemDefault();
+        Date dateEnd = Date.from(java.time.LocalDate.of(1945, Month.SEPTEMBER, 2).atStartOfDay(defaultZoneId).toInstant());
+        Calendar dataStart = Calendar.getInstance();
+        entity.add(Column.of("dataStart", LocalDate.fromYearMonthDay(1939,9, 1)));
+        entity.add(Column.of("dateEnd", dateEnd));
+        columnEntityManager.save(entity);
+        ColumnQuery query = ColumnQuery.of("history");
+        query.and(ColumnCondition.eq(Column.of("name", "World war II")));
+        ColumnEntity entity1 = columnEntityManager.singleResult(query).get();
+        Assert.assertNotNull(entity1);
+
+    }
+
+
     private ColumnEntity getColumnFamily() {
         Map<String, Object> fields = new HashMap<>();
         fields.put("name", "Cassandra");
@@ -252,9 +272,8 @@ private ColumnEntity getColumnFamily() {
     }
 
 
-
     @After
-    public void end(){
+    public void end() {
         EmbeddedCassandraServerHelper.cleanEmbeddedCassandra();
     }
 }

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

@@ -21,8 +21,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;
-cassandra-query-3=DROP TABLE IF EXISTS newKeySpace.users;
-cassandra-query-4=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.newColumnFamily (id bigint PRIMARY KEY, version double, options list<int>, name text);
-cassandra-query-5=CREATE TYPE IF NOT EXISTS newKeySpace.fullname ( firstname text, lastname text);
-cassandra-query-6=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.users ( nickname text PRIMARY KEY, name frozen <fullname>);  
+cassandra-query-2=CREATE TYPE IF NOT EXISTS newKeySpace.fullname ( firstname text, lastname text);
+cassandra-query-3=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.newColumnFamily (id bigint PRIMARY KEY, version double, options list<int>, name text);
+cassandra-query-4=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.users ( nickname text PRIMARY KEY, name frozen <fullname>);
+cassandra-query-5=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.history ( name text PRIMARY KEY, dataStart date, dateEnd timestamp);