reimplementing <--? for parameters

daviddenton · Feb 4, 2017 · 6189434 · 6189434
1 parent d7dbe8c
commit 6189434
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/core/src/main/scala/io/fintrospect/parameters/Parameter.scala b/core/src/main/scala/io/fintrospect/parameters/Parameter.scala
@@ -1,7 +1,7 @@
 package io.fintrospect.parameters
 
 import io.fintrospect.util.ExtractionError.{Invalid, Missing}
-import io.fintrospect.util.{Extracted, Extraction, ExtractionFailed}
+import io.fintrospect.util.{Extracted, Extraction, ExtractionError, ExtractionFailed}
 
 import scala.util.{Failure, Success, Try}
 
@@ -36,9 +36,11 @@ trait OptionalParameter[From, T, Bnd <: Binding] extends Optional[From, T]
   /**
     * Attempt to manually deserialize from the message object, using a validation predicate and reason for failure.
     */
-  def <--?(from: From, reason: String, predicate: T => Boolean): Extraction[Option[T]] = ???
-
-  //    <--?(from).flatMap[T](v => if (v.forall(predicate)) Extraction(v) else ExtractionFailed(ExtractionError(this, reason)))
+  def <--?(from: From, reason: String, predicate: T => Boolean): Extraction[Option[T]] =
+    <--?(from) match {
+      case Extracted(x) => if(x.forall(predicate)) Extraction(x) else ExtractionFailed(ExtractionError(this, reason))
+      case e => e
+    }
 
   /**
     * Attempt to manually deserialize from the message object, using a validation predicate and reason for failure.
@@ -60,9 +62,11 @@ trait MandatoryParameter[From, T, Bnd <: Binding] extends Mandatory[From, T]
   /**
     * Attempt to manually deserialize from the message object, using a validation predicate and reason for failure.
     */
-  def <--?(from: From, reason: String, predicate: T => Boolean): Extraction[T] = ???
-
-  //    <--?(from).flatMap[T](v => if (v.forall(predicate)) Extraction(v) else ExtractionFailed(ExtractionError(this, reason)))
+  def <--?(from: From, reason: String, predicate: T => Boolean): Extraction[T] =
+    <--?(from) match {
+      case Extracted(x) => if(predicate(x)) Extraction(x) else ExtractionFailed(ExtractionError(this, reason))
+      case e => e
+    }
 
   /**
     * Attempt to manually deserialize from the message object, using a validation predicate and reason for failure.
@@ -122,7 +126,7 @@ abstract class MultiMandatoryParameter[T, From, B <: Binding](val name: String,
   def <--?(from: From): Extraction[Seq[T]] = from match {
     case req: ExtractedRouteRequest => req.get(this)
     case _ => eab.valuesFrom(this, from)
-      .map(values => Try(values.map(spec.deserialize)) match {
+      .map(xs => Try(xs.map(spec.deserialize)) match {
         case Success(x) => Extracted(x)
         case Failure(_) => ExtractionFailed(Invalid(this))
       }).getOrElse(ExtractionFailed(Missing(this)))
@@ -140,7 +144,7 @@ abstract class MultiOptionalParameter[T, From, B <: Binding](val name: String, v
   def <--?(from: From): Extraction[Option[Seq[T]]] = from match {
     case req: ExtractedRouteRequest => req.get(this)
     case _ => eab.valuesFrom(this, from)
-      .map(x => Try(x.map(spec.deserialize)) match {
+      .map(xs => Try(xs.map(spec.deserialize)) match {
         case Success(x) => Extracted(Some(x))
         case Failure(_) => ExtractionFailed(Invalid(this))
       }).getOrElse(Extracted(None))

diff --git a/core/src/test/scala/io/fintrospect/util/ExtractorTest.scala b/core/src/test/scala/io/fintrospect/util/ExtractorTest.scala
@@ -23,7 +23,7 @@ class ExtractorTest extends FunSpec with Matchers {
           } yield (req, opt)
       }
 
-      ex <--? Request("/") shouldBe Extracted(Some((None, None)))
+      ex <--? Request("/") shouldBe Extracted((None, None))
     }
 
     it("does not short circuit if last parameter in a for comprehension is optional") {
@@ -35,7 +35,7 @@ class ExtractorTest extends FunSpec with Matchers {
           } yield (req, opt)
       }
 
-      ex <--? Request("/?req=123") shouldBe Extracted(Some((Some(123), None)))
+      ex <--? Request("/?req=123") shouldBe Extracted((123, None))
     }
 
     describe("non-embedded extraction") {
@@ -121,7 +121,6 @@ class ExtractorTest extends FunSpec with Matchers {
 
       it("combine") {
         Extraction.combine(Seq(Extracted(None), Extracted(None))) shouldBe Extracted(())
-        Extraction.combine(Seq(Extracted(None), Extracted(Some(1)))) shouldBe Extracted(None)
         Extraction.combine(Seq(Extracted(None), Extracted(Some(1)), ExtractionFailed(missing), ExtractionFailed(invalid))) shouldBe ExtractionFailed(Seq(missing, invalid))
       }
     }