Просмотр исходного кода

Akka http version upgrade (#2775)

* upgrade version

* method call improvement
sxend 8 лет назад
Родитель
Сommit
3861bbfbb2

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

@@ -9,8 +9,8 @@ scalaVersion := "2.11.8"
 resolvers += "Akka Snapshot Repository" at "http://repo.akka.io/snapshots/"
 
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-http" % "10.0.0",
-  "com.typesafe.akka" %% "akka-http-spray-json" % "10.0.0",
+  "com.typesafe.akka" %% "akka-http" % "10.0.6",
+  "com.typesafe.akka" %% "akka-http-spray-json" % "10.0.6",
   "mysql" % "mysql-connector-java" % "5.1.38",
   "com.zaxxer" % "HikariCP" % "2.5.1",
   "org.scalatra.scalate" %% "scalate-core" % "1.7.0",

+ 1 - 1
frameworks/Scala/akka-http/project/assembly.sbt

@@ -1 +1 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.13.0")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.4")

+ 1 - 1
frameworks/Scala/akka-http/project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.11
+sbt.version=0.13.15

+ 3 - 4
frameworks/Scala/akka-http/src/main/scala/com/typesafe/akka/http/benchmark/handlers/JsonHandler.scala

@@ -1,5 +1,6 @@
 package com.typesafe.akka.http.benchmark.handlers
 
+import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
 import akka.http.scaladsl.model.HttpCharsets._
 import akka.http.scaladsl.model.MediaTypes._
 import akka.http.scaladsl.model._
@@ -19,14 +20,12 @@ class JsonHandler(components: {
     }
   }
 
-  def response = {
-    HttpResponse(StatusCodes.OK, entity = HttpEntity(Response("Hello, World!").toJson.toString()).withContentType(`application/json`))
-  }
+  def response = Response("Hello, World!")
 }
 
 object JsonHandler {
 
-  object Protocols extends DefaultJsonProtocol {
+  object Protocols extends DefaultJsonProtocol with SprayJsonSupport {
 
     case class Response(message: String)
 

+ 1 - 1
frameworks/Scala/akka-http/src/main/scala/com/typesafe/akka/http/benchmark/handlers/PlaintextHandler.scala

@@ -14,5 +14,5 @@ class PlaintextHandler(components: {
     }
   }
 
-  def response = HttpResponse(StatusCodes.OK, entity = HttpEntity("Hello, World!"))
+  def response = "Hello, World!"
 }