Merge pull request #1436 from scruffy-project/master

Updated Scruffy tests in response to round 10 preview

frameworks/Scala/scruffy/README.md

@@ -7,7 +7,7 @@ This is the Scruffy portion of a [benchmarking test suite](../) comparing a vari
 The tests were run with:
 
 * [Java OpenJDK 1.7.0_09](http://openjdk.java.net/)
-* [Scruffy 1.4.15](http://scruffy-project.github.io/)
+* [Scruffy 1.9.0](http://scruffy-project.github.io/)
 
 ## Test URLs
 

frameworks/Scala/scruffy/benchmark_config

@@ -13,13 +13,13 @@
       "framework": "scruffy",
       "language": "Scala",
       "orm": "Raw",
-      "platform": "Netty",
+      "platform": "Undertow",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "scruffy",
       "notes": "",
-      "versus": "Netty"
+      "versus": "Undertow"
     }
   }]
 }

frameworks/Scala/scruffy/build.sbt

@@ -2,12 +2,12 @@ name := "scruffy-benchmark"
 
 organization := "com.sksamuel.scruffy"
 
-scalaVersion := "2.11.1"
+scalaVersion := "2.11.6"
 
-version := "1.0.1"
+version := "10.1" // version 10 for round 10
 
 libraryDependencies ++= Seq(
-  "com.sksamuel.scruffy" %% "scruffy-server" % "1.4.15",
+  "com.sksamuel.scruffy" %% "scruffy-undertow" % "1.9.0",
   "org.mongodb" %% "casbah-core" % "2.7.1"
 )
 

frameworks/Scala/scruffy/setup.sh

@@ -4,4 +4,4 @@ sed -i 's|database_host|'"${DBHOST}"'|g' src/main/scala/scruffy/examples/Test2En
 
 $SBT_HOME/bin/sbt assembly
 
-java -jar target/scala-2.11/scruffy-benchmark-assembly-1.0.1.jar -Dhostname=${DBHOST} &
+java -jar target/scala-2.11/scruffy-benchmark-assembly-10.1.jar -Dhostname=${DBHOST} &

frameworks/Scala/scruffy/src/main/scala/scruffy/examples/Main.scala

@@ -1,17 +1,30 @@
 package scruffy.examples
 
-import com.sksamuel.scruffy.{ScruffyConfiguration, Scruffy}
+import com.sksamuel.scruffy.undertow.ScruffyUndertowHttpHandler
+import io.undertow.{UndertowOptions, Undertow}
 
 /** @author Stephen Samuel */
 object Main extends App {
 
   val port = 8080
-  val scruffy = new Scruffy(ScruffyConfiguration.port(port).compression(false).requestLogging(false))
+
+  val scruffy = new ScruffyUndertowHttpHandler
   scruffy.mount(new Test1Endpoint)
   scruffy.mount(new Test2Endpoint)
   scruffy.mount(new Test6Endpoint)
-  println("Starting Scruffy...")
-  val lifecycle = scruffy.start()
+
+  val server = Undertow
+    .builder()
+    .addHttpListener(port, "localhost")
+    .setHandler(scruffy)
+    .setServerOption(UndertowOptions.ALWAYS_SET_KEEP_ALIVE, java.lang.Boolean.FALSE)
+    .setServerOption(UndertowOptions.ALWAYS_SET_DATE, java.lang.Boolean.TRUE)
+    .setServerOption(UndertowOptions.ENABLE_CONNECTOR_STATISTICS, java.lang.Boolean.FALSE)
+    .setServerOption(UndertowOptions.MAX_CONCURRENT_REQUESTS_PER_CONNECTION, Integer.valueOf(8))
+
+    .build()
+
+  println("Starting Undertow...")
+  server.start()
   println(s"Started on port [$port]. Interrupt to exit.")
-  lifecycle.await()
 }

frameworks/Scala/scruffy/src/main/scala/scruffy/examples/Test1Endpoint.scala

@@ -1,12 +1,14 @@
 package scruffy.examples
 
-import com.sksamuel.scruffy.EndpointProvider
+import com.sksamuel.scruffy.HttpEndpointProvider
 
 /** @author Stephen Samuel */
-class Test1Endpoint extends EndpointProvider {
+class Test1Endpoint extends HttpEndpointProvider {
 
-  get("json").complete {
-    req => json(Message("Hello, World!"))
+  get("json") { implicit req =>
+    json {
+      Message("Hello, World!")
+    }
   }
 }
 

frameworks/Scala/scruffy/src/main/scala/scruffy/examples/Test2Endpoint.scala

@@ -1,10 +1,11 @@
 package scruffy.examples
 
 import com.mongodb.casbah.Imports._
-import com.sksamuel.scruffy.EndpointProvider
+import com.sksamuel.scruffy.HttpEndpointProvider
 
 /** @author Stephen Samuel */
-class Test2Endpoint() extends EndpointProvider {
+class Test2Endpoint() extends HttpEndpointProvider {
+
   val hostname = "database_host"
   val connection = MongoConnection(hostname, 27017)
   val collection = connection.getDB("hello_world").getCollection("world")
@@ -16,12 +17,13 @@ class Test2Endpoint() extends EndpointProvider {
   //for ( k <- 1 to 10000 )
   //  collection.save(DBObject("_id" -> k, "id" -> k, "randomNumber" -> random.nextInt(10000).toDouble))
 
-  get("db").json {
-    req =>
+  get("db") { implicit req =>
+    json {
       val id = random.nextInt(10000)
       val dbo = collection.findOne(DBObject("_id" -> id), fields)
       val randomNumber = Math.round(dbo.get("randomNumber").toString.toFloat)
       Output(id, randomNumber)
+    }
   }
 }
 

frameworks/Scala/scruffy/src/main/scala/scruffy/examples/Test6Endpoint.scala

@@ -1,13 +1,12 @@
 package scruffy.examples
 
-import com.sksamuel.scruffy.EndpointProvider
+import com.sksamuel.scruffy.HttpEndpointProvider
 import com.sksamuel.scruffy.http.MediaType
 
 /** @author Stephen Samuel */
-class Test6Endpoint extends EndpointProvider {
+class Test6Endpoint extends HttpEndpointProvider {
 
-  get("plaintext").complete {
-    req => entity("Hello, World!", MediaType.TextPlain)
+  get("plaintext") { req =>
+    ok("Hello, World!", MediaType.TextPlain)
   }
-
 }

frameworks/Scala/scruffy/src/test/scala/BenchmarkVerify.scala

@@ -0,0 +1,39 @@
+import com.sksamuel.scruffy.client.ScruffyClient
+
+import scala.concurrent.duration._
+import scala.concurrent.{Await, Future}
+
+object BenchmarkVerify extends App {
+
+  import scala.concurrent.ExecutionContext.Implicits.global
+
+  val client = ScruffyClient()
+
+  val sw = Stopwatch()
+
+  val futures = for ( k <- 1 to 10000 ) yield {
+    client.get("http://localhost:8080/json").execute
+  }
+
+  val f = Future.sequence(futures)
+  Await.result(f, 1.minute)
+
+  sw.printMillis()
+
+  client.close()
+}
+
+case class Stopwatch() {
+
+  val start = System.currentTimeMillis
+
+  def duration: FiniteDuration = {
+    val end = System.currentTimeMillis
+    (end - start).millis
+  }
+
+  def seconds: Long = duration.toSeconds
+  def millis: Long = duration.toMillis
+
+  def printMillis(): Unit = println(s"Time ${millis}ms")
+}