From 07c17c88bf9c71f38f6588cb4a49b8d4d9d70050 Mon Sep 17 00:00:00 2001
From: Zach Smith <zach@driver.xyz>
Date: Wed, 8 Nov 2017 13:25:05 -0800
Subject: OriginatingIP -> OriginatingIp

---
 src/main/scala/xyz/driver/core/rest/package.scala          |  8 ++++----
 .../scala/xyz/driver/core/rest/serviceRequestContext.scala | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/scala/xyz/driver/core/rest/package.scala b/src/main/scala/xyz/driver/core/rest/package.scala
index 012600e..3697d93 100644
--- a/src/main/scala/xyz/driver/core/rest/package.scala
+++ b/src/main/scala/xyz/driver/core/rest/package.scala
@@ -50,7 +50,7 @@ object `package` {
     val AuthenticationHeaderPrefix: String = "Bearer"
     val TrackingIdHeader: String           = "X-Trace"
     val StacktraceHeader: String           = "X-Stacktrace"
-    val OriginatingIPHeader: String        = "X-Forwarded-For"
+    val OriginatingIpHeader: String        = "X-Forwarded-For"
     val TraceHeaderName: String            = TracingDirectives.TraceHeaderName
     val SpanHeaderName: String             = TracingDirectives.SpanHeaderName
   }
@@ -80,7 +80,7 @@ object `package` {
       ContextHeaders.SpanHeaderName,
       ContextHeaders.StacktraceHeader,
       ContextHeaders.AuthenticationTokenHeader,
-      ContextHeaders.OriginatingIPHeader,
+      ContextHeaders.OriginatingIpHeader,
       "X-Frame-Options",
       "X-Content-Type-Options",
       "Strict-Transport-Security",
@@ -111,7 +111,7 @@ object `package` {
 
   def extractOriginatingIP(request: HttpRequest, remoteAddress: RemoteAddress): Option[InetAddress] = {
     request.headers
-      .find(_.name === ContextHeaders.OriginatingIPHeader)
+      .find(_.name === ContextHeaders.OriginatingIpHeader)
       .flatMap(ipName => Try(InetAddress.getByName(ipName.value)).toOption)
       .orElse(remoteAddress.toOption)
   }
@@ -124,7 +124,7 @@ object `package` {
       h.name === ContextHeaders.AuthenticationTokenHeader || h.name === ContextHeaders.TrackingIdHeader ||
       h.name === ContextHeaders.PermissionsTokenHeader || h.name === ContextHeaders.StacktraceHeader ||
       h.name === ContextHeaders.TraceHeaderName || h.name === ContextHeaders.SpanHeaderName ||
-      h.name === ContextHeaders.OriginatingIPHeader
+      h.name === ContextHeaders.OriginatingIpHeader
     } map { header =>
       if (header.name === ContextHeaders.AuthenticationTokenHeader) {
         header.name -> header.value.stripPrefix(ContextHeaders.AuthenticationHeaderPrefix).trim
diff --git a/src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala b/src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala
index bd8f078..58ff1f1 100644
--- a/src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala
+++ b/src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala
@@ -9,7 +9,7 @@ import scalaz.Scalaz.{mapEqual, stringInstance}
 import scalaz.syntax.equal._
 
 class ServiceRequestContext(val trackingId: String = generators.nextUuid().toString,
-                            val originatingIP: Option[InetAddress] = None,
+                            val originatingIp: Option[InetAddress] = None,
                             val contextHeaders: Map[String, String] = Map.empty[String, String]) {
   def authToken: Option[AuthToken] =
     contextHeaders.get(AuthProvider.AuthenticationTokenHeader).map(AuthToken.apply)
@@ -20,24 +20,24 @@ class ServiceRequestContext(val trackingId: String = generators.nextUuid().toStr
   def withAuthToken(authToken: AuthToken): ServiceRequestContext =
     new ServiceRequestContext(
       trackingId,
-      originatingIP,
+      originatingIp,
       contextHeaders.updated(AuthProvider.AuthenticationTokenHeader, authToken.value)
     )
 
   def withAuthenticatedUser[U <: User](authToken: AuthToken, user: U): AuthorizedServiceRequestContext[U] =
     new AuthorizedServiceRequestContext(
       trackingId,
-      originatingIP,
+      originatingIp,
       contextHeaders.updated(AuthProvider.AuthenticationTokenHeader, authToken.value),
       user
     )
 
   override def hashCode(): Int =
-    Seq[Any](trackingId, originatingIP, contextHeaders).foldLeft(31)((result, obj) => 31 * result + obj.hashCode())
+    Seq[Any](trackingId, originatingIp, contextHeaders).foldLeft(31)((result, obj) => 31 * result + obj.hashCode())
 
   override def equals(obj: Any): Boolean = obj match {
     case ctx: ServiceRequestContext =>
-      trackingId === ctx.trackingId && originatingIP == originatingIP && contextHeaders === ctx.contextHeaders
+      trackingId === ctx.trackingId && originatingIp == originatingIp && contextHeaders === ctx.contextHeaders
     case _ => false
   }
 
@@ -45,7 +45,7 @@ class ServiceRequestContext(val trackingId: String = generators.nextUuid().toStr
 }
 
 class AuthorizedServiceRequestContext[U <: User](override val trackingId: String = generators.nextUuid().toString,
-                                                 override val originatingIP: Option[InetAddress] = None,
+                                                 override val originatingIp: Option[InetAddress] = None,
                                                  override val contextHeaders: Map[String, String] =
                                                    Map.empty[String, String],
                                                  val authenticatedUser: U)
@@ -54,7 +54,7 @@ class AuthorizedServiceRequestContext[U <: User](override val trackingId: String
   def withPermissionsToken(permissionsToken: PermissionsToken): AuthorizedServiceRequestContext[U] =
     new AuthorizedServiceRequestContext[U](
       trackingId,
-      originatingIP,
+      originatingIp,
       contextHeaders.updated(AuthProvider.PermissionsTokenHeader, permissionsToken.value),
       authenticatedUser)
 
-- 
cgit v1.2.3