Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build.sbt
#	src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala
#	src/main/scala/xyz/driver/pdsuicommon/domain/User.scala
#	src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiPartialUser.scala

1 files changed, 34 insertions, 0 deletions

diff --git a/src/main/scala/xyz/driver/pdsuicommon/serialization/PlayJsonSupport.scala b/src/main/scala/xyz/driver/pdsuicommon/serialization/PlayJsonSupport.scala
new file mode 100644
index 0000000..5158dab
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuicommon/serialization/PlayJsonSupport.scala
@@ -0,0 +1,34 @@
+package xyz.driver.pdsuicommon.serialization
+
+import akka.http.scaladsl.server.{RejectionError, ValidationRejection}
+import akka.http.scaladsl.unmarshalling.Unmarshaller
+import play.api.libs.json.{Reads, Writes}
+import play.api.libs.json.Json
+import akka.http.scaladsl.marshalling.ToEntityMarshaller
+import akka.http.scaladsl.unmarshalling.FromEntityUnmarshaller
+import akka.http.scaladsl.model.MediaTypes.`application/json`
+
+trait PlayJsonSupport {
+  import akka.http.scaladsl.marshalling.Marshaller
+
+  implicit def playJsonUnmarshaller[A: Reads]: FromEntityUnmarshaller[A] = {
+    val reads = implicitly[Reads[A]]
+    Unmarshaller.stringUnmarshaller
+      .forContentTypes(`application/json`)
+      .map(Json.parse)
+      .map(reads.reads)
+      .map(_.recoverTotal { error =>
+        throw RejectionError(ValidationRejection(s"Error reading JSON response as ${reads}."))
+      })
+  }
+
+  implicit def playJsonMarshaller[A: Writes]: ToEntityMarshaller[A] = {
+    Marshaller
+      .stringMarshaller(`application/json`)
+      .compose(Json.prettyPrint)
+      .compose(implicitly[Writes[A]].writes)
+  }
+
+}
+
+object PlayJsonSupport extends PlayJsonSupport