aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/core/rest.scala
diff options
context:
space:
mode:
authorvlad <vlad@driver.xyz>2017-08-07 14:34:07 -0700
committervlad <vlad@driver.xyz>2017-08-07 14:34:07 -0700
commit2283b61115fc94029f4772e2fbd05eaabb2ad5a8 (patch)
treead2c4bf5bc1295d1318baea92ac34443803009a8 /src/main/scala/xyz/driver/core/rest.scala
parenta1e2e7b9ed43a8a0757a4c678ea855d97f1a16c8 (diff)
parent886415aa5f86e758d9a9aafa8f60128e3473311a (diff)
downloaddriver-core-2283b61115fc94029f4772e2fbd05eaabb2ad5a8.tar.gz
driver-core-2283b61115fc94029f4772e2fbd05eaabb2ad5a8.tar.bz2
driver-core-2283b61115fc94029f4772e2fbd05eaabb2ad5a8.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/main/scala/xyz/driver/core/rest.scala')
-rw-r--r--src/main/scala/xyz/driver/core/rest.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/scala/xyz/driver/core/rest.scala b/src/main/scala/xyz/driver/core/rest.scala
index 1088e40..2527b75 100644
--- a/src/main/scala/xyz/driver/core/rest.scala
+++ b/src/main/scala/xyz/driver/core/rest.scala
@@ -91,7 +91,7 @@ object `package` {
case Seq(start, end) =>
builder += ' '
builder ++= byteString.slice(start, end)
- case Seq(byteStringLength) => // Should not match; sliding on at least 2 elements
+ case Seq(_) => // Should not match; sliding on at least 2 elements
assert(indices.nonEmpty, s"Indices should have been nonEmpty: $indices")
}
builder.result
@@ -205,7 +205,7 @@ trait Authorization[U <: User] {
implicit ctx: ServiceRequestContext): Future[AuthorizationResult]
}
-class AlwaysAllowAuthorization[U <: User](implicit execution: ExecutionContext) extends Authorization[U] {
+class AlwaysAllowAuthorization[U <: User] extends Authorization[U] {
override def userHasPermissions(user: U, permissions: Seq[Permission])(
implicit ctx: ServiceRequestContext): Future[AuthorizationResult] = {
val permissionsMap = permissions.map(_ -> true).toMap
@@ -427,9 +427,9 @@ class HttpRestServiceTransport(applicationName: Name[App],
val request = requestStub
.withHeaders(context.contextHeaders.toSeq.map {
- case (ContextHeaders.TrackingIdHeader, headerValue) =>
+ case (ContextHeaders.TrackingIdHeader, _) =>
RawHeader(ContextHeaders.TrackingIdHeader, context.trackingId)
- case (ContextHeaders.StacktraceHeader, headerValue) =>
+ case (ContextHeaders.StacktraceHeader, _) =>
RawHeader(ContextHeaders.StacktraceHeader,
Option(MDC.get("stack"))
.orElse(context.contextHeaders.get(ContextHeaders.StacktraceHeader))