Browse Source

changed queries parameter to be optional (and default to 1) instead of required

David Denton 8 years ago
parent
commit
800e1acd33

+ 1 - 0
frameworks/Scala/fintrospect/source_code

@@ -3,4 +3,5 @@ fintrospect/src/main/scala/Database.scala
 fintrospect/src/main/scala/FortunesRoute.scala
 fintrospect/src/main/scala/JsonRoute.scala
 fintrospect/src/main/scala/PlainTextRoute.scala
+fintrospect/src/main/scala/QueriesRoute.scala
 fintrospect/src/main/scala/FintrospectBenchmarkServer.scala

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

@@ -38,13 +38,13 @@ object QueriesRoutes {
         .map(_.map(Ok(_)).getOrElse(NotFound()).build())
     }
 
-    val numberOfQueries = Query.required(int("queries").map(_.max(1).min(500)))
+    val numberOfQueries = Query.optional(int("queries").map(_.max(1).min(500)))
 
     val multipleRoute = RouteSpec()
       .taking(numberOfQueries)
       .at(Get) / "queries" bindTo Service.mk {
       r: Request => {
-        collect(1.to(numberOfQueries <-- r)
+        collect(1.to((numberOfQueries <-- r).getOrElse(1))
           .map(i => statement(generateRandomId).map(toJson)))
           .map(f => f.flatMap(_.toSeq))
           .flatMap(c => Ok(array(c)))