raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

=htp #19397,#19842 fix content negotiation for non 2xx and Accept handling

Browse source
This commit is contained in:
Konrad Malawski 2016-02-23 02:38:17 +01:00
parent 2d8ed0a8e2
commit a253014ef4
6 changed files with 83 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
akka-http/src/main/scala/akka/http/scaladsl/server/RequestContextImpl.scala
View file

@ -37,10 +37,11 @@ private[http] class RequestContextImpl(
override def complete(trm: ToResponseMarshallable): Future[RouteResult] =
trm(request)(executionContext)
.fast.map(res ⇒ RouteResult.Complete(res))(executionContext)
.fast.recover {
.fast.recoverWith {
case Marshal.UnacceptableResponseContentTypeException(supported) ⇒
RouteResult.Rejected(UnacceptedResponseContentTypeRejection(supported) :: Nil)
case RejectionError(rej) ⇒ RouteResult.Rejected(rej :: Nil)
attemptRecoveryFromUnacceptableResponseContentTypeException(trm, supported)
case RejectionError(rej) ⇒
Future.successful(RouteResult.Rejected(rej :: Nil))
}(executionContext)
override def reject(rejections: Rejection*): Future[RouteResult] =
@ -89,6 +90,13 @@ private[http] class RequestContextImpl(
case _ ⇒ this
}
/** Attempts recovering from the special case when non-2xx response is sent, yet content negotiation was unable to find a match. */
private def attemptRecoveryFromUnacceptableResponseContentTypeException(trm: ToResponseMarshallable, supported: Set[ContentNegotiator.Alternative]): Future[RouteResult] =
trm.value match {
case (status: StatusCode, value) if !status.isSuccess ⇒ this.withAcceptAll.complete(trm) // retry giving up content negotiation
case _ ⇒ Future.successful(RouteResult.Rejected(UnacceptedResponseContentTypeRejection(supported) :: Nil))
}
private def copy(request: HttpRequest = request,
unmatchedPath: Uri.Path = unmatchedPath,
executionContext: ExecutionContextExecutor = executionContext,