diff --git a/pom.xml b/pom.xml
index 5d819a9..98b6491 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
1.2-SNAPSHOT
- 5.3.1
+ 5.3.2
0.6.1
917130
3.1.3
@@ -19,7 +19,7 @@
0.20.1
1.0
1.0
- 2.7.7
+ 2.8.0
2.1.0
1.4.0
0.9.94
@@ -237,13 +237,13 @@
com.shorrockin
cascal
- 1.2-SNAPSHOT
+ 1.3-SNAPSHOT
org.clapper
- grizzled-slf4j_2.7.7
- 0.2.2
+ grizzled-slf4j_2.8.0
+ 0.2.4
diff --git a/src/main/scala/org/apache/activemq/store/cassandra/CassandraClient.scala b/src/main/scala/org/apache/activemq/store/cassandra/CassandraClient.scala
index b7f1356..8735b3b 100755
--- a/src/main/scala/org/apache/activemq/store/cassandra/CassandraClient.scala
+++ b/src/main/scala/org/apache/activemq/store/cassandra/CassandraClient.scala
@@ -2,7 +2,7 @@ package org.apache.activemq.store.cassandra
import com.shorrockin.cascal.session._
import com.shorrockin.cascal.utils.Conversions._
-import collection.jcl.Conversions._
+import collection.JavaConversions._
import reflect.BeanProperty
import CassandraClient._
import org.apache.cassandra.utils.BloomFilter
@@ -10,10 +10,10 @@ import grizzled.slf4j.Logger
import org.apache.activemq.store.cassandra.{DestinationMaxIds => Max}
import java.util.concurrent.atomic.{AtomicLong, AtomicInteger}
import org.apache.activemq.command.{SubscriptionInfo, MessageId, ActiveMQDestination}
-import collection.jcl.{ArrayList, HashSet, Set}
import org.apache.cassandra.thrift.{NotFoundException}
import java.lang.String
import collection.mutable.{HashMap, ListBuffer}
+import java.util.{HashSet, ArrayList}
class CassandraClient() {
@BeanProperty var cassandraHost: String = _
@@ -313,10 +313,10 @@ class CassandraClient() {
val supercolumn = KEYSPACE \\ SUBSCRIPTIONS_FAMILY \ destination \ supercolumnName
val subdest = supercolumn \ (SUBSCRIPTIONS_SUB_DESTINATION_SUBCOLUMN, subscriptionInfo.getSubscribedDestination)
val ackcol = supercolumn \ (SUBSCRIPTIONS_LAST_ACK_SUBCOLUMN, ack)
- var list = Insert(subdest) :: Insert(ackcol)
+ var list:List[Operation] = Insert(subdest) :: Insert(ackcol)
if (subscriptionInfo.getSelector != null) {
val selcolopt = supercolumn \ (SUBSCRIPTIONS_SELECTOR_SUBCOLUMN, subscriptionInfo.getSelector)
- list.add(Insert(selcolopt))
+ list = Insert(selcolopt) :: list
}
session.batch(list)
}
@@ -435,7 +435,7 @@ class CassandraClient() {
withSession {
session =>
- val keyspace = convertMap(session.client.describe_keyspace(KEYSPACE))
+ val keyspace = asMap(session.client.describe_keyspace(KEYSPACE))
val stdCols: List[String] = MESSAGES_FAMILY :: STORE_IDS_IN_USE_FAMILY :: DESTINATIONS_FAMILY :: BROKER_FAMILY :: MESSAGE_TO_STORE_ID_FAMILY :: Nil
val superCols: List[String] = SUBSCRIPTIONS_FAMILY :: Nil
@@ -453,7 +453,7 @@ class CassandraClient() {
stdCols.foreach {
family =>
(keyspace.get(family): @unchecked) match {
- case Some(map) => convertMap(map).get(DESCRIBE_CF_TYPE) match {
+ case Some(map) => asMap(map).get(DESCRIBE_CF_TYPE) match {
case Some(colType) => colType match {
case DESCRIBE_CF_TYPE_STANDARD => None
case _ => throw new RuntimeException("Type of the ColumnFamily was not expected to be:%s".format(colType))
@@ -466,7 +466,7 @@ class CassandraClient() {
superCols.foreach {
family =>
(keyspace.get(family): @unchecked) match {
- case Some(map) => convertMap(map).get(DESCRIBE_CF_TYPE) match {
+ case Some(map) => asMap(map).get(DESCRIBE_CF_TYPE) match {
case Some(colType) => colType match {
case DESCRIBE_CF_TYPE_SUPER => None
case _ => throw new RuntimeException("Type of the ColumnFamily was not expected to be:%s".format(colType))