diff options
author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-10-27 12:41:33 +0700 |
---|---|---|
committer | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-10-27 12:41:33 +0700 |
commit | d9440a727edd25f2472754dc51b0206d6abbeba4 (patch) | |
tree | 1e7a123e5f28c7b5adfa4962971a550d247c28dd /src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala | |
parent | b27ba47906e48e9fc59d65893c71309303f73fc8 (diff) | |
parent | fde83eb31ef4f2c2334b41d3a727239c034bfd63 (diff) | |
download | rest-query-d9440a727edd25f2472754dc51b0206d6abbeba4.tar.gz rest-query-d9440a727edd25f2472754dc51b0206d6abbeba4.tar.bz2 rest-query-d9440a727edd25f2472754dc51b0206d6abbeba4.zip |
Merge branch 'master' into PDSUI-2336
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala b/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala index fd1856b..37e7687 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala @@ -3,6 +3,7 @@ package xyz.driver.pdsuicommon.http import akka.http.scaladsl.server._ import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.model._ +import xyz.driver.core.app.DriverApp import xyz.driver.core.rest.ContextHeaders import xyz.driver.entities.users.AuthUserInfo import xyz.driver.pdsuicommon.auth._ @@ -88,7 +89,7 @@ trait Directives { val text = errorsResponseJsonFormat.write(err).toString() HttpEntity(ContentTypes.`application/json`, text) } - RejectionHandler.default.mapRejectionResponse { + DriverApp.rejectionHandler.mapRejectionResponse { case res @ HttpResponse(_, _, ent: HttpEntity.Strict, _) => res.copy(entity = wrapContent(ent.data.utf8String)) case x => x // pass through all other types of responses |