Upgrade of the Scala sample

Author: mguillermin

samples/elasticsearch-scala/.gitignore

@@ -13,3 +13,4 @@ dist
 /.project
 /RUNNING_PID
 /.settings
+/data

samples/elasticsearch-scala/app/controllers/Application.scala

@@ -44,7 +44,7 @@ object Application extends Controller {
     Ok(views.html.index("Your new application is ready."))
   }
 
-  def async = Action {
+  def async = Action.async {
     IndexTestManager.index(IndexTest("1", "Here is the first name", "First category"))
     IndexTestManager.index(IndexTest("2", "Then comes the second name", "First category"))
     IndexTestManager.index(IndexTest("3", "Here is the third name", "Second category"))
@@ -63,10 +63,8 @@ object Application extends Controller {
       result2 <- IndexTestManager.searchAsync(indexQuery2)
     } yield (result1, result2)
 
-    Async {
-      l.map { case (r1, r2) =>
-        Ok(r1.totalCount + " - " + r2.totalCount)
-      }
+    l.map { case (r1, r2) =>
+      Ok(r1.totalCount + " - " + r2.totalCount)
     }
 
   }

samples/elasticsearch-scala/build.sbt

@@ -0,0 +1,11 @@
+import play.Project._
+
+name         := "elasticsearch-scala"
+
+version      := "1.0-SNAPSHOT"
+
+play.Project.playJavaSettings
+
+lazy val esModule = RootProject(file("../../module"))
+
+lazy val root = project.in(file(".")).dependsOn(esModule).aggregate(esModule)

samples/elasticsearch-scala/project/Build.scala

@@ -1 +1 @@
-sbt.version=0.12.2
+sbt.version=0.13.0

samples/elasticsearch-scala/project/build.properties

@@ -5,4 +5,4 @@ logLevel := Level.Warn
 resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
 
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("play" % "sbt-plugin" % "2.1.3")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.2.1")