diff options
Diffstat (limited to 'src/main/scala/xyz/driver/core/app/module.scala')
-rw-r--r-- | src/main/scala/xyz/driver/core/app/module.scala | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/main/scala/xyz/driver/core/app/module.scala b/src/main/scala/xyz/driver/core/app/module.scala index c6f979f..bbb29f4 100644 --- a/src/main/scala/xyz/driver/core/app/module.scala +++ b/src/main/scala/xyz/driver/core/app/module.scala @@ -3,7 +3,8 @@ package xyz.driver.core.app import akka.http.scaladsl.model.StatusCodes import akka.http.scaladsl.server.Directives.complete import akka.http.scaladsl.server.{Route, RouteConcatenation} -import xyz.driver.core.rest.{NoServiceDiscovery, SavingUsedServiceDiscovery, ServiceDiscovery} +import com.typesafe.scalalogging.Logger +import xyz.driver.core.rest.{DriverRoute, NoServiceDiscovery, SavingUsedServiceDiscovery, ServiceDiscovery} import scala.reflect.runtime.universe._ @@ -21,17 +22,22 @@ trait Module { class EmptyModule extends Module { override val name: String = "Nothing" - override def route: Route = complete(StatusCodes.OK) - + override def route: Route = complete(StatusCodes.OK) override def routeTypes: Seq[Type] = Seq.empty[Type] } -class SimpleModule(override val name: String, override val route: Route, routeType: Type) extends Module { - def routeTypes: Seq[Type] = Seq(routeType) +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 log: Logger = xyz.driver.core.logging.NoLogger + } + + override def route: Route = driverRoute.routeWithDefaults + override def routeTypes: Seq[Type] = Seq(routeType) } /** - * Module implementation which may be used to composed a few + * Module implementation which may be used to compose multiple modules * * @param name more general name of the composite module, * must be provided as there is no good way to automatically @@ -39,12 +45,8 @@ class SimpleModule(override val name: String, override val route: Route, routeTy * @param modules modules to compose into a single one */ class CompositeModule(override val name: String, modules: Seq[Module]) extends Module with RouteConcatenation { - - override def route: Route = RouteConcatenation.concat(modules.map(_.route): _*) - + override def route: Route = RouteConcatenation.concat(modules.map(_.route): _*) override def routeTypes: Seq[Type] = modules.flatMap(_.routeTypes) - - override def activate(): Unit = modules.foreach(_.activate()) - - override def deactivate(): Unit = modules.reverse.foreach(_.deactivate()) + override def activate(): Unit = modules.foreach(_.activate()) + override def deactivate(): Unit = modules.reverse.foreach(_.deactivate()) } |