update to play 2.6.7

app/controllers/Application.scala

@@ -2,11 +2,11 @@ package controllers
 
 import com.google.inject.Inject
 import controllers.auth.AuthenticationModule
-import play.api.mvc.Controller
+import play.api.mvc.InjectedController
 
-class Application @Inject()(val authentication: AuthenticationModule) extends Controller with AuthSupport {
+class Application @Inject()(val authentication: AuthenticationModule) extends InjectedController with AuthSupport {
 
-  def index = AuthAction(authentication, true) { request =>
+  def index = AuthAction(authentication, true)(defaultExecutionContext) { request =>
     Ok(views.html.Index())
   }
   

app/controllers/AuthController.scala

@@ -6,14 +6,14 @@ import akka.actor.ActorSystem
 import controllers.auth.{AuthAction, AuthenticationModule}
 import forms.LoginForm
 import play.api.Configuration
-import play.api.mvc.{Action, Controller}
+import play.api.mvc.InjectedController
 
 
 @Singleton
 class AuthController @Inject()(system: ActorSystem,
                                authentication: AuthenticationModule,
                                configuration: Configuration)
-  extends Controller {
+  extends InjectedController {
 
   import AuthController._
 

app/controllers/AuthSupport.scala

 package controllers
 
 import controllers.auth.{AuthAction, AuthenticationModule}
-import play.api.mvc.Controller
+import play.api.mvc.InjectedController
 
-trait AuthSupport { self: Controller =>
+import scala.concurrent.ExecutionContext
 
-  def AuthAction(authentication: AuthenticationModule, redirect: Boolean = false): AuthAction =
-    new AuthAction(authentication, redirect)
+trait AuthSupport { self: InjectedController =>
+
+  def AuthAction(authentication: AuthenticationModule, redirect: Boolean = false)(implicit ec: ExecutionContext): AuthAction =
+    new AuthAction(authentication, redirect, parse.anyContent)
 
 }
\ No newline at end of file

app/controllers/BaseController.scala

@@ -5,14 +5,14 @@ import exceptions.MissingRequiredParamException
 import models.{CerebroRequest, CerebroResponse, Hosts}
 import play.api.Logger
 import play.api.libs.json.{JsValue, Json}
-import play.api.mvc.{Controller, Result}
+import play.api.mvc.{Controller, InjectedController, Result}
 import services.exception.RequestFailedException
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
 import scala.util.control.NonFatal
 
-trait BaseController extends Controller with AuthSupport {
+trait BaseController extends InjectedController with AuthSupport {
 
   val authentication: AuthenticationModule
 

app/controllers/ConnectController.scala

@@ -6,19 +6,19 @@ import controllers.auth.AuthenticationModule
 import elastic.ElasticClient
 import models.{CerebroRequest, CerebroResponse, Hosts}
 import play.api.libs.json.{JsArray, JsString}
-import play.api.mvc.Controller
+import play.api.mvc.InjectedController
 
 import scala.concurrent.ExecutionContext.Implicits.global
 
 class ConnectController @Inject()(val authentication: AuthenticationModule,
                                   elastic: ElasticClient,
-                                  hosts: Hosts) extends Controller with AuthSupport {
+                                  hosts: Hosts) extends InjectedController with AuthSupport {
 
-  def index = AuthAction(authentication) { _ =>
+  def index = AuthAction(authentication)(defaultExecutionContext) { _ =>
     CerebroResponse(200, JsArray(hosts.getHostNames().map(JsString(_))))
   }
 
-  def connect = AuthAction(authentication).async(parse.json) { request =>
+  def connect = AuthAction(authentication)(defaultExecutionContext).async(parse.json) { request =>
     val req = CerebroRequest(request, hosts)
     elastic.executeRequest("GET", "_cluster/health", None, req.target).map {
       response => CerebroResponse(response.status, response.body)

app/controllers/auth/AuthAction.scala

@@ -5,11 +5,12 @@ import models.{CerebroResponse, User}
 import play.api.libs.json.JsNull
 import play.api.mvc._
 
-import scala.concurrent.Future
+import scala.concurrent.{ExecutionContext, Future}
 
 class AuthRequest[A](val user: Option[User], request: Request[A]) extends WrappedRequest[A](request)
 
-final class AuthAction(auth: AuthenticationModule, redirect: Boolean) extends ActionBuilder[AuthRequest] {
+final class AuthAction(auth: AuthenticationModule, redirect: Boolean, override val parser: BodyParser[AnyContent])(implicit ec: ExecutionContext)
+  extends ActionBuilder[AuthRequest, AnyContent] {
 
   def invokeBlock[A](request: Request[A], block: (AuthRequest[A]) => Future[Result]) = {
     if (auth.isEnabled) {
@@ -29,6 +30,7 @@ final class AuthAction(auth: AuthenticationModule, redirect: Boolean) extends Ac
     }
   }
 
+  override protected def executionContext: ExecutionContext = ec
 }
 
 object AuthAction {

build.sbt

@@ -7,10 +7,10 @@ version := "0.7.2"
 scalaVersion := "2.11.11"
 
 libraryDependencies ++= Seq(
-  "com.typesafe.play" %% "play"                    % "2.5.10",
-  "com.typesafe.play" %% "play-ws"                 % "2.5.10",
-  "com.typesafe.play" %% "play-slick"              % "2.0.2",
-  "com.typesafe.play" %% "play-slick-evolutions"   % "2.0.2",
+  "com.typesafe.play" %% "play"                    % "2.6.7",
+  "com.typesafe.play" %% "play-json"               % "2.6.7",
+  "com.typesafe.play" %% "play-slick"              % "3.0.1",
+  "com.typesafe.play" %% "play-slick-evolutions"   % "3.0.1",
   "org.xerial"        %  "sqlite-jdbc"             % "3.20.0",
   "org.specs2"        %% "specs2-junit"  % "3.8.4" % "test",
   "org.specs2"        %% "specs2-core"   % "3.8.4" % "test",
@@ -18,6 +18,8 @@ libraryDependencies ++= Seq(
 )
 
 libraryDependencies += filters
+libraryDependencies += ws
+libraryDependencies += guice
 
 lazy val root = (project in file(".")).
   enablePlugins(PlayScala, BuildInfoPlugin, LauncherJarPlugin).

project/plugins.sbt

@@ -5,7 +5,7 @@ logLevel := Level.Warn
 resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/"
 
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.10")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.7")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-rjs" % "1.0.9")