Merge pull request #56 from wlk/refinements-to-AkkaHttpJsonapiSupport

zmeda · web-flow · commit 476e9f68a49b · 2016-07-22T07:36:38.000+02:00
AkkaHttpJsonapiSupport - small fixes
diff --git a/src/main/scala/org/zalando/jsonapi/json/akka/http/AkkaHttpJsonapiSupport.scala b/src/main/scala/org/zalando/jsonapi/json/akka/http/AkkaHttpJsonapiSupport.scala
@@ -12,15 +12,13 @@ import spray.json._
 
 trait AkkaHttpJsonapiSupport extends SprayJsonJsonapiProtocol with DefaultJsonProtocol {
   def akkaHttpJsonapiMarshaller[T: JsonapiRootObjectWriter]: ToEntityMarshaller[T] =
-    Marshaller.withFixedContentType(`application/vnd.api+json`) { obj ⇒
-      HttpEntity(`application/vnd.api+json`, obj.rootObject.toJson.compactPrint)
-    }
+    Marshaller.StringMarshaller.wrap(`application/vnd.api+json`)(_.rootObject.toJson.compactPrint)
 
   def akkaHttpJsonapiUnmarshaller[T: JsonapiRootObjectReader]: FromEntityUnmarshaller[T] =
     Unmarshaller.stringUnmarshaller.forContentTypes(`application/vnd.api+json`).map(_.parseJson.convertTo[RootObject].jsonapi[T])
 }
 
 object AkkaHttpJsonapiSupport extends AkkaHttpJsonapiSupport {
   implicit def akkaHttpJsonapiMarshallerImplicit[T: JsonapiRootObjectWriter]: ToEntityMarshaller[T] = akkaHttpJsonapiMarshaller
-  implicit def akkaHttpJsonapiMarshallerImplicit[T: JsonapiRootObjectReader]: FromEntityUnmarshaller[T] = akkaHttpJsonapiUnmarshaller
+  implicit def akkaHttpJsonapiUnmarshallerImplicit[T: JsonapiRootObjectReader]: FromEntityUnmarshaller[T] = akkaHttpJsonapiUnmarshaller
 }
