Browse Source

plaintext added + headers

mfirry 10 years ago
parent
commit
b8d8526e97

+ 5 - 0
frameworks/Scala/http4s/README.md

@@ -9,12 +9,17 @@ The tests were run with:
 
 * [Java Oracle 1.8.0_25](http://www.oracle.com/technetwork/java/javase)
 * [http4s 0.6.2](http://http4s.org/)
+* [blaze 0.6.2](https://github.com/http4s/blaze/)
 
 ## Test URLs
 ### JSON Encoding Test
 
 http://localhost:8080/json
 
+### Plaintext Test
+
+http://localhost:8080/plaintext
+
 ## How to run
 sbt 'oneJar'
 

+ 3 - 2
frameworks/Scala/http4s/benchmark_config.json

@@ -6,14 +6,15 @@
       "database_os": "Linux",
       "setup_file": "setup",
       "json_url": "/json",
+      "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
       "classification": "Micro",
       "database": "None",
       "framework": "http4s",
       "language": "Scala",
-      "platform": "NIO",
-      "webserver": "None",
+      "platform": "NIO2",
+      "webserver": "blaze",
       "os": "Linux",
       "display_name": "http4s",
       "notes": ""

+ 9 - 0
frameworks/Scala/http4s/src/main/scala/WebServer.scala

@@ -3,6 +3,7 @@ import org.http4s.server._
 import org.http4s.dsl._
 import org.http4s.argonaut._
 import org.http4s.server.blaze.BlazeBuilder
+import headers._
 
 import _root_.argonaut._, Argonaut._
 
@@ -10,7 +11,15 @@ object WebServer extends App {
 
   val service = HttpService {
     case GET -> Root / "json" =>
+      val dateHeader = Date(DateTime(4))
       Ok(Json("message" -> jString("Hello, World!")).asJson)
+        .withHeaders(dateHeader)
+        .withContentType(Some(`Content-Type`(MediaType.`application/json`, Charset.`UTF-8`)))
+    case GET -> Root / "plaintext" =>
+      val dateHeader = Date(DateTime(4))
+      Ok("Hello, World!")
+        .withHeaders(dateHeader)
+        .withContentType(Some(`Content-Type`(MediaType.`text/plain`, Charset.`UTF-8`)))
   }
 
   BlazeBuilder.bindHttp(8080)