From bc536be32c4266b22309a6a3db62cd8faa8ea3b2 Mon Sep 17 00:00:00 2001
From: Konrad Malawski <konrad.malawski@project13.pl>
Date: Fri, 29 Jul 2016 15:21:19 +0200
Subject: [PATCH] =htp introduce ToByteStringMarshaller alias and fix fixme

---
 .../marshallers/sprayjson/SprayJsonSupport.scala       | 10 +++++-----
 .../scala/akka/http/scaladsl/marshalling/package.scala |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/akka-http-marshallers-scala/akka-http-spray-json/src/main/scala/akka/http/scaladsl/marshallers/sprayjson/SprayJsonSupport.scala b/akka-http-marshallers-scala/akka-http-spray-json/src/main/scala/akka/http/scaladsl/marshallers/sprayjson/SprayJsonSupport.scala
index ea99804502..d3f13379bd 100644
--- a/akka-http-marshallers-scala/akka-http-spray-json/src/main/scala/akka/http/scaladsl/marshallers/sprayjson/SprayJsonSupport.scala
+++ b/akka-http-marshallers-scala/akka-http-spray-json/src/main/scala/akka/http/scaladsl/marshallers/sprayjson/SprayJsonSupport.scala
@@ -8,9 +8,9 @@ import akka.http.scaladsl.util.FastFuture
 import akka.util.ByteString
 
 import scala.language.implicitConversions
-import akka.http.scaladsl.marshalling.{ ToEntityMarshaller, Marshaller }
-import akka.http.scaladsl.unmarshalling.{ FromEntityUnmarshaller, Unmarshaller }
-import akka.http.scaladsl.model.{ ContentTypes, MediaTypes, HttpCharsets }
+import akka.http.scaladsl.marshalling.{Marshaller, ToByteStringMarshaller, ToEntityMarshaller}
+import akka.http.scaladsl.unmarshalling.{FromEntityUnmarshaller, Unmarshaller}
+import akka.http.scaladsl.model.{ContentTypes, HttpCharsets, MediaTypes}
 import akka.http.scaladsl.model.MediaTypes.`application/json`
 import spray.json._
 
@@ -30,7 +30,7 @@ trait SprayJsonSupport {
     Unmarshaller.byteStringUnmarshaller.forContentTypes(`application/json`).mapWithCharset { (data, charset) ⇒
       val input =
         if (charset == HttpCharsets.`UTF-8`) ParserInput(data.toArray)
-        else ParserInput(data.decodeString(charset.nioCharset.name)) // FIXME: identify charset by instance, not by name!
+        else ParserInput(data.decodeString(charset.nioCharset))
       JsonParser(input)
     }
 
@@ -40,7 +40,7 @@ trait SprayJsonSupport {
     sprayJsValueMarshaller compose writer.write
   implicit def sprayJsValueMarshaller(implicit printer: JsonPrinter = CompactPrinter): ToEntityMarshaller[JsValue] =
     Marshaller.StringMarshaller.wrap(MediaTypes.`application/json`)(printer)
-  implicit def sprayByteStringMarshaller[T](implicit writer: RootJsonFormat[T], printer: JsonPrinter = CompactPrinter): Marshaller[T, ByteString] =
+  implicit def sprayByteStringMarshaller[T](implicit writer: RootJsonFormat[T], printer: JsonPrinter = CompactPrinter): ToByteStringMarshaller[T] =
     sprayJsValueMarshaller.map(s ⇒ ByteString(s.toString)) compose writer.write
 }
 object SprayJsonSupport extends SprayJsonSupport
diff --git a/akka-http/src/main/scala/akka/http/scaladsl/marshalling/package.scala b/akka-http/src/main/scala/akka/http/scaladsl/marshalling/package.scala
index a6a8748e97..c1935887e0 100644
--- a/akka-http/src/main/scala/akka/http/scaladsl/marshalling/package.scala
+++ b/akka-http/src/main/scala/akka/http/scaladsl/marshalling/package.scala
@@ -6,10 +6,12 @@ package akka.http.scaladsl
 
 import scala.collection.immutable
 import akka.http.scaladsl.model._
+import akka.util.ByteString
 
 package object marshalling {
   //# marshaller-aliases
   type ToEntityMarshaller[T] = Marshaller[T, MessageEntity]
+  type ToByteStringMarshaller[T] = Marshaller[T, ByteString]
   type ToHeadersAndEntityMarshaller[T] = Marshaller[T, (immutable.Seq[HttpHeader], MessageEntity)]
   type ToResponseMarshaller[T] = Marshaller[T, HttpResponse]
   type ToRequestMarshaller[T] = Marshaller[T, HttpRequest]