diff --git a/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala b/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala index 92627c8420..a81f94b53f 100644 --- a/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala +++ b/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala @@ -261,7 +261,7 @@ private [akka] object RedisStorageBackend extends } override def incrementByAtomically(name: String, by: Int): Option[Int] = withErrorHandling { - db.incrBy(new String(encode(name.getBytes)), by) match { + db.incrby(new String(encode(name.getBytes)), by) match { case Some(i) => Some(i) case None => throw new IllegalArgumentException(name + " exception in incrby") @@ -277,7 +277,7 @@ private [akka] object RedisStorageBackend extends } override def decrementByAtomically(name: String, by: Int): Option[Int] = withErrorHandling { - db.decrBy(new String(encode(name.getBytes)), by) match { + db.decrby(new String(encode(name.getBytes)), by) match { case Some(i) => Some(i) case None => throw new IllegalArgumentException(name + " exception in decrby") @@ -390,7 +390,7 @@ private [akka] object RedisStorageBackend extends } } - def flushDB = withErrorHandling(db.flushDb) + def flushDB = withErrorHandling(db.flushdb) private def withErrorHandling[T](body: => T): T = { try { diff --git a/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentActorSpec.scala b/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentActorSpec.scala index 3c1eaab709..f21b1b72a0 100644 --- a/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentActorSpec.scala +++ b/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentActorSpec.scala @@ -111,7 +111,7 @@ class RedisPersistentActorSpec extends TestCase { bactor !! Debit("a-123", 8000, failer) assertEquals(BigInt(1000), (bactor !! Balance("a-123")).get) - val c: Integer = (bactor !! LogSize).get + val c: Int = (bactor !! LogSize).get assertTrue(7 == c) } @@ -132,7 +132,7 @@ class RedisPersistentActorSpec extends TestCase { assertEquals(BigInt(5000), (bactor !! Balance("a-123")).get) // should not count the failed one - val c: Integer = (bactor !! LogSize).get + val c: Int = (bactor !! LogSize).get assertTrue(3 == c) } @@ -154,7 +154,7 @@ class RedisPersistentActorSpec extends TestCase { assertEquals(BigInt(5000), (bactor !! (Balance("a-123"), 5000)).get) // should not count the failed one - val c: Integer = (bactor !! LogSize).get + val c: Int = (bactor !! LogSize).get assertTrue(3 == c) } } diff --git a/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentQSpec.scala b/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentQSpec.scala index 15636b637b..2e5b5a507e 100644 --- a/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentQSpec.scala +++ b/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentQSpec.scala @@ -58,7 +58,7 @@ class RedisPersistentQSpec extends TestCase { qa !! NQ("a-123") qa !! NQ("a-124") qa !! NQ("a-125") - val t: Integer = (qa !! SZ).get + val t: Int = (qa !! SZ).get assertTrue(3 == t) } @@ -69,12 +69,12 @@ class RedisPersistentQSpec extends TestCase { qa !! NQ("a-123") qa !! NQ("a-124") qa !! NQ("a-125") - val s: Integer = (qa !! SZ).get + val s: Int = (qa !! SZ).get assertTrue(3 == s) assertEquals("a-123", (qa !! DQ).get) assertEquals("a-124", (qa !! DQ).get) assertEquals("a-125", (qa !! DQ).get) - val t: Integer = (qa !! SZ).get + val t: Int = (qa !! SZ).get assertTrue(0 == t) } @@ -88,13 +88,13 @@ class RedisPersistentQSpec extends TestCase { qa !! NQ("a-123") qa !! NQ("a-124") qa !! NQ("a-125") - val t: Integer = (qa !! SZ).get + val t: Int = (qa !! SZ).get assertTrue(3 == t) assertEquals("a-123", (qa !! DQ).get) - val s: Integer = (qa !! SZ).get + val s: Int = (qa !! SZ).get assertTrue(2 == s) qa !! MNDQ(List("a-126", "a-127"), 2, failer) - val u: Integer = (qa !! SZ).get + val u: Int = (qa !! SZ).get assertTrue(2 == u) } @@ -110,25 +110,25 @@ class RedisPersistentQSpec extends TestCase { qa !! NQ("a-124") qa !! NQ("a-125") - val t: Integer = (qa !! SZ).get + val t: Int = (qa !! SZ).get assertTrue(3 == t) // dequeue 1 assertEquals("a-123", (qa !! DQ).get) // size == 2 - val s: Integer = (qa !! SZ).get + val s: Int = (qa !! SZ).get assertTrue(2 == s) // enqueue 2, dequeue 2 => size == 2 qa !! MNDQ(List("a-126", "a-127"), 2, failer) - val u: Integer = (qa !! SZ).get + val u: Int = (qa !! SZ).get assertTrue(2 == u) // enqueue 2 => size == 4 qa !! NQ("a-128") qa !! NQ("a-129") - val v: Integer = (qa !! SZ).get + val v: Int = (qa !! SZ).get assertTrue(4 == v) // enqueue 1 => size 5 @@ -138,7 +138,7 @@ class RedisPersistentQSpec extends TestCase { qa !! MNDQ(List("a-130"), 6, failer) } catch { case e: Exception => {} } - val w: Integer = (qa !! SZ).get + val w: Int = (qa !! SZ).get assertTrue(4 == w) } } diff --git a/embedded-repo/com/redis/redisclient/2.8.0.Beta1-1.2-SNAPSHOT/redisclient-2.8.0.Beta1-1.2-SNAPSHOT.jar b/embedded-repo/com/redis/redisclient/2.8.0.Beta1-1.2-SNAPSHOT/redisclient-2.8.0.Beta1-1.2-SNAPSHOT.jar deleted file mode 100644 index 8f84253cf3..0000000000 Binary files a/embedded-repo/com/redis/redisclient/2.8.0.Beta1-1.2-SNAPSHOT/redisclient-2.8.0.Beta1-1.2-SNAPSHOT.jar and /dev/null differ diff --git a/embedded-repo/com/redis/redisclient/2.8.0.Beta1-1.2/redisclient-2.8.0.Beta1-1.2.jar b/embedded-repo/com/redis/redisclient/2.8.0.Beta1-1.2/redisclient-2.8.0.Beta1-1.2.jar new file mode 100644 index 0000000000..3f1593380b Binary files /dev/null and b/embedded-repo/com/redis/redisclient/2.8.0.Beta1-1.2/redisclient-2.8.0.Beta1-1.2.jar differ diff --git a/embedded-repo/com/redis/redisclient/2.8.0.Beta1-1.2-SNAPSHOT/redisclient-2.8.0.Beta1-1.2-SNAPSHOT.pom b/embedded-repo/com/redis/redisclient/2.8.0.Beta1-1.2/redisclient-2.8.0.Beta1-1.2.pom similarity index 89% rename from embedded-repo/com/redis/redisclient/2.8.0.Beta1-1.2-SNAPSHOT/redisclient-2.8.0.Beta1-1.2-SNAPSHOT.pom rename to embedded-repo/com/redis/redisclient/2.8.0.Beta1-1.2/redisclient-2.8.0.Beta1-1.2.pom index 21f8040bdf..68f3763187 100755 --- a/embedded-repo/com/redis/redisclient/2.8.0.Beta1-1.2-SNAPSHOT/redisclient-2.8.0.Beta1-1.2-SNAPSHOT.pom +++ b/embedded-repo/com/redis/redisclient/2.8.0.Beta1-1.2/redisclient-2.8.0.Beta1-1.2.pom @@ -3,6 +3,6 @@ 4.0.0 com.redis redisclient - 2.8.0.Beta1-1.2-SNAPSHOT + 2.8.0.Beta1-1.2 jar diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala index 0c9d2aae58..65eda96cdc 100644 --- a/project/build/AkkaProject.scala +++ b/project/build/AkkaProject.scala @@ -328,7 +328,7 @@ class AkkaParent(info: ProjectInfo) extends AkkaDefaults(info) { } class AkkaRedisProject(info: ProjectInfo) extends AkkaDefaults(info) { - val redis = "com.redis" % "redisclient" % "2.8.0.Beta1-1.2-SNAPSHOT" % "compile" + val redis = "com.redis" % "redisclient" % "2.8.0.Beta1-1.2" % "compile" override def testOptions = TestFilter((name: String) => name.endsWith("Test")) :: Nil lazy val dist = deployTask(info, distPath) dependsOn(`package`, packageDocs, packageSrc) describedAs("Deploying") }