raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

=htp port FromEntityUnmarshaller[FormData] from spray, closes #15966

Browse source
This commit is contained in:
Mathias 2014-10-06 10:37:27 +02:00
parent 6e3f4ff3d5
commit 9347bf57e7
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
akka-http/src/main/scala/akka/http/unmarshalling/PredefinedFromEntityUnmarshallers.scala
View file

@ -17,9 +17,9 @@ import MediaTypes._
trait PredefinedFromEntityUnmarshallers extends MultipartUnmarshallers {
implicit def byteStringUnmarshaller(implicit fm: FlowMaterializer): FromEntityUnmarshaller[ByteString] =
Unmarshaller { entity ⇒
if (entity.isKnownEmpty) FastFuture.successful(ByteString.empty)
else Flow(entity.dataBytes(fm)).fold(ByteString.empty)(_ ++ _).toFuture()
Unmarshaller {
case HttpEntity.Strict(_, data) ⇒ FastFuture.successful(data)
case entity ⇒ Flow(entity.dataBytes(fm)).fold(ByteString.empty)(_ ++ _).toFuture()
}
implicit def byteArrayUnmarshaller(implicit fm: FlowMaterializer,
@ -56,6 +56,19 @@ trait PredefinedFromEntityUnmarshallers extends MultipartUnmarshallers {
FastFuture.successful(XML.withSAXParser(parser).load(reader)) // blocking call! Ideally we'd have a `loadToFuture`
} else UnmarshallingError.UnsupportedContentType(nodeSeqMediaTypes map (ContentTypeRange(_)))
}
implicit def urlEncodedFormDataUnmarshaller(implicit fm: FlowMaterializer,
ec: ExecutionContext): FromEntityUnmarshaller[FormData] =
stringUnmarshaller mapWithInput { (entity, string) ⇒
try {
val nioCharset = entity.contentType.definedCharset.getOrElse(HttpCharsets.`UTF-8`).nioCharset
val query = Uri.Query(string, nioCharset)
FormData(query)
} catch {
case ex: IllegalUriException ⇒
throw new IllegalArgumentException(ex.info.formatPretty.replace("Query,", "form content,"))
}
}
}
object PredefinedFromEntityUnmarshallers extends PredefinedFromEntityUnmarshallers