METAMODEL-1094: Fixed
authorKasper Sørensen <i.am.kasper.sorensen@gmail.com>
Thu, 9 Jun 2016 04:27:05 +0000 (21:27 -0700)
committerKasper Sørensen <i.am.kasper.sorensen@gmail.com>
Thu, 9 Jun 2016 04:27:05 +0000 (21:27 -0700)
Fixes #108

CHANGES.md
cassandra/pom.xml
cassandra/src/main/java/org/apache/metamodel/cassandra/CassandraUtils.java

index 92e13e4..c10eb35 100644 (file)
@@ -2,6 +2,7 @@
 
  * [METAMODEL-1088] - Add support for aliases in MongoDB.
  * [METAMODEL-1086] - Fixed encoding issue when CsvDataContext is instantiated with InputStream.
+ * [METAMODEL-1094] - Added support for Apache Cassandra version 3.x.
 
 ### Apache MetaModel 4.5.3
 
index 8bb99a5..7a84f6e 100644 (file)
@@ -20,7 +20,8 @@
        <name>MetaModel module for Apache Cassandra database</name>
 
        <properties>
-               <cassandra.driver.latest.version>2.1.1</cassandra.driver.latest.version>
+               <cassandra.driver.latest.version>3.0.2</cassandra.driver.latest.version>
+               <cassandraunit.latest.version>2.2.2.1</cassandraunit.latest.version>
        </properties>
 
        <dependencies>
                        <groupId>com.datastax.cassandra</groupId>
                        <artifactId>cassandra-driver-core</artifactId>
                        <version>${cassandra.driver.latest.version}</version>
+                       <!-- Excluded netty dependency -->
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>io.netty</groupId>
+                                       <artifactId>netty-handler</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>commons-io</groupId>
@@ -53,7 +61,7 @@
                <dependency>
                        <groupId>org.cassandraunit</groupId>
                        <artifactId>cassandra-unit</artifactId>
-                       <version>2.1.3.1</version>
+                       <version>${cassandraunit.latest.version}</version>
                        <scope>test</scope>
                        <exclusions>
                                <exclusion>
index 0805dfe..b8f7327 100644 (file)
@@ -84,7 +84,7 @@ public class CassandraUtils {
         case TEXT:
             return row.getString(columnName);
         case TIMESTAMP:
-            return row.getDate(columnName);
+            return row.getTimestamp(columnName);
         case UUID:
             return row.getUUID(columnName);
         case VARCHAR: