Browse Source

Merge pull request #2479 from daviddenton/round-14

upgrade fintrospect to latest API version
Mike Smith 8 years ago
parent
commit
77e1cdbbca

+ 7 - 7
frameworks/Scala/fintrospect/build.sbt

@@ -1,6 +1,6 @@
 name := """techempower-benchmarks-fintrospect"""
 
-version := "0.0.8"
+version := "0.1.0"
 
 scalaVersion := "2.11.8"
 
@@ -10,15 +10,15 @@ scalacOptions += "-feature"
 
 resolvers += "JCenter" at "https://jcenter.bintray.com"
 
+resolvers += Resolver.sonatypeRepo("snapshots")
+
 com.github.retronym.SbtOneJar.oneJarSettings
 
 mainClass in(Compile, run) := Some("FintrospectBenchmarkServer")
 
 libraryDependencies ++= Seq(
-  "io.fintrospect" %% "fintrospect-core" % "13.17.0",
-  "io.fintrospect" %% "fintrospect-jackson" % "13.17.0",
-  "io.fintrospect" %% "fintrospect-mustache" % "13.17.0",
-  "com.twitter" %% "finagle-mysql" % "6.40.0"
+  "io.fintrospect" %% "fintrospect-core" % "14.0.0",
+  "io.fintrospect" %% "fintrospect-jackson" % "14.0.0",
+  "io.fintrospect" %% "fintrospect-mustache" % "14.0.0",
+  "com.twitter" %% "finagle-mysql" % "6.41.0"
 )
-
-resolvers += Resolver.sonatypeRepo("snapshots")

+ 2 - 3
frameworks/Scala/fintrospect/src/main/scala/DatabaseRoutes.scala

@@ -1,13 +1,12 @@
 import com.fasterxml.jackson.databind.JsonNode
 import com.twitter.finagle.Service
 import com.twitter.finagle.http.Method.Get
-import com.twitter.finagle.http.Status.{NotFound, Ok}
 import com.twitter.finagle.http.{Request, Response}
 import com.twitter.finagle.mysql.Parameter.wrap
 import com.twitter.finagle.mysql.{Client, IntValue, Result, ResultSet}
 import com.twitter.util.Future.collect
 import io.fintrospect.formats.Jackson.JsonFormat.{array, number, obj}
-import io.fintrospect.formats.Jackson.ResponseBuilder.implicits._
+import io.fintrospect.formats.Jackson.ResponseBuilder._
 import io.fintrospect.parameters.{ParameterSpec, Query}
 import io.fintrospect.{RouteSpec, ServerRoutes}
 
@@ -35,7 +34,7 @@ object DatabaseRoutes {
     val queryRoute = RouteSpec().at(Get) / "db" bindTo Service.mk {
       _: Request => getStatement(generateRandomNumber)
         .map(toJson)
-        .map(_.map(Ok(_)).getOrElse(NotFound()).build())
+        .map(_.map(Ok(_)).getOrElse(NotFound("")).build())
     }
 
     val numberOfQueries = Query.optional(ParameterSpec.string("queries").map {

+ 1 - 2
frameworks/Scala/fintrospect/src/main/scala/JsonRoute.scala

@@ -1,10 +1,9 @@
 import com.twitter.finagle.Service
 import com.twitter.finagle.http.Method.Get
 import com.twitter.finagle.http.Request
-import com.twitter.finagle.http.Status.Ok
 import io.fintrospect.RouteSpec
 import io.fintrospect.formats.Jackson.JsonFormat.{encodeToBuf, obj, string}
-import io.fintrospect.formats.Jackson.ResponseBuilder.implicits._
+import io.fintrospect.formats.Jackson.ResponseBuilder._
 
 object JsonRoute {
 

+ 1 - 2
frameworks/Scala/fintrospect/src/main/scala/PlainTextRoute.scala

@@ -1,10 +1,9 @@
 import com.twitter.finagle.Service
 import com.twitter.finagle.http.Method.Get
 import com.twitter.finagle.http.Request
-import com.twitter.finagle.http.Status.Ok
 import com.twitter.io.Buf
 import io.fintrospect.RouteSpec
-import io.fintrospect.formats.PlainText.ResponseBuilder.implicits._
+import io.fintrospect.formats.PlainText.ResponseBuilder._
 
 object PlainTextRoute {