Merge pull request #99 from KarelCemus/update

Update to Play 2.6.0, fixed API change

build.sbt

@@ -15,11 +15,11 @@ scalaVersion := "2.12.2"
 
 crossScalaVersions := Seq( "2.11.11", scalaVersion.value )
 
-val playVersion = "2.6.0-RC1" // todo update when 2.6.0
+val playVersion = "2.6.0"
 
 val connectorVersion = "1.8.0"
 
-val specs2Version = "3.8.9"
+val specs2Version = "3.9.1"
 
 parallelExecution in Test := false
 
@@ -33,9 +33,7 @@ libraryDependencies ++= Seq(
   // test module for play framework
   "com.typesafe.play" %% "play-test" % playVersion % "test",
   // logger for tests
-  "org.slf4j" % "slf4j-simple" % "1.7.25" % "test",
-  // todo remove when 2.6.0
-  "com.typesafe.akka" %% "akka-http-core" % "10.0.7" % "test"
+  "org.slf4j" % "slf4j-simple" % "1.7.25" % "test"
 )
 
 resolvers ++= Seq(

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

@@ -17,4 +17,6 @@ import play.api.cache.redis._
 private[ impl ] class AsyncRedis @Inject()( redis: RedisConnector, policy: RecoveryPolicy ) extends RedisCache( redis )( Builders.AsynchronousBuilder, policy ) with CacheAsyncApi with play.api.cache.AsyncCacheApi {
 
   def getOrElseUpdate[ T: ClassTag ]( key: String, expiration: Duration )( orElse: => Future[ T ] ) = getOrFuture[ T ]( key, expiration )( orElse )
+
+  def removeAll( ): Future[ Done ] = invalidate()
 }

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

@@ -44,13 +44,13 @@ private[ impl ] class JavaRedis @Inject()( internal: CacheAsyncApi, environment:
 
   def remove( key: String ): CompletionStage[ Done ] = internal.remove( key ).toJava
 
-  override def get[ T ]( key: String ): CompletionStage[ T ] =
+  def get[ T ]( key: String ): CompletionStage[ T ] =
     getOrElse[ T ]( key, None )
 
-  override def getOrElseUpdate[ T ]( key: String, block: Callable[ CompletionStage[ T ] ] ): CompletionStage[ T ] =
+  def getOrElseUpdate[ T ]( key: String, block: Callable[ CompletionStage[ T ] ] ): CompletionStage[ T ] =
     getOrElse[ T ]( key, Some( block ) )
 
-  override def getOrElseUpdate[ T ]( key: String, block: Callable[ CompletionStage[ T ] ], expiration: Int ): CompletionStage[ T ] =
+  def getOrElseUpdate[ T ]( key: String, block: Callable[ CompletionStage[ T ] ], expiration: Int ): CompletionStage[ T ] =
     getOrElse[ T ]( key, Some( block ), duration = expiration.seconds )
 
   def getOrElse[ T ]( key: String, callable: Option[ Callable[ CompletionStage[ T ] ] ], duration: Duration = Duration.Inf ): CompletionStage[ T ] = {
@@ -75,6 +75,8 @@ private[ impl ] class JavaRedis @Inject()( internal: CacheAsyncApi, environment:
       play.libs.Scala.orNull( _ )
     }.toJava
   }
+
+  def removeAll( ) = internal.invalidate().toJava
 }
 
 private[ impl ] object JavaRedis {