Skip to content

Commit 990d4e6

Browse files
committed
fix: warnings for Scala2.13.0-RC1
1 parent e7c2ae7 commit 990d4e6

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/main/scala/com/redis/RedisClient.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ class RedisClient(override val host: String, override val port: Int,
113113
database = RedisClient.extractDatabaseNumber(connectionUri),
114114
secret = Option(connectionUri.getUserInfo)
115115
.flatMap(_.split(':') match {
116-
case Array(_, password, _*) Some(password)
117-
case _ None
116+
case Array(_, password, _*) => Some(password)
117+
case _ => None
118118
})
119119
)
120120
override def toString: String = host + ":" + String.valueOf(port) + "/" + database

src/main/scala/com/redis/cluster/RedisCluster.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,10 @@ abstract class RedisCluster(hosts: ClusterNode*) extends RedisCommand {
143143
override def rename(oldkey: Any, newkey: Any)(implicit format: Format): Boolean = processForKey(oldkey)(_.rename(oldkey, newkey))
144144
override def renamenx(oldkey: Any, newkey: Any)(implicit format: Format): Boolean = processForKey(oldkey)(_.renamenx(oldkey, newkey))
145145
override def dbsize: Option[Long] =
146-
Some(onAllConns(_.dbsize).foldLeft(0l)((a, b) => b.map(a+).getOrElse(a)))
146+
Some(onAllConns(_.dbsize).foldLeft(0L)((a, b) => b.map(a+).getOrElse(a)))
147147
override def exists(key: Any)(implicit format: Format): Boolean = processForKey(key)(_.exists(key))
148148
override def del(key: Any, keys: Any*)(implicit format: Format): Option[Long] =
149-
Some((key :: keys.toList).groupBy(nodeForKey).foldLeft(0l) { case (t,(n,ks)) => n.withClient{ client => client.del(ks.head,ks.tail:_*).map(t+).getOrElse(t)} })
149+
Some((key :: keys.toList).groupBy(nodeForKey).foldLeft(0L) { case (t,(n,ks)) => n.withClient{ client => client.del(ks.head,ks.tail:_*).map(t+).getOrElse(t)} })
150150
override def getType(key: Any)(implicit format: Format): Option[String] = processForKey(key)(_.getType(key))
151151
override def expire(key: Any, expiry: Int)(implicit format: Format): Boolean =
152152
processForKey(key)(_.expire(key, expiry))

src/main/scala/com/redis/cluster/RedisShards.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ abstract class RedisShards(val hosts: List[ClusterNode]) extends RedisCommand {
8080
override def rename(oldkey: Any, newkey: Any)(implicit format: Format): Boolean = processForKey(oldkey)(_.rename(oldkey, newkey))
8181
override def renamenx(oldkey: Any, newkey: Any)(implicit format: Format): Boolean = processForKey(oldkey)(_.renamenx(oldkey, newkey))
8282
override def dbsize: Option[Long] =
83-
Some(onAllConns(_.dbsize).foldLeft(0l)((a, b) => b.map(a+).getOrElse(a)))
83+
Some(onAllConns(_.dbsize).foldLeft(0L)((a, b) => b.map(a+).getOrElse(a)))
8484
override def exists(key: Any)(implicit format: Format): Boolean = processForKey(key)(_.exists(key))
8585
override def del(key: Any, keys: Any*)(implicit format: Format): Option[Long] =
86-
Some((key :: keys.toList).groupBy(nodeForKey).foldLeft(0l) { case (t,(n,ks)) => n.withClient{ client => client.del(ks.head,ks.tail:_*).map(t+).getOrElse(t)} })
86+
Some((key :: keys.toList).groupBy(nodeForKey).foldLeft(0L) { case (t,(n,ks)) => n.withClient{ client => client.del(ks.head,ks.tail:_*).map(t+).getOrElse(t)} })
8787
override def getType(key: Any)(implicit format: Format): Option[String] = processForKey(key)(_.getType(key))
8888
override def expire(key: Any, expiry: Int)(implicit format: Format): Boolean =
8989
processForKey(key)(_.expire(key, expiry))

src/main/scala/com/redis/ds/Deque.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ abstract class RedisDeque[A](val blocking: Boolean = false, val timeoutInSecs: I
6060
brpop[String, A](timeoutInSecs, key).map(_._2)
6161
} else rpop[A](key)
6262

63-
def size: Long = llen(key) getOrElse(0l)
63+
def size: Long = llen(key) getOrElse(0L)
6464

6565
def isEmpty: Boolean = size == 0
6666

0 commit comments

Comments
 (0)