Merge c6e4e8c into adb2b9c

.travis.yml

@@ -26,10 +26,6 @@ env:
 
 jobs:
   include:
-    - name: "Test Scala 2.11"
-      env:
-        - SCALA_VERSION=2.11.12
-        - SCRIPT=test
     - name: "Test Scala 2.12"
       env:
         - SCALA_VERSION=2.12.9

build.sbt

@@ -12,9 +12,9 @@ organization := "com.github.karelcemus"
 
 scalaVersion := "2.13.1"
 
-crossScalaVersions := Seq( "2.11.12", "2.12.10", scalaVersion.value )
+crossScalaVersions := Seq( "2.12.10", scalaVersion.value )
 
-playVersion := "2.7.3"
+playVersion := "2.8.0"
 
 connectorVersion := "1.9.1"
 

src/main/scala/play/api/cache/redis/impl/AsyncJavaRedis.scala

@@ -41,14 +41,14 @@ private[impl] class AsyncJavaRedis(internal: CacheAsyncApi)(implicit environment
     internal.remove(key, classTagKey(key)).asJava
   }
 
-  def get[T](key: String): CompletionStage[T] = getOrElse[T](key, None)
-
-  def getOptional[T](key: String): CompletionStage[Optional[T]] = {
+  def get[T](key: String): CompletionStage[Optional[T]] = {
     async { implicit context =>
       getOrElseOption[T](key, None).map(_.asJava)
     }
   }
 
+  override def getOptional[T](key: String): CompletionStage[Optional[T]] = get(key)
+
   def getOrElse[T](key: String, block: Callable[T]): CompletionStage[T] =
     getOrElseUpdate[T](key, (() => Future.successful(block.call()).asJava).asJava)
 

src/test/resources/reference.conf

@@ -7,6 +7,8 @@ akka {
   log-dead-letters-during-shutdown = off
 
   actor {
+    allow-java-serialization = on
+
     # disables warning
     warn-about-java-serializer-usage = off
   }

src/test/scala/play/api/cache/redis/impl/AsyncJavaRedisSpec.scala

@@ -21,18 +21,18 @@ class AsyncJavaRedisSpec(implicit ee: ExecutionEnv) extends Specification with R
 
     "get and miss" in new MockedJavaRedis {
       async.get[String](anyString)(anyClassTag) returns None
-      cache.get[String](key).asScala must beNull.await
+      cache.get[String](key).asScala must beEqualTo(Optional.empty).await
     }
 
     "get and hit" in new MockedJavaRedis {
       async.get[String](beEq(key))(anyClassTag) returns Some(value)
       async.get[String](beEq(classTagKey))(anyClassTag) returns Some(classTag)
-      cache.get[String](key).asScala must beEqualTo(value).await
+      cache.get[String](key).asScala must beEqualTo(Optional.of(value)).await
     }
 
     "get null" in new MockedJavaRedis {
       async.get[String](beEq(classTagKey))(anyClassTag) returns Some("null")
-      cache.get[String](key).asScala must beNull.await
+      cache.get[String](key).asScala must beEqualTo(Optional.empty).await
       there was one(async).get[String](classTagKey)
     }
 
@@ -134,7 +134,7 @@ class AsyncJavaRedisSpec(implicit ee: ExecutionEnv) extends Specification with R
       // hit on GET
       async.get[Byte](beEq(key))(anyClassTag) returns Some(byte)
       async.get[String](beEq(classTagKey))(anyClassTag) returns Some("java.lang.Byte")
-      cache.get[Byte](key).asScala must beEqualTo(byte).await
+      cache.get[Byte](key).asScala must beEqualTo(Optional.ofNullable(byte)).await
     }
 
     "get and set 'byte[]'" in new MockedJavaRedis {
@@ -148,7 +148,7 @@ class AsyncJavaRedisSpec(implicit ee: ExecutionEnv) extends Specification with R
       // hit on GET
       async.get[Array[Byte]](beEq(key))(anyClassTag) returns Some(bytes)
       async.get[String](beEq(classTagKey))(anyClassTag) returns Some("byte[]")
-      cache.get[Array[Byte]](key).asScala must beEqualTo(bytes).await
+      cache.get[Array[Byte]](key).asScala must beEqualTo(Optional.ofNullable(bytes)).await
     }
 
     "get all" in new MockedJavaRedis {

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "2.5.1-SNAPSHOT"
+version in ThisBuild := "2.6.0-SNAPSHOT"