From 43c29ea035c5d50789d42e55482d49640db4aa75 Mon Sep 17 00:00:00 2001
From: vlad <vlad@driver.xyz>
Date: Tue, 28 Feb 2017 11:19:03 -0800
Subject: Need less data to extract ServiceRequestContext

---
 src/main/scala/xyz/driver/core/rest.scala | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/main/scala/xyz/driver/core/rest.scala')

diff --git a/src/main/scala/xyz/driver/core/rest.scala b/src/main/scala/xyz/driver/core/rest.scala
index d3e7f8a..8bd200e 100644
--- a/src/main/scala/xyz/driver/core/rest.scala
+++ b/src/main/scala/xyz/driver/core/rest.scala
@@ -46,19 +46,19 @@ object rest {
   import akka.http.scaladsl.server._
   import Directives._
 
-  def serviceContext: Directive1[ServiceRequestContext] = extract(ctx => extractServiceContext(ctx))
+  def serviceContext: Directive1[ServiceRequestContext] = extract(ctx => extractServiceContext(ctx.request))
 
-  def extractServiceContext(ctx: RequestContext): ServiceRequestContext =
-    ServiceRequestContext(extractTrackingId(ctx), extractContextHeaders(ctx))
+  def extractServiceContext(request: HttpRequest): ServiceRequestContext =
+    ServiceRequestContext(extractTrackingId(request), extractContextHeaders(request))
 
-  def extractTrackingId(ctx: RequestContext): String = {
-    ctx.request.headers
+  def extractTrackingId(request: HttpRequest): String = {
+    request.headers
       .find(_.name == ContextHeaders.TrackingIdHeader)
       .fold(java.util.UUID.randomUUID.toString)(_.value())
   }
 
-  def extractContextHeaders(ctx: RequestContext): Map[String, String] = {
-    ctx.request.headers.filter { h =>
+  def extractContextHeaders(request: HttpRequest): Map[String, String] = {
+    request.headers.filter { h =>
       h.name === ContextHeaders.AuthenticationTokenHeader || h.name === ContextHeaders.TrackingIdHeader
       // || ContextHeaders.LinkerD.isLinkerD(h.lowercaseName)
     } map { header =>
-- 
cgit v1.2.3