aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/core/rest/HttpRestServiceTransport.scala
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2017-11-20 21:38:21 -0800
committerGitHub <noreply@github.com>2017-11-20 21:38:21 -0800
commitf2a56045d0b29291a18054607701d5863722121e (patch)
tree34b5fc63cc425a27969c73354fd7a2071ea67ba3 /src/main/scala/xyz/driver/core/rest/HttpRestServiceTransport.scala
parent8d30baada3a9c25ef61ef80511f4b4f25799f0cb (diff)
parentb872ee2649c7b56df413fbde746ee68312c17abd (diff)
downloaddriver-core-f2a56045d0b29291a18054607701d5863722121e.tar.gz
driver-core-f2a56045d0b29291a18054607701d5863722121e.tar.bz2
driver-core-f2a56045d0b29291a18054607701d5863722121e.zip
Merge pull request #91 from drivergroup/new-creds-and-format
New creds and format
Diffstat (limited to 'src/main/scala/xyz/driver/core/rest/HttpRestServiceTransport.scala')
-rw-r--r--src/main/scala/xyz/driver/core/rest/HttpRestServiceTransport.scala24
1 files changed, 13 insertions, 11 deletions
diff --git a/src/main/scala/xyz/driver/core/rest/HttpRestServiceTransport.scala b/src/main/scala/xyz/driver/core/rest/HttpRestServiceTransport.scala
index 376b154..235c61d 100644
--- a/src/main/scala/xyz/driver/core/rest/HttpRestServiceTransport.scala
+++ b/src/main/scala/xyz/driver/core/rest/HttpRestServiceTransport.scala
@@ -15,12 +15,13 @@ import xyz.driver.core.time.provider.TimeProvider
import scala.concurrent.{ExecutionContext, Future}
import scala.util.{Failure, Success}
-class HttpRestServiceTransport(applicationName: Name[App],
- applicationVersion: String,
- actorSystem: ActorSystem,
- executionContext: ExecutionContext,
- log: Logger,
- time: TimeProvider)
+class HttpRestServiceTransport(
+ applicationName: Name[App],
+ applicationVersion: String,
+ actorSystem: ActorSystem,
+ executionContext: ExecutionContext,
+ log: Logger,
+ time: TimeProvider)
extends ServiceTransport {
protected implicit val execution: ExecutionContext = executionContext
@@ -36,10 +37,11 @@ class HttpRestServiceTransport(applicationName: Name[App],
case (ContextHeaders.TrackingIdHeader, _) =>
RawHeader(ContextHeaders.TrackingIdHeader, context.trackingId)
case (ContextHeaders.StacktraceHeader, _) =>
- RawHeader(ContextHeaders.StacktraceHeader,
- Option(MDC.get("stack"))
- .orElse(context.contextHeaders.get(ContextHeaders.StacktraceHeader))
- .getOrElse(""))
+ RawHeader(
+ ContextHeaders.StacktraceHeader,
+ Option(MDC.get("stack"))
+ .orElse(context.contextHeaders.get(ContextHeaders.StacktraceHeader))
+ .getOrElse(""))
case (header, headerValue) => RawHeader(header, headerValue)
}: _*)
@@ -67,7 +69,7 @@ class HttpRestServiceTransport(applicationName: Name[App],
}
def sendRequest(context: ServiceRequestContext)(requestStub: HttpRequest)(
- implicit mat: Materializer): Future[Unmarshal[ResponseEntity]] = {
+ implicit mat: Materializer): Future[Unmarshal[ResponseEntity]] = {
sendRequestGetResponse(context)(requestStub) flatMap { response =>
if (response.status == StatusCodes.NotFound) {