dave - reresimplified

daviddenton · Jun 8, 2015 · 6c7766a · 6c7766a
1 parent 37283d0
commit 6c7766a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/src/main/scala/io/fintrospect/parameters/Body.scala b/src/main/scala/io/fintrospect/parameters/Body.scala
@@ -9,6 +9,9 @@ import scala.util.Try
 
 class Body private(val description: Option[String], val paramType: ParamType, val location: Location, val example: JsonNode, parse: (String => Try[JsonNode]))
   extends RequestParameter[JsonNode, JsonNode](parse) {
+
+  override val required = true
+
   override val name = "body"
   override def from(request: HttpRequest): JsonNode = parse(location.from(null, request).get).get
 

diff --git a/src/main/scala/io/fintrospect/parameters/RequestParameter.scala b/src/main/scala/io/fintrospect/parameters/RequestParameter.scala
@@ -8,15 +8,13 @@ abstract class RequestParameter[T, X](parse: (String => Try[T])) extends Paramet
   def from(request: HttpRequest): T
 
   def parseFrom(request: HttpRequest): Option[Try[X]]
-
-  override val required = true
 }
 
 class OptionalRequestParameter[T](val name: String,
-                                           val location: Location,
-                                           val description: Option[String],
-                                           val paramType: ParamType,
-                                           parse: (String => Try[T]))
+                                  val location: Location,
+                                  val description: Option[String],
+                                  val paramType: ParamType,
+                                  parse: (String => Try[T]))
   extends RequestParameter[Option[T], T](s => Success(parse(s).toOption)) {
 
   override val required = false
@@ -27,10 +25,12 @@ class OptionalRequestParameter[T](val name: String,
 }
 
 class MandatoryRequestParameter[T](val name: String,
-                                            val location: Location,
-                                            val description: Option[String],
-                                            val paramType: ParamType,
-                                            parse: (String => Try[T])) extends RequestParameter[T, T](parse) {
+                                   val location: Location,
+                                   val description: Option[String],
+                                   val paramType: ParamType,
+                                   parse: (String => Try[T])) extends RequestParameter[T, T](parse) {
+  override val required = true
+
   override def from(request: HttpRequest): T = parseFrom(request).flatMap(_.toOption).get
 
   override def parseFrom(request: HttpRequest): Option[Try[T]] = location.from(name, request).map(parse)