Browse Source

upgrade akka-http

sxend 9 years ago
parent
commit
5fb1715287

+ 4 - 4
frameworks/Scala/akka-http/build.sbt

@@ -4,14 +4,14 @@ name := "akka-http-benchmark"
 
 
 version := "0.0.1-SNAPSHOT"
 version := "0.0.1-SNAPSHOT"
 
 
-scalaVersion := "2.11.6"
+scalaVersion := "2.11.7"
 
 
 resolvers += "Akka Snapshot Repository" at "http://repo.akka.io/snapshots/"
 resolvers += "Akka Snapshot Repository" at "http://repo.akka.io/snapshots/"
 
 
 libraryDependencies ++= Seq(
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-http-core-experimental" % "1.0",
-  "com.typesafe.akka" %% "akka-http-experimental" % "1.0",
-  "com.typesafe.akka" %% "akka-http-spray-json-experimental" % "1.0",
+  "com.typesafe.akka" %% "akka-http-core-experimental" % "2.0-M2",
+  "com.typesafe.akka" %% "akka-http-experimental" % "2.0-M2",
+  "com.typesafe.akka" %% "akka-http-spray-json-experimental" % "2.0-M2",
   "mysql" % "mysql-connector-java" % "5.1.35",
   "mysql" % "mysql-connector-java" % "5.1.35",
   "org.apache.commons" % "commons-dbcp2" % "2.1",
   "org.apache.commons" % "commons-dbcp2" % "2.1",
   "org.scalatra.scalate" %% "scalate-core" % "1.7.0",
   "org.scalatra.scalate" %% "scalate-core" % "1.7.0",

+ 3 - 3
frameworks/Scala/akka-http/src/main/scala/com/typesafe/akka/http/benchmark/Bootstrap.scala

@@ -2,7 +2,7 @@ package com.typesafe.akka.http.benchmark
 
 
 import akka.actor.ActorSystem
 import akka.actor.ActorSystem
 import akka.http.scaladsl.Http
 import akka.http.scaladsl.Http
-import akka.http.scaladsl.server.{Route, RoutingLog, RoutingSettings, RoutingSetup}
+import akka.http.scaladsl.server.{Route, RoutingLog, RoutingSettings}
 import akka.stream.ActorMaterializer
 import akka.stream.ActorMaterializer
 import akka.stream.scaladsl.Sink._
 import akka.stream.scaladsl.Sink._
 import com.typesafe.config.Config
 import com.typesafe.config.Config
@@ -26,11 +26,11 @@ class BenchmarkBootstrap(components: {
     implicit val routingLog = RoutingLog(system.log)
     implicit val routingLog = RoutingLog(system.log)
     implicit val materializer = ActorMaterializer()
     implicit val materializer = ActorMaterializer()
     implicit val settings = RoutingSettings.default(system)
     implicit val settings = RoutingSettings.default(system)
-    implicit val setup = RoutingSetup.apply
+    val handler = Route.asyncHandler(components.route)
     val server = Http(components.system).bind(config.getString("akka.http.benchmark.host"), config.getInt("akka.http.benchmark.port"))
     val server = Http(components.system).bind(config.getString("akka.http.benchmark.host"), config.getInt("akka.http.benchmark.port"))
     server.to {
     server.to {
       foreach { connection =>
       foreach { connection =>
-        connection.handleWithAsyncHandler(Route.asyncHandler(components.route))
+        connection.handleWithAsyncHandler(handler)
       }
       }
     }.run()
     }.run()
   }
   }