Merge branch 'master' of https://github.com/drivergroup/driver-core into service-dependencies

# Conflicts:
#	src/main/scala/xyz/driver/core/app.scala
#	src/main/scala/xyz/driver/core/rest.scala

3 files changed, 10 insertions, 5 deletions

diff --git a/src/main/scala/xyz/driver/core/app.scala b/src/main/scala/xyz/driver/core/app.scala
index a14da76..c4f72ad 100644
--- a/src/main/scala/xyz/driver/core/app.scala
+++ b/src/main/scala/xyz/driver/core/app.scala
@@ -126,9 +126,14 @@ object app {
             val swagger: Swagger = reader.read(toJavaTypeSet(apiTypes).asJava)
 
             // Removing trailing spaces
-            swagger.setPaths(swagger.getPaths.asScala.map { case (key, path) =>
-              key.trim -> path
-            }.toMap.asJava)
+            swagger.setPaths(
+              swagger.getPaths.asScala
+                .map {
+                  case (key, path) =>
+                    key.trim -> path
+                }
+                .toMap
+                .asJava)
 
             Json.pretty().writeValueAsString(swagger)
           } catch {
diff --git a/src/main/scala/xyz/driver/core/json.scala b/src/main/scala/xyz/driver/core/json.scala
index b9d0745..b203c91 100644
--- a/src/main/scala/xyz/driver/core/json.scala
+++ b/src/main/scala/xyz/driver/core/json.scala
@@ -18,7 +18,8 @@ import xyz.driver.core.time.Time
 object json {
   import DefaultJsonProtocol._
 
-  private def UuidInPath[T]: PathMatcher1[Id[T]] = PathMatchers.JavaUUID.map((id: UUID) => Id[T](id.toString.toLowerCase))
+  private def UuidInPath[T]: PathMatcher1[Id[T]] =
+    PathMatchers.JavaUUID.map((id: UUID) => Id[T](id.toString.toLowerCase))
 
   def IdInPath[T]: PathMatcher1[Id[T]] = UuidInPath[T] | new PathMatcher1[Id[T]] {
     def apply(path: Path) = path match {
diff --git a/src/main/scala/xyz/driver/core/rest.scala b/src/main/scala/xyz/driver/core/rest.scala
index d4425fe..cbd671e 100644
--- a/src/main/scala/xyz/driver/core/rest.scala
+++ b/src/main/scala/xyz/driver/core/rest.scala
@@ -21,7 +21,6 @@ import akka.util.ByteString
 import com.github.swagger.akka.model._
 import com.github.swagger.akka.{HasActorSystem, SwaggerHttpService}
 import com.typesafe.config.Config
-import com.typesafe.scalalogging.Logger
 import io.swagger.models.Scheme
 import pdi.jwt.{Jwt, JwtAlgorithm}
 import xyz.driver.core.auth._