Forráskód Böngészése

Update fintrospect to latest version (#2565)

* upgrade fintrospect

* upgrade fintrospect to latest version
David Denton 8 éve
szülő
commit
4c4de98eab

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

@@ -1,6 +1,6 @@
 name := """techempower-benchmarks-fintrospect"""
 
-version := "0.1.0"
+version := "0.2.0"
 
 scalaVersion := "2.11.8"
 
@@ -17,8 +17,8 @@ com.github.retronym.SbtOneJar.oneJarSettings
 mainClass in(Compile, run) := Some("FintrospectBenchmarkServer")
 
 libraryDependencies ++= Seq(
-  "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"
+  "io.fintrospect" %% "fintrospect-core" % "14.12.2",
+  "io.fintrospect" %% "fintrospect-jackson" % "14.12.2",
+  "io.fintrospect" %% "fintrospect-mustache" % "14.12.2",
+  "com.twitter" %% "finagle-mysql" % "6.42.0"
 )

+ 1 - 1
frameworks/Scala/fintrospect/setup.sh

@@ -6,4 +6,4 @@ sbt clean
 
 sbt 'oneJar' -batch
 
-java -jar target/scala-2.11/*fintrospect*one-jar.jar &
+java -Dcom.twitter.finagle.toggle.flag.overrides=com.twitter.http.UseNetty4=1.0 -server -XX:+UseNUMA -XX:+UseParallelGC -XX:+AggressiveOpts -XX:+AlwaysPreTouch -jar target/scala-2.11/*fintrospect*one-jar.jar &

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

@@ -37,9 +37,9 @@ object DatabaseRoutes {
         .map(_.map(Ok(_)).getOrElse(NotFound("")).build())
     }
 
-    val numberOfQueries = Query.optional(ParameterSpec.string("queries").map {
+    val numberOfQueries = Query.optional(ParameterSpec.string().map {
       i => Try(i.toInt).getOrElse(1).max(1).min(500)
-    })
+    }, "queries")
 
     val multipleRoute = RouteSpec()
       .taking(numberOfQueries)

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

@@ -8,7 +8,6 @@ import com.twitter.finagle.{Filter, Http}
 import com.twitter.util.{Await, NullMonitor}
 import io.fintrospect.RouteModule
 import io.fintrospect.configuration.Host
-import io.fintrospect.renderers.simplejson.SimpleJson
 import org.apache.commons.lang.time.FastDateFormat.getInstance
 
 import scala.util.Properties
@@ -28,7 +27,7 @@ object FintrospectBenchmarkServer extends App {
   val dbHost = Properties.envOrNone("DBHOST").map(Host(_)).getOrElse(Host.localhost)
   val database = Database(dbHost)
 
-  val module = RouteModule(Root, SimpleJson())
+  val module = RouteModule(Root)
     .withRoute(JsonRoute())
     .withRoute(PlainTextRoute())
     .withRoute(FortunesRoute(database))

+ 1 - 1
frameworks/Scala/fintrospect/src/main/scala/FortunesRoute.scala

@@ -29,7 +29,7 @@ object FortunesRoute {
 
     val service = new RenderView(Html.ResponseBuilder, CachingClasspath()).andThen(
       Service.mk {
-        r: Request =>
+        _: Request =>
           statement().map(toFortunes).map(f => {
             val sortedFortunes = (Fortune(0, "Additional fortune added at request time.") +: f).sortBy(_.message)
             FortunesList(sortedFortunes)