From 8a34b953fa480bfea7e80a46eb4de6b20b4bca68 Mon Sep 17 00:00:00 2001
From: Zach Smith <zach@driver.xyz>
Date: Mon, 16 Oct 2017 09:47:54 -0700
Subject: Move AuthorizedServiceRequestContext into ServiceRequestContext.scala

---
 .../rest/AuthorizedServiceRequestContext.scala     | 27 ----------------------
 .../driver/core/rest/ServiceRequestContext.scala   | 23 ++++++++++++++++++
 2 files changed, 23 insertions(+), 27 deletions(-)
 delete mode 100644 src/main/scala/xyz/driver/core/rest/AuthorizedServiceRequestContext.scala

diff --git a/src/main/scala/xyz/driver/core/rest/AuthorizedServiceRequestContext.scala b/src/main/scala/xyz/driver/core/rest/AuthorizedServiceRequestContext.scala
deleted file mode 100644
index 1cf62c9..0000000
--- a/src/main/scala/xyz/driver/core/rest/AuthorizedServiceRequestContext.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-package xyz.driver.core.rest
-
-import xyz.driver.core.auth.{PermissionsToken, User}
-import xyz.driver.core.generators
-
-class AuthorizedServiceRequestContext[U <: User](override val trackingId: String = generators.nextUuid().toString,
-                                                 override val contextHeaders: Map[String, String] =
-                                                   Map.empty[String, String],
-                                                 val authenticatedUser: U)
-    extends ServiceRequestContext {
-
-  def withPermissionsToken(permissionsToken: PermissionsToken): AuthorizedServiceRequestContext[U] =
-    new AuthorizedServiceRequestContext[U](
-      trackingId,
-      contextHeaders.updated(AuthProvider.PermissionsTokenHeader, permissionsToken.value),
-      authenticatedUser)
-
-  override def hashCode(): Int = 31 * super.hashCode() + authenticatedUser.hashCode()
-
-  override def equals(obj: Any): Boolean = obj match {
-    case ctx: AuthorizedServiceRequestContext[U] => super.equals(ctx) && ctx.authenticatedUser == authenticatedUser
-    case _                                       => false
-  }
-
-  override def toString: String =
-    s"AuthorizedServiceRequestContext($trackingId, $contextHeaders, $authenticatedUser)"
-}
diff --git a/src/main/scala/xyz/driver/core/rest/ServiceRequestContext.scala b/src/main/scala/xyz/driver/core/rest/ServiceRequestContext.scala
index 5235da6..4020d57 100644
--- a/src/main/scala/xyz/driver/core/rest/ServiceRequestContext.scala
+++ b/src/main/scala/xyz/driver/core/rest/ServiceRequestContext.scala
@@ -37,3 +37,26 @@ class ServiceRequestContext(val trackingId: String = generators.nextUuid().toStr
 
   override def toString: String = s"ServiceRequestContext($trackingId, $contextHeaders)"
 }
+
+class AuthorizedServiceRequestContext[U <: User](override val trackingId: String = generators.nextUuid().toString,
+                                                 override val contextHeaders: Map[String, String] =
+                                                   Map.empty[String, String],
+                                                 val authenticatedUser: U)
+    extends ServiceRequestContext {
+
+  def withPermissionsToken(permissionsToken: PermissionsToken): AuthorizedServiceRequestContext[U] =
+    new AuthorizedServiceRequestContext[U](
+      trackingId,
+      contextHeaders.updated(AuthProvider.PermissionsTokenHeader, permissionsToken.value),
+      authenticatedUser)
+
+  override def hashCode(): Int = 31 * super.hashCode() + authenticatedUser.hashCode()
+
+  override def equals(obj: Any): Boolean = obj match {
+    case ctx: AuthorizedServiceRequestContext[U] => super.equals(ctx) && ctx.authenticatedUser == authenticatedUser
+    case _                                       => false
+  }
+
+  override def toString: String =
+    s"AuthorizedServiceRequestContext($trackingId, $contextHeaders, $authenticatedUser)"
+}
-- 
cgit v1.2.3