Browse Source

Merge pull request #1976 from daviddenton/master

daveD - upped versions of base framework, and added source_code. Also…
Mike Smith 9 years ago
parent
commit
a7b71717af

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

@@ -11,8 +11,8 @@ com.github.retronym.SbtOneJar.oneJarSettings
 mainClass in(Compile, run) := Some("FintrospectBenchmarkServer")
 
 libraryDependencies ++= Seq(
-  "com.twitter" %% "finagle-http" % "6.33.0",
-  "io.github.daviddenton" %% "fintrospect" % "12.4.0",
+  "com.twitter" %% "finagle-http" % "6.34.0",
+  "io.github.daviddenton" %% "fintrospect" % "12.8.0",
   "io.circe" %% "circe-core" % "0.3.0",
   "io.circe" %% "circe-parser" % "0.3.0",
   "io.circe" %% "circe-generic" % "0.3.0"

+ 2 - 0
frameworks/Scala/fintrospect/source_code

@@ -0,0 +1,2 @@
+fintrospect/src/main/scala/
+fintrospect/src/main/scala/FintrospectBenchmarkServer.scala

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

@@ -1,8 +1,5 @@
 import java.time.ZonedDateTime._
-import java.time.format.DateTimeFormatter
 import java.time.format.DateTimeFormatter.RFC_1123_DATE_TIME
-import java.time.{ZonedDateTime, ZoneId}
-import javax.swing.text.DateFormatter
 
 import com.twitter.finagle.http.Method.Get
 import com.twitter.finagle.http.Request
@@ -23,19 +20,17 @@ import io.fintrospect.{ModuleSpec, RouteSpec}
 
 object FintrospectBenchmarkServer extends App {
 
-  def plainTextHelloWorld() = {
+  val plainTextHelloWorld = {
     import io.fintrospect.formats.PlainText.ResponseBuilder._
     Service.mk { r: Request => Ok("Hello, World!")
       .withHeaders("Server" -> "Example", "Date" -> RFC_1123_DATE_TIME.format(now()))
     }
   }
 
-  def jsonHelloWorld() = {
-    case class Message(message: String)
+  case class Message(message: String)
 
-    Service.mk { r: Request => Ok(encode(Message("Hello, World!")))
-      .withHeaders("Server" -> "Example", "Date" -> RFC_1123_DATE_TIME.format(now()))
-    }
+  val jsonHelloWorld = Service.mk { r: Request => Ok(encode(Message("Hello, World!")))
+    .withHeaders("Server" -> "Example", "Date" -> RFC_1123_DATE_TIME.format(now()))
   }
 
   val module = ModuleSpec(Root)