Browse Source

Merge pull request #2151 from daviddenton/round-14

Updated Fintrospect version and tweak to JSON message
Nate 9 years ago
parent
commit
34ea8437c3

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

@@ -1,6 +1,6 @@
 name := """techempower-benchmarks-fintrospect"""
 
-version := "0.0.3"
+version := "0.0.4"
 
 scalaVersion := "2.11.8"
 
@@ -15,8 +15,8 @@ com.github.retronym.SbtOneJar.oneJarSettings
 mainClass in(Compile, run) := Some("FintrospectBenchmarkServer")
 
 libraryDependencies ++= Seq(
-  "io.fintrospect" %% "fintrospect-core" % "13.0.0",
-  "io.fintrospect" %% "fintrospect-circe" % "13.0.0"
+  "io.fintrospect" %% "fintrospect-core" % "13.3.0",
+  "io.fintrospect" %% "fintrospect-circe" % "13.3.0"
 )
 
 resolvers += Resolver.sonatypeRepo("snapshots")

+ 1 - 4
frameworks/Scala/fintrospect/src/main/scala/FintrospectBenchmarkServer.scala

@@ -9,7 +9,6 @@ import com.twitter.finagle.stats.NullStatsReceiver
 import com.twitter.finagle.tracing.NullTracer
 import com.twitter.finagle.{Http, Service}
 import com.twitter.util.Await
-import io.circe.generic.auto._
 import io.fintrospect.formats.json.Circe.JsonFormat._
 import io.fintrospect.{ModuleSpec, RouteSpec}
 
@@ -22,11 +21,9 @@ object FintrospectBenchmarkServer extends App {
     }
   }
 
-  case class Message(message: String)
-
   val jsonHelloWorld = {
     import io.fintrospect.formats.json.Circe.ResponseBuilder.implicits._
-    Service.mk { r: Request => Ok(encode(Message("Hello, World!")))
+    Service.mk { r: Request => Ok(obj("message" -> string("Hello, World!")))
       .withHeaders("Server" -> "Example", "Date" -> RFC_1123_DATE_TIME.format(now()))
     }
   }