Karaf 4 migration

Change-Id: I10ac4146bcbea2df91a8092fad37f3448d574890
Signed-off-by: YuLing Chen <yulingchen54@gmail.com>

diff --git a/features/features-tsdr/pom.xml b/features/features-tsdr/pom.xml
index 76f72fed9568c6410ea06bd3cd8b54c9a9881c22..168dc9206533da701b29aebb8397138d0dbdf476 100644 (file)
--- a/features/features-tsdr/pom.xml
+++ b/features/features-tsdr/pom.xml
@@ -18,8 +18,10 @@
   <properties>
     <com.codahale.metrics.version>3.0.2</com.codahale.metrics.version>
     <io.netty.version>3.9.0.Final</io.netty.version>
+<!--
     <guava.old.version>16.0.1</guava.old.version>
-    <com.datastax.cassandra.version>2.1.2</com.datastax.cassandra.version>
+-->
+    <com.datastax.cassandra.version>2.2.0-rc3</com.datastax.cassandra.version>
     <hbase.version>0.94.15</hbase.version>
     <protobuf.version>2.4.1</protobuf.version>
     <karaf.shell.command.version>3.0.1</karaf.shell.command.version>

diff --git a/features/features4-tsdr/pom.xml b/features/features4-tsdr/pom.xml
index 7a1c4a6a215ab4a3c4a4d627d0a345d19e19c2f3..de501e3128c33a3c103b9c4071b3587e9fc50806 100644 (file)
--- a/features/features4-tsdr/pom.xml
+++ b/features/features4-tsdr/pom.xml
@@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-hbaseclient/pom.xml b/features/odl-hbaseclient/pom.xml
index 101369af41bbc4587b4522d0de1999a08adc9a88..b13891d82ac8afeaf3bbba30e0afb4c05773ca76 100644 (file)
--- a/features/odl-hbaseclient/pom.xml
+++ b/features/odl-hbaseclient/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-cassandra/pom.xml b/features/odl-tsdr-cassandra/pom.xml
index 1afbb5831eb5b3b7115765f3e782457d4a5c1d20..4cbe7ac38491c536ef229afd1a75a4fa615e1feb 100644 (file)
--- a/features/odl-tsdr-cassandra/pom.xml
+++ b/features/odl-tsdr-cassandra/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
@@ -18,6 +18,11 @@
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
     <name>ODL :: tsdr :: Cassandra</name>
+    <properties>
+        <com.datastax.cassandra.version>3.2.0</com.datastax.cassandra.version>
+        <guava.old.version>19.0</guava.old.version>
+    </properties>
+
 
     <dependencyManagement>
         <dependencies>
@@ -51,5 +56,17 @@
             <type>xml</type>
             <classifier>config</classifier>
         </dependency>
+        <dependency>
+            <groupId>com.datastax.cassandra</groupId>
+            <artifactId>cassandra-driver-core</artifactId>
+            <version>${com.datastax.cassandra.version}</version>
+     </dependency>
+     <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${guava.old.version}</version>
+     </dependency>
+
+
     </dependencies>
 </project>

diff --git a/features/odl-tsdr-controller-metrics-collector/.checkstyle b/features/odl-tsdr-controller-metrics-collector/.checkstyle
new file mode 100644 (file)
index 0000000..7ecd2b0
--- /dev/null
+++ b/features/odl-tsdr-controller-metrics-collector/.checkstyle
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+  <local-check-config name="maven-checkstyle-plugin check-license" location="jar:file:/home/yulingchen/.m2/repository/org/opendaylight/odlparent/checkstyle/2.0.2/checkstyle-2.0.2.jar!/check-license.xml" type="remote" description="maven-checkstyle-plugin configuration check-license">
+    <property name="checkstyle.cache.file" value="${project_loc}/target/checkstyle-cachefile"/>
+    <property name="checkstyle.suppressions.file" value="/home/yulingchen/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/odl-tsdr-controller-metrics-collector/com.basistech.m2e.code.quality.checkstyleConfigurator/checkstyle-suppressions-check-license.xml"/>
+    <property name="checkstyle.header.file" value="/home/yulingchen/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/odl-tsdr-controller-metrics-collector/com.basistech.m2e.code.quality.checkstyleConfigurator/checkstyle-header-check-license.txt"/>
+  </local-check-config>
+  <local-check-config name="maven-checkstyle-plugin default" location="jar:file:/home/yulingchen/.m2/repository/org/opendaylight/odlparent/checkstyle/2.0.2/checkstyle-2.0.2.jar!/odl_checks.xml" type="remote" description="maven-checkstyle-plugin configuration default">
+    <property name="checkstyle.cache.file" value="${project_loc}/target/checkstyle-cachefile"/>
+    <property name="checkstyle.suppressions.file" value="/home/yulingchen/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/odl-tsdr-controller-metrics-collector/com.basistech.m2e.code.quality.checkstyleConfigurator/checkstyle-suppressions-default.xml"/>
+    <property name="checkstyle.header.file" value="/home/yulingchen/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/odl-tsdr-controller-metrics-collector/com.basistech.m2e.code.quality.checkstyleConfigurator/checkstyle-header-default.txt"/>
+  </local-check-config>
+  <fileset name="java-sources-check-license" enabled="true" check-config-name="maven-checkstyle-plugin check-license" local="true">
+    <file-match-pattern match-pattern="^src/main/java.*\.java" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/main/java.*\.xtend" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/test/java.*\.java" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/test/java.*\.xtend" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/main/java.*org/opendaylight/yang/gen/.*" include-pattern="false"/>
+    <file-match-pattern match-pattern="^src/main/java.*.*protobuff/messages/.*" include-pattern="false"/>
+    <file-match-pattern match-pattern="^src/main/java.*.*thrift/gen/.*\.java" include-pattern="false"/>
+    <file-match-pattern match-pattern="^src/test/java.*org/opendaylight/yang/gen/.*" include-pattern="false"/>
+    <file-match-pattern match-pattern="^src/test/java.*.*protobuff/messages/.*" include-pattern="false"/>
+    <file-match-pattern match-pattern="^src/test/java.*.*thrift/gen/.*\.java" include-pattern="false"/>
+  </fileset>
+  <fileset name="java-sources-default" enabled="true" check-config-name="maven-checkstyle-plugin default" local="true">
+    <file-match-pattern match-pattern="^src/main/java.*\.java" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/main/java.*\.xtend" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/test/java.*\.java" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/test/java.*\.xtend" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/main/java.*org/opendaylight/yang/gen/.*" include-pattern="false"/>
+    <file-match-pattern match-pattern="^src/main/java.*.*protobuff/messages/.*" include-pattern="false"/>
+    <file-match-pattern match-pattern="^src/main/java.*.*thrift/gen/.*\.java" include-pattern="false"/>
+    <file-match-pattern match-pattern="^src/test/java.*org/opendaylight/yang/gen/.*" include-pattern="false"/>
+    <file-match-pattern match-pattern="^src/test/java.*.*protobuff/messages/.*" include-pattern="false"/>
+    <file-match-pattern match-pattern="^src/test/java.*.*thrift/gen/.*\.java" include-pattern="false"/>
+    <file-match-pattern match-pattern="^src/main/resources.*\.properties" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/test/resources.*\.properties" include-pattern="true"/>
+  </fileset>
+</fileset-config>

diff --git a/features/odl-tsdr-controller-metrics-collector/.gitignore b/features/odl-tsdr-controller-metrics-collector/.gitignore
new file mode 100644 (file)
index 0000000..eacf31a
--- /dev/null
+++ b/features/odl-tsdr-controller-metrics-collector/.gitignore
@@ -0,0 +1 @@
+/target-ide/

diff --git a/features/odl-tsdr-controller-metrics-collector/pom.xml b/features/odl-tsdr-controller-metrics-collector/pom.xml
index 7228245b8731fdf5353614375f7579e404047a65..d27683efbde062bb8a7ef70c34b353f6dd7ed287 100644 (file)
--- a/features/odl-tsdr-controller-metrics-collector/pom.xml
+++ b/features/odl-tsdr-controller-metrics-collector/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.2</version>
         <relativePath/>
     </parent>
 
@@ -52,5 +52,13 @@
             <type>xml</type>
             <classifier>config</classifier>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+<!--
+            <version>22.0</version>
+-->
+     </dependency>
+
     </dependencies>
 </project>

diff --git a/features/odl-tsdr-core/pom.xml b/features/odl-tsdr-core/pom.xml
index e42ebad1bc736f987ef2466f137a6e9394075506..927810b64f6fe20e65d7d2a740e24de96f0ded47 100644 (file)
--- a/features/odl-tsdr-core/pom.xml
+++ b/features/odl-tsdr-core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
@@ -28,6 +28,8 @@
         <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
         <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
         <felix.version>4.3.0</felix.version>
+        <bouncycastle.version>1.57</bouncycastle.version>
+
     </properties>
  
 
@@ -152,6 +154,12 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>${bouncycastle.version}</version>
+        </dependency>
+
 
         <!-- TSDR dependencies -->
         <dependency>

diff --git a/features/odl-tsdr-elasticsearch/pom.xml b/features/odl-tsdr-elasticsearch/pom.xml
index 41fd99b67f6e777aa66bb162d53ddb50b153aef3..3ce4248d5a5cc30cd7746ba7c7e398718b398f74 100644 (file)
--- a/features/odl-tsdr-elasticsearch/pom.xml
+++ b/features/odl-tsdr-elasticsearch/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-hbase/pom.xml b/features/odl-tsdr-hbase/pom.xml
index e8cb8229459f2390ffa66f6e36a1a24da7dd3724..395b4095fc11d8bc5330c126a3b01c104fd6b20c 100644 (file)
--- a/features/odl-tsdr-hbase/pom.xml
+++ b/features/odl-tsdr-hbase/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-hsqldb-all/pom.xml b/features/odl-tsdr-hsqldb-all/pom.xml
index 52316621d1d0b1fa6da91ae995f3559435835f7d..b2536719544e4461a65acc4283f8531b28a94d9c 100644 (file)
--- a/features/odl-tsdr-hsqldb-all/pom.xml
+++ b/features/odl-tsdr-hsqldb-all/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-hsqldb/pom.xml b/features/odl-tsdr-hsqldb/pom.xml
index 8480e1ee6b6016d382b2003e036a06096dda4a94..03bcd057ccf7ac832dfb5034486fb4673b56c462 100644 (file)
--- a/features/odl-tsdr-hsqldb/pom.xml
+++ b/features/odl-tsdr-hsqldb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-netflow-statistics-collector/pom.xml b/features/odl-tsdr-netflow-statistics-collector/pom.xml
index 4fcb1808e47532f781c866a0ee22239bd2966c48..b88785b07ab960152356e045323d3b6d5679555e 100644 (file)
--- a/features/odl-tsdr-netflow-statistics-collector/pom.xml
+++ b/features/odl-tsdr-netflow-statistics-collector/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-openflow-statistics-collector/pom.xml b/features/odl-tsdr-openflow-statistics-collector/pom.xml
index 967b7c6f6ac73287afeb978fc9ab739814bd13b9..31dd870dcf59501f8b23861531bf85e516f84d3c 100644 (file)
--- a/features/odl-tsdr-openflow-statistics-collector/pom.xml
+++ b/features/odl-tsdr-openflow-statistics-collector/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-restconf-collector/pom.xml b/features/odl-tsdr-restconf-collector/pom.xml
index 175ece01d1d7f157610ad1b12785ae52f3718937..511cc8dda4c2540b90aa8271ee6d4971798718d0 100644 (file)
--- a/features/odl-tsdr-restconf-collector/pom.xml
+++ b/features/odl-tsdr-restconf-collector/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-syslog-collector/pom.xml b/features/odl-tsdr-syslog-collector/pom.xml
index b1f400898e93ed67ef17d8f3bb21ed1bd076b726..41d36f415ab29bf2a9b8bb775f37a1e578a38b02 100644 (file)
--- a/features/odl-tsdr-syslog-collector/pom.xml
+++ b/features/odl-tsdr-syslog-collector/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index faa9d1de81d08a7886556a0aa95d33c03803dc9c..6671ed9c5992f745d07aeb379f5fe21e7e53f281 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
@@ -30,7 +30,9 @@
       <module>odl-tsdr-hsqldb</module>
       <module>odl-tsdr-hsqldb-all</module>
       <module>odl-tsdr-hbase</module>
+      <!--
       <module>features-tsdr</module>
+      -->
       <module>features4-tsdr</module>
     </modules>
 </project>

diff --git a/persistence-cassandra/pom.xml b/persistence-cassandra/pom.xml
index 2e2f1feec5383ff7b2f716ecaf65ace45e28ce44..ae67351cbbd1600614d13d26f1ad03faa6261e12 100644 (file)
--- a/persistence-cassandra/pom.xml
+++ b/persistence-cassandra/pom.xml
@@ -11,6 +11,9 @@
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
     <name>ODL :: tsdr :: ${project.artifactId}</name>
+    <properties>
+         <com.datastax.cassandra.version>3.2.0</com.datastax.cassandra.version>
+    </properties>
     <build>
         <plugins>
             <plugin>

diff --git a/persistence-cassandra/src/main/java/org/opendaylight/tsdr/persistence/cassandra/CassandraStore.java b/persistence-cassandra/src/main/java/org/opendaylight/tsdr/persistence/cassandra/CassandraStore.java
index a4950bcde5b51e316ea2fb67b9efecca4f5813cd..639e2e225a2f0d2c8a4e0e464d33997f7df2c2fe 100644 (file)
--- a/persistence-cassandra/src/main/java/org/opendaylight/tsdr/persistence/cassandra/CassandraStore.java
+++ b/persistence-cassandra/src/main/java/org/opendaylight/tsdr/persistence/cassandra/CassandraStore.java
@@ -7,16 +7,6 @@
  */
 package org.opendaylight.tsdr.persistence.cassandra;
 
-import com.datastax.driver.core.BatchStatement;
-import com.datastax.driver.core.Cluster;
-import com.datastax.driver.core.RegularStatement;
-import com.datastax.driver.core.ResultSet;
-import com.datastax.driver.core.Row;
-import com.datastax.driver.core.Session;
-import com.datastax.driver.core.SimpleStatement;
-import com.datastax.driver.core.exceptions.InvalidQueryException;
-import com.datastax.driver.core.querybuilder.QueryBuilder;
-
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -27,6 +17,7 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+
 import org.opendaylight.tsdr.spi.util.FormatUtil;
 import org.opendaylight.tsdr.spi.util.TSDRKeyCache;
 import org.opendaylight.tsdr.spi.util.TSDRKeyCache.TSDRCacheEntry;
@@ -41,6 +32,17 @@ import org.opendaylight.yang.gen.v1.opendaylight.tsdr.rev150219.DataCategory;
 import org.opendaylight.yang.gen.v1.opendaylight.tsdr.rev150219.tsdrrecord.RecordKeys;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import com.datastax.driver.core.BatchStatement;
+import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.RegularStatement;
+import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.Row;
+import com.datastax.driver.core.Session;
+import com.datastax.driver.core.SimpleStatement;
+import com.datastax.driver.core.Statement;
+import com.datastax.driver.core.exceptions.InvalidQueryException;
+import com.datastax.driver.core.querybuilder.QueryBuilder;
 /**
  * @author Sharon Aicler(saichler@gmail.com)
  **/
@@ -188,7 +190,6 @@ public class CassandraStore {
         if(cacheEntry==null){
             cacheEntry = cache.addTSDRCacheEntry(tsdrKey);
         }
-
         RegularStatement st = QueryBuilder.insertInto("tsdr","MetricVal").
                 value("KeyA",cacheEntry.getMd5ID().getMd5Long1()).
                 value("KeyB",cacheEntry.getMd5ID().getMd5Long2()).
@@ -211,7 +212,6 @@ public class CassandraStore {
         if(cacheEntry==null){
             cacheEntry = cache.addTSDRCacheEntry(tsdrKey);
         }
-
         RegularStatement st = QueryBuilder.insertInto("tsdr","MetricLog").
                 value("KeyA",cacheEntry.getMd5ID().getMd5Long1()).
                 value("KeyB",cacheEntry.getMd5ID().getMd5Long2()).
@@ -235,7 +235,6 @@ public class CassandraStore {
         if(cacheEntry==null){
             cacheEntry = cache.addTSDRCacheEntry(tsdrKey);
         }
-
         RegularStatement st = QueryBuilder.insertInto("tsdr","MetricBlob").
                 value("KeyA",cacheEntry.getMd5ID().getMd5Long1()).
                 value("KeyB",cacheEntry.getMd5ID().getMd5Long2()).
@@ -407,7 +406,11 @@ public class CassandraStore {
                 final ResultSet rs = session.execute(cql);
                 for(Row row:rs.all()){
                     String deleteCql = dcql1+row.getLong("keyA")+cql2+row.getLong("keyB")+dcql3+row.getLong("time");
-                    batch.add(new SimpleStatement(deleteCql));
+                    try {
+                        batch.add((Statement)(new SimpleStatement(deleteCql)));
+                    }catch(Exception e) {
+                        log.error("Error creating simpleStatement", e);
+                    }
                     if(this.batch.size()>=MAX_BATCH_SIZE){
                         this.executeBatch();
                         this.startBatch();
@@ -437,7 +440,6 @@ public class CassandraStore {
                 final ResultSet rs = session.execute(cql);
                 for(Row row:rs.all()){
                     String deleteCql = dcql1+row.getLong("keyA")+cql2+row.getLong("keyB")+dcql3+row.getLong("time")+dcql4+row.getInt("xIndex");
-                    batch.add(new SimpleStatement(deleteCql));
                     if(this.batch.size()>=MAX_BATCH_SIZE){
                         this.executeBatch();
                         this.startBatch();
@@ -467,7 +469,11 @@ public class CassandraStore {
                 final ResultSet rs = session.execute(cql);
                 for(Row row:rs.all()){
                     String deleteCql = dcql1+row.getLong("keyA")+cql2+row.getLong("keyB")+dcql3+row.getLong("time")+dcql4+row.getInt("xIndex");
-                    batch.add(new SimpleStatement(deleteCql));
+                    try{
+                        batch.add((Statement)(new SimpleStatement(deleteCql)));
+                    }catch(Exception e){
+                        log.error("Error creating simpleStatement", e);
+                    }
                     if(this.batch.size()>=MAX_BATCH_SIZE){
                         this.executeBatch();
                         this.startBatch();

diff --git a/persistence-cassandra/src/test/java/org/opendaylight/tsdr/persistence/cassandra/CassandraStoreTest.java b/persistence-cassandra/src/test/java/org/opendaylight/tsdr/persistence/cassandra/CassandraStoreTest.java
index 5447684656ab2759b3bacaa9852eccda55d3d233..5d93586a7278af4addd5161c7f37547b7969ccb6 100644 (file)
--- a/persistence-cassandra/src/test/java/org/opendaylight/tsdr/persistence/cassandra/CassandraStoreTest.java
+++ b/persistence-cassandra/src/test/java/org/opendaylight/tsdr/persistence/cassandra/CassandraStoreTest.java
@@ -7,11 +7,16 @@
  */
 package org.opendaylight.tsdr.persistence.cassandra;
 
-import com.datastax.driver.core.Cluster;
-import com.datastax.driver.core.ResultSet;
-import com.datastax.driver.core.Row;
-import com.datastax.driver.core.Session;
-import org.junit.*;
+import java.io.File;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.mockito.Mockito;
 import org.opendaylight.tsdr.spi.util.FormatUtil;
 import org.opendaylight.yang.gen.v1.opendaylight.tsdr.log.data.rev160325.storetsdrlogrecord.input.TSDRLogRecord;
@@ -22,10 +27,11 @@ import org.opendaylight.yang.gen.v1.opendaylight.tsdr.rev150219.DataCategory;
 import org.opendaylight.yang.gen.v1.opendaylight.tsdr.rev150219.tsdrrecord.RecordKeys;
 import org.opendaylight.yang.gen.v1.opendaylight.tsdr.rev150219.tsdrrecord.RecordKeysBuilder;
 
-import java.io.File;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
+import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.Row;
+import com.datastax.driver.core.Session;
+import com.datastax.driver.core.querybuilder.QueryBuilder;
 
 /**
  * @author <a href="mailto:saichler@gmail.com">Sharon Aicler</a>
@@ -42,11 +48,13 @@ public class CassandraStoreTest {
     @Before
     public void before(){
         store = new CassandraStore(session,cluster);
+       // Mockito.when(queryBuilder.(Mockito.any(Session.class),Mockito.any(Cluster.class))).thenReturn(queryBuilder);
         Mockito.when(session.execute(Mockito.anyString())).thenReturn(resultSet);
         Mockito.when(resultSet.all()).thenReturn(rows);
         Mockito.when(row.getString("KeyPath")).thenReturn(FormatUtil.getTSDRMetricKey(createMetricRecord()));
         Mockito.when(row.getDouble("value")).thenReturn(11d);
         Mockito.when(row.getString("value")).thenReturn(createLogRecord().getRecordFullText());
+        Mockito.when(session.getCluster()).thenReturn(cluster);
         store.startBatch();
         if(rows.isEmpty()){
             rows.add(row);

diff --git a/pom.xml b/pom.xml
index 56586588b29adafdca1e62ada381af82de9dd41e..a8f9699015b8957d7903bf7da50a345a443548d2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
    <parent>
      <groupId>org.opendaylight.odlparent</groupId>
      <artifactId>odlparent</artifactId>
-     <version>1.9.0</version>
+     <version>2.0.4</version>
      <relativePath/>
    </parent>
 
@@ -14,7 +14,7 @@
   <artifactId>tsdr</artifactId>
   <version>1.4.0-SNAPSHOT</version>
     <properties>
-        <guava.old.version>16.0.1</guava.old.version>
+        <guava.old.version>19.0</guava.old.version>
         <config.version>0.7.0-SNAPSHOT</config.version>
         <felix.version>4.3.0</felix.version>
         <hbase.version>0.94.15</hbase.version>
@@ -45,7 +45,10 @@
         <com.codahale.metrics.version>3.0.2</com.codahale.metrics.version>
         <io.netty.version>3.9.0.Final</io.netty.version>
         <io.netty4.version>4.0.33.Final</io.netty4.version>
+<!--
         <com.datastax.cassandra.version>2.1.2</com.datastax.cassandra.version>
+-->
+        <com.datastax.cassandra.version>2.2.0-rc3</com.datastax.cassandra.version>
         <sigar.version>1.6.4</sigar.version>
         <yang-jmx-generator.version>0.7.0-SNAPSHOT</yang-jmx-generator.version>
         <hsqldb.version>1.8.0.10</hsqldb.version>