Media types can be overridden for both marshaller and unmarshaller (e…

…xcept Jackson) (#186)
hseeberger · Dec 26, 2017 · 1e71578 · 1e71578
1 parent 1cf6f3e
commit 1e71578
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 8 deletions.
diff --git a/akka-http-argonaut/src/main/scala/de/heikoseeberger/akkahttpargonaut/ArgonautSupport.scala b/akka-http-argonaut/src/main/scala/de/heikoseeberger/akkahttpargonaut/ArgonautSupport.scala
@@ -18,6 +18,7 @@ package de.heikoseeberger.akkahttpargonaut
 
 import akka.http.scaladsl.marshalling.{ Marshaller, ToEntityMarshaller }
 import akka.http.scaladsl.model.ContentTypeRange
+import akka.http.scaladsl.model.MediaType
 import akka.http.scaladsl.model.MediaTypes.`application/json`
 import akka.http.scaladsl.unmarshalling.{ FromEntityUnmarshaller, Unmarshaller }
 import akka.util.ByteString
@@ -39,6 +40,9 @@ object ArgonautSupport extends ArgonautSupport
 trait ArgonautSupport {
 
   def unmarshallerContentTypes: Seq[ContentTypeRange] =
+    mediaTypes.map(ContentTypeRange.apply)
+
+  def mediaTypes: Seq[MediaType.WithFixedCharset] =
     List(`application/json`)
 
   private val jsonStringUnmarshaller =
@@ -49,7 +53,8 @@ trait ArgonautSupport {
         case (data, charset)       => data.decodeString(charset.nioCharset.name)
       }
 
-  private val jsonStringMarshaller = Marshaller.stringMarshaller(`application/json`)
+  private val jsonStringMarshaller =
+    Marshaller.oneOf(mediaTypes: _*)(Marshaller.stringMarshaller)
 
   /**
     * HTTP entity => `A`

diff --git a/akka-http-avro4s/src/main/scala/de/heikoseeberger/akkahttpavro4s/AvroSupport.scala b/akka-http-avro4s/src/main/scala/de/heikoseeberger/akkahttpavro4s/AvroSupport.scala
@@ -20,6 +20,7 @@ import java.io.{ ByteArrayOutputStream, IOException }
 
 import akka.http.scaladsl.marshalling.{ Marshaller, ToEntityMarshaller }
 import akka.http.scaladsl.model.ContentTypeRange
+import akka.http.scaladsl.model.MediaType
 import akka.http.scaladsl.model.MediaTypes.`application/json`
 import akka.http.scaladsl.unmarshalling.{ FromEntityUnmarshaller, Unmarshaller }
 import akka.util.ByteString
@@ -40,6 +41,9 @@ object AvroSupport extends AvroSupport
 trait AvroSupport {
 
   def unmarshallerContentTypes: Seq[ContentTypeRange] =
+    mediaTypes.map(ContentTypeRange.apply)
+
+  def mediaTypes: Seq[MediaType.WithFixedCharset] =
     List(`application/json`)
 
   private val jsonStringUnmarshaller =
@@ -50,7 +54,8 @@ trait AvroSupport {
         case (data, charset)       => data.decodeString(charset.nioCharset.name)
       }
 
-  private val jsonStringMarshaller = Marshaller.stringMarshaller(`application/json`)
+  private val jsonStringMarshaller =
+    Marshaller.oneOf(mediaTypes: _*)(Marshaller.stringMarshaller)
 
   /**
     * HTTP entity => `A`

diff --git a/akka-http-circe/src/main/scala/de/heikoseeberger/akkahttpcirce/CirceSupport.scala b/akka-http-circe/src/main/scala/de/heikoseeberger/akkahttpcirce/CirceSupport.scala
@@ -17,7 +17,8 @@
 package de.heikoseeberger.akkahttpcirce
 
 import akka.http.scaladsl.marshalling.{ Marshaller, ToEntityMarshaller }
-import akka.http.scaladsl.model.{ ContentTypeRange, HttpEntity }
+import akka.http.scaladsl.model.{ ContentType, ContentTypeRange, HttpEntity }
+import akka.http.scaladsl.model.MediaType
 import akka.http.scaladsl.model.MediaTypes.`application/json`
 import akka.http.scaladsl.unmarshalling.{ FromEntityUnmarshaller, Unmarshaller }
 import akka.util.ByteString
@@ -68,6 +69,9 @@ trait ErrorAccumulatingCirceSupport extends BaseCirceSupport with ErrorAccumulat
 trait BaseCirceSupport {
 
   def unmarshallerContentTypes: Seq[ContentTypeRange] =
+    mediaTypes.map(ContentTypeRange.apply)
+
+  def mediaTypes: Seq[MediaType.WithFixedCharset] =
     List(`application/json`)
 
   /**
@@ -78,8 +82,10 @@ trait BaseCirceSupport {
   implicit final def jsonMarshaller(
       implicit printer: Printer = Printer.noSpaces
   ): ToEntityMarshaller[Json] =
-    Marshaller.withFixedContentType(`application/json`) { json =>
-      HttpEntity(`application/json`, printer.pretty(json))
+    Marshaller.oneOf(mediaTypes: _*) { mediaType =>
+      Marshaller.withFixedContentType(ContentType(mediaType)) { json =>
+        HttpEntity(`application/json`, printer.pretty(json))
+      }
     }
 
   /**

diff --git a/akka-http-json4s/src/main/scala/de/heikoseeberger/akkahttpjson4s/Json4sSupport.scala b/akka-http-json4s/src/main/scala/de/heikoseeberger/akkahttpjson4s/Json4sSupport.scala
@@ -20,6 +20,7 @@ import java.lang.reflect.InvocationTargetException
 
 import akka.http.scaladsl.marshalling.{ Marshaller, ToEntityMarshaller }
 import akka.http.scaladsl.model.ContentTypeRange
+import akka.http.scaladsl.model.MediaType
 import akka.http.scaladsl.model.MediaTypes.`application/json`
 import akka.http.scaladsl.unmarshalling.{ FromEntityUnmarshaller, Unmarshaller }
 import akka.util.ByteString
@@ -50,6 +51,9 @@ trait Json4sSupport {
   import Json4sSupport._
 
   def unmarshallerContentTypes: Seq[ContentTypeRange] =
+    mediaTypes.map(ContentTypeRange.apply)
+
+  def mediaTypes: Seq[MediaType.WithFixedCharset] =
     List(`application/json`)
 
   private val jsonStringUnmarshaller =
@@ -60,7 +64,8 @@ trait Json4sSupport {
         case (data, charset)       => data.decodeString(charset.nioCharset.name)
       }
 
-  private val jsonStringMarshaller = Marshaller.stringMarshaller(`application/json`)
+  private val jsonStringMarshaller =
+    Marshaller.oneOf(mediaTypes: _*)(Marshaller.stringMarshaller)
 
   /**
     * HTTP entity => `A`

diff --git a/akka-http-play-json/src/main/scala/de/heikoseeberger/akkahttpplayjson/PlayJsonSupport.scala b/akka-http-play-json/src/main/scala/de/heikoseeberger/akkahttpplayjson/PlayJsonSupport.scala
@@ -18,6 +18,7 @@ package de.heikoseeberger.akkahttpplayjson
 
 import akka.http.scaladsl.marshalling.{ Marshaller, ToEntityMarshaller }
 import akka.http.scaladsl.model.ContentTypeRange
+import akka.http.scaladsl.model.MediaType
 import akka.http.scaladsl.model.MediaTypes.`application/json`
 import akka.http.scaladsl.server.{ RejectionError, ValidationRejection }
 import akka.http.scaladsl.unmarshalling.{ FromEntityUnmarshaller, Unmarshaller }
@@ -43,6 +44,9 @@ trait PlayJsonSupport {
   import PlayJsonSupport._
 
   def unmarshallerContentTypes: Seq[ContentTypeRange] =
+    mediaTypes.map(ContentTypeRange.apply)
+
+  def mediaTypes: Seq[MediaType.WithFixedCharset] =
     List(`application/json`)
 
   private val jsonStringUnmarshaller =
@@ -53,7 +57,8 @@ trait PlayJsonSupport {
         case (data, charset)       => data.decodeString(charset.nioCharset.name)
       }
 
-  private val jsonStringMarshaller = Marshaller.stringMarshaller(`application/json`)
+  private val jsonStringMarshaller =
+    Marshaller.oneOf(mediaTypes: _*)(Marshaller.stringMarshaller)
 
   /**
     * HTTP entity => `A`

diff --git a/akka-http-upickle/src/main/scala/de/heikoseeberger/akkahttpupickle/UpickleSupport.scala b/akka-http-upickle/src/main/scala/de/heikoseeberger/akkahttpupickle/UpickleSupport.scala
@@ -18,6 +18,7 @@ package de.heikoseeberger.akkahttpupickle
 
 import akka.http.scaladsl.marshalling.{ Marshaller, ToEntityMarshaller }
 import akka.http.scaladsl.model.ContentTypeRange
+import akka.http.scaladsl.model.MediaType
 import akka.http.scaladsl.model.MediaTypes.`application/json`
 import akka.http.scaladsl.unmarshalling.{ FromEntityUnmarshaller, Unmarshaller }
 import akka.util.ByteString
@@ -36,6 +37,9 @@ object UpickleSupport extends UpickleSupport
 trait UpickleSupport {
 
   def unmarshallerContentTypes: Seq[ContentTypeRange] =
+    mediaTypes.map(ContentTypeRange.apply)
+
+  def mediaTypes: Seq[MediaType.WithFixedCharset] =
     List(`application/json`)
 
   private val jsonStringUnmarshaller =
@@ -46,7 +50,8 @@ trait UpickleSupport {
         case (data, charset)       => data.decodeString(charset.nioCharset.name)
       }
 
-  private val jsonStringMarshaller = Marshaller.stringMarshaller(`application/json`)
+  private val jsonStringMarshaller =
+    Marshaller.oneOf(mediaTypes: _*)(Marshaller.stringMarshaller)
 
   /**
     * HTTP entity => `A`