Add DriverRoute trait and clean up DriverApp

1 files changed, 19 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..6baa457 100644
--- a/src/main/scala/xyz/driver/core/app/module.scala
+++ b/src/main/scala/xyz/driver/core/app/module.scala
@@ -3,13 +3,14 @@ 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._
 
 trait Module {
   val name: String
-  def route: Route
+  def routes: Seq[DriverRoute]
   def routeTypes: Seq[Type]
 
   val serviceDiscovery: ServiceDiscovery with SavingUsedServiceDiscovery = new NoServiceDiscovery()
@@ -21,13 +22,22 @@ trait Module {
 class EmptyModule extends Module {
   override val name: String = "Nothing"
 
-  override def route: Route = complete(StatusCodes.OK)
+  override def routes: Seq[DriverRoute] =
+    Seq(new DriverRoute {
+      override def route: Route = complete(StatusCodes.OK)
+      override val log: Logger  = xyz.driver.core.logging.NoLogger
+    })
 
   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, route: Route, routeType: Type) extends Module { self =>
+  override def routes: Seq[DriverRoute] =
+    Seq(new DriverRoute {
+      override def route: Route = self.route
+      override val log: Logger  = xyz.driver.core.logging.NoLogger
+    })
+  override def routeTypes: Seq[Type] = Seq(routeType)
 }
 
 /**
@@ -39,12 +49,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 routeTypes: Seq[Type] = modules.flatMap(_.routeTypes)
-
-  override def activate(): Unit = modules.foreach(_.activate())
-
-  override def deactivate(): Unit = modules.reverse.foreach(_.deactivate())
+  override def routes: Seq[DriverRoute] = modules.flatMap(_.routes)
+  override def routeTypes: Seq[Type]    = modules.flatMap(_.routeTypes)
+  override def activate(): Unit         = modules.foreach(_.activate())
+  override def deactivate(): Unit       = modules.reverse.foreach(_.deactivate())
 }