! httpx: remove MetaUnmarshallers.scala, fold only member into FormDa…

…taUnmarshallers.scala
spray · Oct 1, 2013 · ebe3e97 · ebe3e97
1 parent ef03bf4
commit ebe3e97
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 37 deletions.
diff --git a/spray-httpx/src/main/scala/spray/httpx/unmarshalling/Deserializer.scala b/spray-httpx/src/main/scala/spray/httpx/unmarshalling/Deserializer.scala
@@ -31,7 +31,6 @@ trait Deserializer[A, B] extends (A ⇒ Deserialized[B]) { self ⇒
 
 object Deserializer extends DeserializerLowerPriorityImplicits
     with BasicUnmarshallers
-    with MetaUnmarshallers
     with FromStringDeserializers
     with FormDataUnmarshallers {
 

diff --git a/spray-httpx/src/main/scala/spray/httpx/unmarshalling/FormDataUnmarshallers.scala b/spray-httpx/src/main/scala/spray/httpx/unmarshalling/FormDataUnmarshallers.scala
@@ -113,6 +113,17 @@ trait FormDataUnmarshallers {
             throw new IllegalArgumentException(ex.info.formatPretty.replace("Query,", "form content,"))
         }
     }
+
+  implicit def formUnmarshaller(implicit fdum: Unmarshaller[FormData], mpfdum: Unmarshaller[MultipartFormData]) =
+    new Unmarshaller[HttpForm] {
+      def apply(entity: HttpEntity) = fdum(entity).left.flatMap {
+        case UnsupportedContentType(error1) ⇒ mpfdum(entity).left.map {
+          case UnsupportedContentType(error2) ⇒ UnsupportedContentType(error1 + " or " + error2)
+          case error                          ⇒ error
+        }
+        case error ⇒ Left(error)
+      }
+    }
 }
 
 object FormDataUnmarshallers extends FormDataUnmarshallers
diff --git a/spray-httpx/src/main/scala/spray/httpx/unmarshalling/MetaUnmarshallers.scala b/spray-httpx/src/main/scala/spray/httpx/unmarshalling/MetaUnmarshallers.scala