dave - pulled up from method into Requirement

daviddenton · Jun 8, 2015 · 6247ee8 · 6247ee8
1 parent e4ff348
commit 6247ee8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/main/scala/io/fintrospect/parameters/Mandatory.scala b/src/main/scala/io/fintrospect/parameters/Mandatory.scala
@@ -5,5 +5,5 @@ import org.jboss.netty.handler.codec.http.HttpRequest
 trait Mandatory[T] extends Requirement[T] {
   self: Parameter[T] =>
   override val required = true
-  def from(request: HttpRequest): T = parseFrom(request).flatMap(_.toOption).get
+  override def from(request: HttpRequest): T = parseFrom(request).flatMap(_.toOption).get
 }
diff --git a/src/main/scala/io/fintrospect/parameters/Optional.scala b/src/main/scala/io/fintrospect/parameters/Optional.scala
@@ -3,8 +3,8 @@ package io.fintrospect.parameters
 import org.jboss.netty.handler.codec.http.HttpRequest
 
 
-trait Optional[T] extends Requirement[T] {
+trait Optional[T] extends Requirement[Option[T]] {
   self: RequestParameter[T] =>
   override val required = false
-  def from(request: HttpRequest): Option[T] = parseFrom(request).flatMap(_.toOption)
+  override def from(request: HttpRequest): Option[T] = parseFrom(request).flatMap(_.toOption)
 }
diff --git a/src/main/scala/io/fintrospect/parameters/Requirement.scala b/src/main/scala/io/fintrospect/parameters/Requirement.scala
@@ -1,5 +1,8 @@
 package io.fintrospect.parameters
 
+import org.jboss.netty.handler.codec.http.HttpRequest
+
 trait Requirement[T] {
   val required: Boolean
+  def from(request: HttpRequest): T
 }