diff options
| author | Jakob Odersky <jakob@driver.xyz> | 2017-06-27 15:49:21 -0700 |
|---|---|---|
| committer | Jakob Odersky <jakob@driver.xyz> | 2017-08-02 12:55:24 -0700 |
| commit | f1328134ada77d1c21374f7cca953a376a9b27f9 (patch) | |
| tree | c1cd78d7d59abd29185fa061309a3d9ca6cdf8fc /src/main/scala/xyz/driver/core/rest.scala | |
| parent | 59655964902b3c75e8e1f06e2f7d2cf038126fb3 (diff) | |
| download | driver-core-f1328134ada77d1c21374f7cca953a376a9b27f9.tar.gz driver-core-f1328134ada77d1c21374f7cca953a376a9b27f9.tar.bz2 driver-core-f1328134ada77d1c21374f7cca953a376a9b27f9.zip | |
Library upgrades and code tweaks to support Scala 2.12v0.15.0
Diffstat (limited to 'src/main/scala/xyz/driver/core/rest.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/core/rest.scala | 8 |
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)) |