KAA-951: Integrate Kaa with Cassandra 3.0.5 version

kaaproject · Apr 22, 2016 · 1ee157d · 1ee157d
1 parent 1793426
commit 1ee157d
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -100,9 +100,9 @@ Copyright 2014-2016 CyberVision, Inc.
         <cassandra.driver.version>3.0.0</cassandra.driver.version>
         <cassandra.driver.mapping>3.0.0</cassandra.driver.mapping>
         <cassandra.driver.extras>3.0.0</cassandra.driver.extras>
-        <cassandra-unit.version>2.2.2.1</cassandra-unit.version>
-        <cassandra-unit-spring.version>2.2.2.1</cassandra-unit-spring.version>
-        <cassandra-all.version>3.2.1</cassandra-all.version>
+        <cassandra-unit.version>3.0.0.1</cassandra-unit.version>
+        <cassandra-unit-spring.version>3.0.0.1</cassandra-unit-spring.version>
+        <cassandra-all.version>3.5</cassandra-all.version>
         <guava.version>18.0</guava.version>
 
         <couchbase.client.version>2.1.3</couchbase.client.version>
@@ -1271,6 +1271,11 @@ Copyright 2014-2016 CyberVision, Inc.
                 <artifactId>netty-all</artifactId>
                 <version>${netty.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-handler</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>

diff --git a/server/appenders/cassandra-appender/pom.xml b/server/appenders/cassandra-appender/pom.xml
@@ -112,8 +112,16 @@ Copyright 2014-2016 CyberVision, Inc.
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-handler</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/server/appenders/cassandra-appender/src/main/avro/cassandra-appender-config.avsc b/server/appenders/cassandra-appender/src/main/avro/cassandra-appender-config.avsc
@@ -25,7 +25,7 @@
                             "name":"port",
                             "displayName":"Port",
                             "weight":0.25,
-                            "by_default":9142,
+                            "by_default":9042,
                             "type":"int"
                         }
                     ]

diff --git a/...c/main/java/org/kaaproject/kaa/server/appenders/cassandra/config/gen/CassandraConfig.java b/...c/main/java/org/kaaproject/kaa/server/appenders/cassandra/config/gen/CassandraConfig.java
@@ -7,7 +7,7 @@
 @SuppressWarnings("all")
 @org.apache.avro.specific.AvroGenerated
 public class CassandraConfig extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"CassandraConfig\",\"namespace\":\"org.kaaproject.kaa.server.appenders.cassandra.config.gen\",\"fields\":[{\"name\":\"cassandraServers\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"CassandraServer\",\"fields\":[{\"name\":\"host\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"displayName\":\"Host\",\"weight\":0.75,\"by_default\":\"localhost\"},{\"name\":\"port\",\"type\":\"int\",\"displayName\":\"Port\",\"weight\":0.25,\"by_default\":9142}]}},\"displayName\":\"Cassandra nodes\",\"minRowCount\":1},{\"name\":\"cassandraCredential\",\"type\":[{\"type\":\"record\",\"name\":\"CassandraCredential\",\"fields\":[{\"name\":\"user\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"displayName\":\"User\",\"weight\":0.5,\"by_default\":\"user\"},{\"name\":\"password\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"displayName\":\"Password\",\"weight\":0.5,\"by_default\":\"password\"}],\"optional\":true},\"null\"],\"displayName\":\"Authentication credentials\",\"namespace\":\"org.kaaproject.kaa.server.appenders.cassandra.config.gen\"},{\"name\":\"keySpace\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"displayName\":\"Keyspace name\"},{\"name\":\"tableNamePattern\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"displayName\":\"Table name pattern\",\"by_default\":\"logs_$app_token_$config_hash\"},{\"name\":\"columnMapping\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"ColumnMappingElement\",\"fields\":[{\"name\":\"type\",\"type\":{\"type\":\"enum\",\"name\":\"ColumnMappingElementType\",\"symbols\":[\"HEADER_FIELD\",\"EVENT_FIELD\",\"CLIENT_FIELD\",\"SERVER_FIELD\",\"HEADER_JSON\",\"EVENT_JSON\",\"CLIENT_JSON\",\"SERVER_JSON\",\"HEADER_BINARY\",\"EVENT_BINARY\",\"CLIENT_BINARY\",\"SERVER_BINARY\",\"UUID\",\"TS\"]},\"displayName\":\"Type\",\"weight\":0.2,\"by_default\":\"HEADER_FIELD\"},{\"name\":\"value\",\"type\":[{\"type\":\"string\",\"avro.java.string\":\"String\"},\"null\"],\"displayName\":\"Value\",\"weight\":0.2,\"by_default\":\"applicationToken\"},{\"name\":\"columnName\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"displayName\":\"Name\",\"weight\":0.2,\"by_default\":\"application_token\"},{\"name\":\"columnType\",\"type\":{\"type\":\"enum\",\"name\":\"ColumnType\",\"symbols\":[\"BIGINT\",\"BLOB\",\"BOOLEAN\",\"DOUBLE\",\"FLOAT\",\"INT\",\"TEXT\",\"UUID\"]},\"displayName\":\"Column Type\",\"weight\":0.2,\"by_default\":\"BOOLEAN\"},{\"name\":\"partitionKey\",\"type\":\"boolean\",\"displayName\":\"Is part of partition key?\",\"weight\":0.1,\"by_default\":false},{\"name\":\"clusteringKey\",\"type\":\"boolean\",\"displayName\":\"Is part of clustering key?\",\"weight\":0.1,\"by_default\":false}]}},\"displayName\":\"Column Mapping\",\"minRowCount\":1},{\"name\":\"clusteringMapping\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"ClusteringElement\",\"fields\":[{\"name\":\"columnName\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"displayName\":\"Name\",\"weight\":0.2,\"by_default\":\"application_token\"},{\"name\":\"order\",\"type\":{\"type\":\"enum\",\"name\":\"OrderType\",\"symbols\":[\"DESC\",\"ASC\"]},\"displayName\":\"Order\",\"weight\":0.2,\"by_default\":\"DESC\"}]}},\"displayName\":\"Clustering\",\"minRowCount\":0},{\"name\":\"cassandraBatchType\",\"type\":[{\"type\":\"enum\",\"name\":\"CassandraBatchType\",\"symbols\":[\"LOGGED\",\"UNLOGGED\"]},\"null\"],\"namespace\":\"org.kaaproject.kaa.server.appenders.cassandra.config.gen\",\"by_default\":\"UNLOGGED\",\"optional\":true,\"displayName\":\"Cassandra batch type\"},{\"name\":\"cassandraSocketOption\",\"type\":[{\"type\":\"record\",\"name\":\"CassandraSocketOption\",\"fields\":[{\"name\":\"sendBufferSize\",\"type\":[\"int\",\"null\"],\"displayName\":\"Set send buffer size\",\"by_default\":8192,\"optional\":true},{\"name\":\"receiveBufferSize\",\"type\":[\"int\",\"null\"],\"displayName\":\"Set receive buffer size\",\"by_default\":8192,\"optional\":true},{\"name\":\"soLinger\",\"type\":[\"int\",\"null\"],\"displayName\":\"Delay before a reset is sent\",\"by_default\":0,\"optional\":true},{\"name\":\"connectionTimeout\",\"type\":[\"int\",\"null\"],\"displayName\":\"Connection timeout (ms)\",\"by_default\":5000,\"optional\":true},{\"name\":\"readTimeout\",\"type\":[\"int\",\"null\"],\"displayName\":\"Read timeout (ms)\",\"by_default\":12000,\"optional\":true},{\"name\":\"reuseAddress\",\"type\":[\"boolean\",\"null\"],\"displayName\":\"Reuse address\",\"by_default\":false,\"optional\":true},{\"name\":\"keepAlive\",\"type\":[\"boolean\",\"null\"],\"displayName\":\"Use keep alive\",\"by_default\":false,\"optional\":true},{\"name\":\"tcpNoDelay\",\"type\":[\"boolean\",\"null\"],\"displayName\":\"Tcp no delay\",\"by_default\":false,\"optional\":true}]},\"null\"],\"namespace\":\"org.kaaproject.kaa.server.appenders.cassandra.config.gen\",\"displayName\":\"Cassandra socket option\",\"optional\":true},{\"name\":\"executorThreadPoolSize\",\"type\":\"int\",\"displayName\":\"Executor thread pool size\",\"by_default\":1},{\"name\":\"callbackThreadPoolSize\",\"type\":\"int\",\"displayName\":\"Callback thread pool size\",\"by_default\":2},{\"name\":\"dataTTL\",\"type\":\"int\",\"displayName\":\"TTL\",\"by_default\":0},{\"name\":\"cassandraWriteConsistencyLevel\",\"type\":[{\"type\":\"enum\",\"name\":\"CassandraWriteConsistencyLevel\",\"symbols\":[\"ANY\",\"ONE\",\"TWO\",\"THREE\",\"QUORUM\",\"ALL\",\"LOCAL_QUORUM\",\"EACH_QUORUM\",\"SERIAL\",\"LOCAL_SERIAL\",\"LOCAL_ONE\"],\"optional\":true},\"null\"],\"namespace\":\"org.kaaproject.kaa.server.appenders.cassandra.config.gen\",\"displayName\":\"Write consistency level\",\"by_default\":\"ONE\"},{\"name\":\"cassandraCompression\",\"type\":[{\"type\":\"enum\",\"name\":\"CassandraCompression\",\"symbols\":[\"NONE\",\"SNAPPY\",\"LZ4\"]},\"null\"],\"namespace\":\"org.kaaproject.kaa.server.appenders.cassandra.config.gen\",\"by_default\":\"NONE\",\"optional\":true,\"displayName\":\"Compression type\"},{\"name\":\"cassandraExecuteRequestType\",\"type\":[{\"type\":\"enum\",\"name\":\"CassandraExecuteRequestType\",\"symbols\":[\"SYNC\",\"ASYNC\"]},\"null\"],\"namespace\":\"org.kaaproject.kaa.server.appenders.cassandra.config.gen\",\"by_default\":\"SYNC\",\"optional\":true,\"displayName\":\"Cassandra execute request type\"}]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"CassandraConfig\",\"namespace\":\"org.kaaproject.kaa.server.appenders.cassandra.config.gen\",\"fields\":[{\"name\":\"cassandraServers\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"CassandraServer\",\"fields\":[{\"name\":\"host\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"displayName\":\"Host\",\"weight\":0.75,\"by_default\":\"localhost\"},{\"name\":\"port\",\"type\":\"int\",\"displayName\":\"Port\",\"weight\":0.25,\"by_default\":9042}]}},\"displayName\":\"Cassandra nodes\",\"minRowCount\":1},{\"name\":\"cassandraCredential\",\"type\":[{\"type\":\"record\",\"name\":\"CassandraCredential\",\"fields\":[{\"name\":\"user\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"displayName\":\"User\",\"weight\":0.5,\"by_default\":\"user\"},{\"name\":\"password\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"displayName\":\"Password\",\"weight\":0.5,\"by_default\":\"password\"}],\"optional\":true},\"null\"],\"displayName\":\"Authentication credentials\",\"namespace\":\"org.kaaproject.kaa.server.appenders.cassandra.config.gen\"},{\"name\":\"keySpace\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"displayName\":\"Keyspace name\"},{\"name\":\"tableNamePattern\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"displayName\":\"Table name pattern\",\"by_default\":\"logs_$app_token_$config_hash\"},{\"name\":\"columnMapping\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"ColumnMappingElement\",\"fields\":[{\"name\":\"type\",\"type\":{\"type\":\"enum\",\"name\":\"ColumnMappingElementType\",\"symbols\":[\"HEADER_FIELD\",\"EVENT_FIELD\",\"CLIENT_FIELD\",\"SERVER_FIELD\",\"HEADER_JSON\",\"EVENT_JSON\",\"CLIENT_JSON\",\"SERVER_JSON\",\"HEADER_BINARY\",\"EVENT_BINARY\",\"CLIENT_BINARY\",\"SERVER_BINARY\",\"UUID\",\"TS\"]},\"displayName\":\"Type\",\"weight\":0.2,\"by_default\":\"HEADER_FIELD\"},{\"name\":\"value\",\"type\":[{\"type\":\"string\",\"avro.java.string\":\"String\"},\"null\"],\"displayName\":\"Value\",\"weight\":0.2,\"by_default\":\"applicationToken\"},{\"name\":\"columnName\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"displayName\":\"Name\",\"weight\":0.2,\"by_default\":\"application_token\"},{\"name\":\"columnType\",\"type\":{\"type\":\"enum\",\"name\":\"ColumnType\",\"symbols\":[\"BIGINT\",\"BLOB\",\"BOOLEAN\",\"DOUBLE\",\"FLOAT\",\"INT\",\"TEXT\",\"UUID\"]},\"displayName\":\"Column Type\",\"weight\":0.2,\"by_default\":\"BOOLEAN\"},{\"name\":\"partitionKey\",\"type\":\"boolean\",\"displayName\":\"Is part of partition key?\",\"weight\":0.1,\"by_default\":false},{\"name\":\"clusteringKey\",\"type\":\"boolean\",\"displayName\":\"Is part of clustering key?\",\"weight\":0.1,\"by_default\":false}]}},\"displayName\":\"Column Mapping\",\"minRowCount\":1},{\"name\":\"clusteringMapping\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"ClusteringElement\",\"fields\":[{\"name\":\"columnName\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"displayName\":\"Name\",\"weight\":0.2,\"by_default\":\"application_token\"},{\"name\":\"order\",\"type\":{\"type\":\"enum\",\"name\":\"OrderType\",\"symbols\":[\"DESC\",\"ASC\"]},\"displayName\":\"Order\",\"weight\":0.2,\"by_default\":\"DESC\"}]}},\"displayName\":\"Clustering\",\"minRowCount\":0},{\"name\":\"cassandraBatchType\",\"type\":[{\"type\":\"enum\",\"name\":\"CassandraBatchType\",\"symbols\":[\"LOGGED\",\"UNLOGGED\"]},\"null\"],\"namespace\":\"org.kaaproject.kaa.server.appenders.cassandra.config.gen\",\"by_default\":\"UNLOGGED\",\"optional\":true,\"displayName\":\"Cassandra batch type\"},{\"name\":\"cassandraSocketOption\",\"type\":[{\"type\":\"record\",\"name\":\"CassandraSocketOption\",\"fields\":[{\"name\":\"sendBufferSize\",\"type\":[\"int\",\"null\"],\"displayName\":\"Set send buffer size\",\"by_default\":8192,\"optional\":true},{\"name\":\"receiveBufferSize\",\"type\":[\"int\",\"null\"],\"displayName\":\"Set receive buffer size\",\"by_default\":8192,\"optional\":true},{\"name\":\"soLinger\",\"type\":[\"int\",\"null\"],\"displayName\":\"Delay before a reset is sent\",\"by_default\":0,\"optional\":true},{\"name\":\"connectionTimeout\",\"type\":[\"int\",\"null\"],\"displayName\":\"Connection timeout (ms)\",\"by_default\":5000,\"optional\":true},{\"name\":\"readTimeout\",\"type\":[\"int\",\"null\"],\"displayName\":\"Read timeout (ms)\",\"by_default\":12000,\"optional\":true},{\"name\":\"reuseAddress\",\"type\":[\"boolean\",\"null\"],\"displayName\":\"Reuse address\",\"by_default\":false,\"optional\":true},{\"name\":\"keepAlive\",\"type\":[\"boolean\",\"null\"],\"displayName\":\"Use keep alive\",\"by_default\":false,\"optional\":true},{\"name\":\"tcpNoDelay\",\"type\":[\"boolean\",\"null\"],\"displayName\":\"Tcp no delay\",\"by_default\":false,\"optional\":true}]},\"null\"],\"namespace\":\"org.kaaproject.kaa.server.appenders.cassandra.config.gen\",\"displayName\":\"Cassandra socket option\",\"optional\":true},{\"name\":\"executorThreadPoolSize\",\"type\":\"int\",\"displayName\":\"Executor thread pool size\",\"by_default\":1},{\"name\":\"callbackThreadPoolSize\",\"type\":\"int\",\"displayName\":\"Callback thread pool size\",\"by_default\":2},{\"name\":\"dataTTL\",\"type\":\"int\",\"displayName\":\"TTL\",\"by_default\":0},{\"name\":\"cassandraWriteConsistencyLevel\",\"type\":[{\"type\":\"enum\",\"name\":\"CassandraWriteConsistencyLevel\",\"symbols\":[\"ANY\",\"ONE\",\"TWO\",\"THREE\",\"QUORUM\",\"ALL\",\"LOCAL_QUORUM\",\"EACH_QUORUM\",\"SERIAL\",\"LOCAL_SERIAL\",\"LOCAL_ONE\"],\"optional\":true},\"null\"],\"namespace\":\"org.kaaproject.kaa.server.appenders.cassandra.config.gen\",\"displayName\":\"Write consistency level\",\"by_default\":\"ONE\"},{\"name\":\"cassandraCompression\",\"type\":[{\"type\":\"enum\",\"name\":\"CassandraCompression\",\"symbols\":[\"NONE\",\"SNAPPY\",\"LZ4\"]},\"null\"],\"namespace\":\"org.kaaproject.kaa.server.appenders.cassandra.config.gen\",\"by_default\":\"NONE\",\"optional\":true,\"displayName\":\"Compression type\"},{\"name\":\"cassandraExecuteRequestType\",\"type\":[{\"type\":\"enum\",\"name\":\"CassandraExecuteRequestType\",\"symbols\":[\"SYNC\",\"ASYNC\"]},\"null\"],\"namespace\":\"org.kaaproject.kaa.server.appenders.cassandra.config.gen\",\"by_default\":\"SYNC\",\"optional\":true,\"displayName\":\"Cassandra execute request type\"}]}");
   public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; }
    private java.util.List<org.kaaproject.kaa.server.appenders.cassandra.config.gen.CassandraServer> cassandraServers;
    private org.kaaproject.kaa.server.appenders.cassandra.config.gen.CassandraCredential cassandraCredential;

diff --git a/...c/main/java/org/kaaproject/kaa/server/appenders/cassandra/config/gen/CassandraServer.java b/...c/main/java/org/kaaproject/kaa/server/appenders/cassandra/config/gen/CassandraServer.java
@@ -7,7 +7,7 @@
 @SuppressWarnings("all")
 @org.apache.avro.specific.AvroGenerated
 public class CassandraServer extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"CassandraServer\",\"namespace\":\"org.kaaproject.kaa.server.appenders.cassandra.config.gen\",\"fields\":[{\"name\":\"host\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"displayName\":\"Host\",\"weight\":0.75,\"by_default\":\"localhost\"},{\"name\":\"port\",\"type\":\"int\",\"displayName\":\"Port\",\"weight\":0.25,\"by_default\":9142}]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"CassandraServer\",\"namespace\":\"org.kaaproject.kaa.server.appenders.cassandra.config.gen\",\"fields\":[{\"name\":\"host\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"displayName\":\"Host\",\"weight\":0.75,\"by_default\":\"localhost\"},{\"name\":\"port\",\"type\":\"int\",\"displayName\":\"Port\",\"weight\":0.25,\"by_default\":9042}]}");
   public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; }
    private java.lang.String host;
    private int port;

diff --git a/...java/org/kaaproject/kaa/server/appenders/cassandra/appender/CassandraLogAppenderTest.java b/...java/org/kaaproject/kaa/server/appenders/cassandra/appender/CassandraLogAppenderTest.java
@@ -206,7 +206,7 @@ private void initLogAppender(boolean addServerField) throws IOException {
         header.setHeaderVersion(1);
         header.setTimestamp(System.currentTimeMillis());
 
-        CassandraServer server = new CassandraServer("127.0.0.1", 9142);
+        CassandraServer server = new CassandraServer("127.0.0.1", 9042);
         configuration = new CassandraConfig();
         configuration.setCassandraBatchType(CassandraBatchType.UNLOGGED);
         configuration.setKeySpace(KEY_SPACE_NAME);

diff --git a/server/appenders/flume-appender/pom.xml b/server/appenders/flume-appender/pom.xml
@@ -67,7 +67,16 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty</artifactId>
+                </exclusion>
             </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty</artifactId>
+            <version>3.7.0.Final</version>
         </dependency>        
         <dependency>
             <groupId>junit</groupId>

diff --git a/server/common/nosql/cassandra-dao/pom.xml b/server/common/nosql/cassandra-dao/pom.xml
@@ -102,8 +102,16 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-handler</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>

diff --git a/server/common/nosql/cassandra-dao/src/main/resources/common-dao-cassandra-context.xml b/server/common/nosql/cassandra-dao/src/main/resources/common-dao-cassandra-context.xml
@@ -38,6 +38,7 @@
         <property name="endpointUserDao" ref="endpointUserDao"/>
     </bean>
     <bean id="endpointRegistrationDao" class="org.kaaproject.kaa.server.common.nosql.cassandra.dao.EndpointRegistrationCassandraDao"/>
+    <bean id="credentialsDao" class="org.kaaproject.kaa.server.common.nosql.cassandra.dao.CredentialsCassandraDao"/>
     <bean id="endpointUserDao" class="org.kaaproject.kaa.server.common.nosql.cassandra.dao.EndpointUserCassandraDao"/>
     <bean id="endpointUserConfigurationDao" class="org.kaaproject.kaa.server.common.nosql.cassandra.dao.EndpointUserConfigurationCassandraDao"/>
     <bean id="topicListEntryDao" class="org.kaaproject.kaa.server.common.nosql.cassandra.dao.TopicListEntryCassandraDao"/>

diff --git a/server/common/nosql/cassandra-dao/src/main/resources/common-dao-cassandra.properties b/server/common/nosql/cassandra-dao/src/main/resources/common-dao-cassandra.properties
@@ -5,7 +5,7 @@ cluster_name=Kaa Cluster
 keyspace_name=kaa
 
 # Specify node list
-node_list=127.0.0.1:9142
+node_list=127.0.0.1:9042
 
 # Use ssl connection
 use_ssl=false

diff --git a/server/common/nosql/cassandra-dao/src/test/resources/cassandra-client-test.properties b/server/common/nosql/cassandra-dao/src/test/resources/cassandra-client-test.properties
@@ -2,7 +2,7 @@ cluster_name=Kaa Cluster
 
 keyspace_name=kaa
 
-node_list=127.0.0.1:9142
+node_list=127.0.0.1:9042
 
 use_ssl=false
 

diff --git a/server/common/nosql/cassandra-dao/src/test/resources/cassandra-test.yaml b/server/common/nosql/cassandra-dao/src/test/resources/cassandra-test.yaml
@@ -282,7 +282,7 @@ listen_address: 127.0.0.1
 
 start_native_transport: true
 # port for the CQL native transport to listen for clients on
-native_transport_port: 9142
+native_transport_port: 9042
 
 # Whether to start the thrift rpc server.
 start_rpc: true