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

+htp add RequestContext.materializer

Browse source
This commit is contained in:
Johannes Rudolph 2015-07-10 19:10:47 +02:00
parent 318ad0a849
commit 16d4b4a331
2 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
akka-http/src/main/scala/akka/http/impl/server/RequestContextImpl.scala
View file

@ -4,6 +4,10 @@
package akka.http.impl.server
import akka.http.javadsl.model.ContentType
import akka.http.scaladsl.model.HttpEntity
import akka.stream.Materializer
import scala.concurrent.{ ExecutionContext, Future }
import akka.http.javadsl.{ model ⇒ jm }
import akka.http.impl.util.JavaMapping.Implicits._
@ -23,8 +27,11 @@ private[http] final case class RequestContextImpl(underlying: ScalaRequestContex
def completeWith(futureResult: Future[RouteResult]): RouteResult =
futureResult.flatMap {
case r: RouteResultImpl ⇒ r.underlying
}(executionContext)
}(executionContext())
def complete(text: String): RouteResult = underlying.complete(text)
def complete(contentType: ContentType, text: String): RouteResult =
underlying.complete(HttpEntity(contentType.asScala, text))
def completeWithStatus(statusCode: Int): RouteResult =
completeWithStatus(jm.StatusCodes.get(statusCode))
def completeWithStatus(statusCode: jm.StatusCode): RouteResult =
@ -39,5 +46,6 @@ private[http] final case class RequestContextImpl(underlying: ScalaRequestContex
def notFound(): RouteResult = underlying.reject()
def executionContext: ExecutionContext = underlying.executionContext
def executionContext(): ExecutionContext = underlying.executionContext
def materializer(): Materializer = underlying.materializer
}