aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Smith <zach@driver.xyz>2018-02-26 10:25:56 -0800
committerZach Smith <zach@driver.xyz>2018-02-26 10:25:56 -0800
commitdd0e04e63836ed3b8dd2870200a6dd0a8fd0d9ed (patch)
treeb1b87205372d067a20f2d2a6a65fba785d51899d
parent4de3c543151fb230903d8302ced30c916683a3af (diff)
downloaddriver-core-dd0e04e63836ed3b8dd2870200a6dd0a8fd0d9ed.tar.gz
driver-core-dd0e04e63836ed3b8dd2870200a6dd0a8fd0d9ed.tar.bz2
driver-core-dd0e04e63836ed3b8dd2870200a6dd0a8fd0d9ed.zip
Remove unused abstract config from DriverRoute
-rw-r--r--src/main/scala/xyz/driver/core/app/DriverApp.scala5
-rw-r--r--src/main/scala/xyz/driver/core/app/module.scala5
-rw-r--r--src/main/scala/xyz/driver/core/rest/DriverRoute.scala5
-rw-r--r--src/test/scala/xyz/driver/core/rest/DriverRouteTest.scala10
4 files changed, 5 insertions, 20 deletions
diff --git a/src/main/scala/xyz/driver/core/app/DriverApp.scala b/src/main/scala/xyz/driver/core/app/DriverApp.scala
index ca3dd54..bf18c3d 100644
--- a/src/main/scala/xyz/driver/core/app/DriverApp.scala
+++ b/src/main/scala/xyz/driver/core/app/DriverApp.scala
@@ -121,9 +121,8 @@ class DriverApp(
val swaggerRoute = swaggerService.routes ~ swaggerService.swaggerUI
val versionRt = versionRoute(version, gitHash, time.currentTime())
val basicRoutes = new DriverRoute {
- override def log: Logger = self.log
- override def config: Config = self.config
- override def route: Route = versionRt ~ healthRoute ~ swaggerRoute
+ override def log: Logger = self.log
+ override def route: Route = versionRt ~ healthRoute ~ swaggerRoute
}
val combinedRoute =
Route.seal(modules.map(_.route).foldLeft(basicRoutes.routeWithDefaults)(_ ~ _) ~ defaultOptionsRoute)
diff --git a/src/main/scala/xyz/driver/core/app/module.scala b/src/main/scala/xyz/driver/core/app/module.scala
index 0a255fb..7be38eb 100644
--- a/src/main/scala/xyz/driver/core/app/module.scala
+++ b/src/main/scala/xyz/driver/core/app/module.scala
@@ -30,9 +30,8 @@ class EmptyModule extends Module {
class SimpleModule(override val name: String, theRoute: Route, routeType: Type) extends Module {
private val driverRoute: DriverRoute = new DriverRoute {
- override def route: Route = theRoute
- override val config: Config = xyz.driver.core.config.loadDefaultConfig
- override val log: Logger = xyz.driver.core.logging.NoLogger
+ override def route: Route = theRoute
+ override val log: Logger = xyz.driver.core.logging.NoLogger
}
override def route: Route = driverRoute.routeWithDefaults
diff --git a/src/main/scala/xyz/driver/core/rest/DriverRoute.scala b/src/main/scala/xyz/driver/core/rest/DriverRoute.scala
index 15da808..674a0c4 100644
--- a/src/main/scala/xyz/driver/core/rest/DriverRoute.scala
+++ b/src/main/scala/xyz/driver/core/rest/DriverRoute.scala
@@ -2,12 +2,10 @@ package xyz.driver.core.rest
import java.sql.SQLException
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.model.StatusCodes
+import akka.http.scaladsl.model.{StatusCodes, _}
import akka.http.scaladsl.model.headers._
import akka.http.scaladsl.server.Directives._
import akka.http.scaladsl.server._
-import com.typesafe.config.Config
import com.typesafe.scalalogging.Logger
import org.slf4j.MDC
import xyz.driver.core.rest
@@ -17,7 +15,6 @@ import scala.compat.Platform.ConcurrentModificationException
trait DriverRoute {
def log: Logger
- def config: Config
def route: Route
diff --git a/src/test/scala/xyz/driver/core/rest/DriverRouteTest.scala b/src/test/scala/xyz/driver/core/rest/DriverRouteTest.scala
index ce3daa8..15693a0 100644
--- a/src/test/scala/xyz/driver/core/rest/DriverRouteTest.scala
+++ b/src/test/scala/xyz/driver/core/rest/DriverRouteTest.scala
@@ -4,7 +4,6 @@ import akka.http.scaladsl.model.StatusCodes
import akka.http.scaladsl.server.Directives.{complete => akkaComplete}
import akka.http.scaladsl.server.{Directives, Route}
import akka.http.scaladsl.testkit.ScalatestRouteTest
-import com.typesafe.config.{Config, ConfigFactory}
import com.typesafe.scalalogging.Logger
import org.scalatest.{AsyncFlatSpec, Matchers}
import xyz.driver.core.logging.NoLogger
@@ -15,15 +14,6 @@ import scala.concurrent.Future
class DriverRouteTest extends AsyncFlatSpec with ScalatestRouteTest with Matchers with Directives {
class TestRoute(override val route: Route) extends DriverRoute {
override def log: Logger = NoLogger
- override def config: Config =
- ConfigFactory.parseString("""
- |application {
- | cors {
- | allowedMethods: ["GET", "PUT", "POST", "PATCH", "DELETE", "OPTIONS"]
- | allowedOrigins: [{scheme: https, hostSuffix: example.com}]
- | }
- |}
- """.stripMargin)
}
"DriverRoute" should "respond with 200 OK for a basic route" in {