From c2bf3f05366b37a0de47a000c171910fa0965d58 Mon Sep 17 00:00:00 2001 From: vlad Date: Mon, 18 Jul 2016 18:00:26 -0400 Subject: Added scalafmt to core --- src/main/scala/com/drivergrp/core/app.scala | 74 ++++++++++++++--------------- 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'src/main/scala/com/drivergrp/core/app.scala') diff --git a/src/main/scala/com/drivergrp/core/app.scala b/src/main/scala/com/drivergrp/core/app.scala index 5006761..488fdd3 100644 --- a/src/main/scala/com/drivergrp/core/app.scala +++ b/src/main/scala/com/drivergrp/core/app.scala @@ -6,11 +6,11 @@ import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport import akka.http.scaladsl.model.StatusCodes import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.RouteResult._ -import akka.http.scaladsl.server.{Route, RouteConcatenation} +import akka.http.scaladsl.server.{ Route, RouteConcatenation } import akka.stream.ActorMaterializer -import com.drivergrp.core.logging.{Logger, TypesafeScalaLogger} +import com.drivergrp.core.logging.{ Logger, TypesafeScalaLogger } import com.drivergrp.core.rest.Swagger -import com.drivergrp.core.time.provider.{SystemTimeProvider, TimeProvider} +import com.drivergrp.core.time.provider.{ SystemTimeProvider, TimeProvider } import com.typesafe.config.Config import org.slf4j.LoggerFactory import spray.json.DefaultJsonProtocol @@ -18,36 +18,36 @@ import spray.json.DefaultJsonProtocol import scala.concurrent.Await import scala.concurrent.duration._ - object app { - class DriverApp(version: String, buildNumber: Int, + class DriverApp(version: String, + buildNumber: Int, modules: Seq[Module], time: TimeProvider = new SystemTimeProvider(), log: Logger = new TypesafeScalaLogger( - com.typesafe.scalalogging.Logger(LoggerFactory.getLogger(classOf[DriverApp]))), + com.typesafe.scalalogging.Logger(LoggerFactory.getLogger(classOf[DriverApp]))), config: Config = com.drivergrp.core.config.loadDefaultConfig, - interface: String = "localhost", port: Int = 8080) { + interface: String = "localhost", + port: Int = 8080) { - implicit private lazy val actorSystem = ActorSystem("spray-routing", config) + implicit private lazy val actorSystem = ActorSystem("spray-routing", config) implicit private lazy val executionContext = actorSystem.dispatcher - implicit private lazy val materializer = ActorMaterializer()(actorSystem) - private lazy val http = Http()(actorSystem) - + implicit private lazy val materializer = ActorMaterializer()(actorSystem) + private lazy val http = Http()(actorSystem) def run() = { activateServices(modules) scheduleServicesDeactivation(modules) bindHttp(modules) - Console.print(s"${this.getClass.getName} App is started") + Console.print(s"${ this.getClass.getName } App is started") } def stop() = { http.shutdownAllConnectionPools().onComplete { _ => - val _ = actorSystem.terminate() - val terminated = Await.result(actorSystem.whenTerminated, 30.seconds) - val addressTerminated = if(terminated.addressTerminated) "is" else "is not" - Console.print(s"${this.getClass.getName} App $addressTerminated stopped ") + val _ = actorSystem.terminate() + val terminated = Await.result(actorSystem.whenTerminated, 30.seconds) + val addressTerminated = if (terminated.addressTerminated) "is" else "is not" + Console.print(s"${ this.getClass.getName } App $addressTerminated stopped ") } } @@ -55,22 +55,24 @@ object app { import SprayJsonSupport._ import DefaultJsonProtocol._ - val serviceTypes = modules.flatMap(_.routeTypes) + val serviceTypes = modules.flatMap(_.routeTypes) val swaggerService = new Swagger(actorSystem, serviceTypes, config) - val swaggerRoutes = swaggerService.routes ~ swaggerService.swaggerUI + val swaggerRoutes = swaggerService.routes ~ swaggerService.swaggerUI val versionRoute = path("version") { - complete(Map( - "version" -> version, - "buildNumber" -> buildNumber.toString, - "serverTime" -> time.currentTime().millis.toString - )) + complete( + Map( + "version" -> version, + "buildNumber" -> buildNumber.toString, + "serverTime" -> time.currentTime().millis.toString + )) } val _ = http.bindAndHandle( - route2HandlerFlow(logRequestResult("log")( - modules.map(_.route).foldLeft(versionRoute ~ swaggerRoutes)(_ ~ _))), - interface, port)(materializer) + route2HandlerFlow( + logRequestResult("log")(modules.map(_.route).foldLeft(versionRoute ~ swaggerRoutes)(_ ~ _))), + interface, + port)(materializer) } /** @@ -78,12 +80,12 @@ object app { */ protected def activateServices(services: Seq[Module]) = { services.foreach { service => - Console.print(s"Service ${service.name} starts ...") + Console.print(s"Service ${ service.name } starts ...") try { service.activate() } catch { case t: Throwable => - log.fatal(s"Service ${service.name} failed to activate", t) + log.fatal(s"Service ${ service.name } failed to activate", t) Console.print(" Failed! (check log)") } Console.println(" Done") @@ -97,12 +99,12 @@ object app { Runtime.getRuntime.addShutdownHook(new Thread() { override def run(): Unit = { services.foreach { service => - Console.print(s"Service ${service.name} shutting down ...") + Console.print(s"Service ${ service.name } shutting down ...") try { service.deactivate() } catch { case t: Throwable => - log.fatal(s"Service ${service.name} failed to deactivate", t) + log.fatal(s"Service ${ service.name } failed to deactivate", t) Console.print(" Failed! (check log)") } Console.println(" Done") @@ -112,7 +114,6 @@ object app { } } - import scala.reflect.runtime.universe._ trait Module { @@ -120,14 +121,14 @@ object app { def route: Route def routeTypes: Seq[Type] - def activate(): Unit = {} + def activate(): Unit = {} def deactivate(): Unit = {} } class EmptyModule extends Module { val name = "Nothing" def route: Route = complete(StatusCodes.OK) - def routeTypes = Seq.empty[Type] + def routeTypes = Seq.empty[Type] } class SimpleModule(val name: String, val route: Route, routeType: Type) extends Module { @@ -142,13 +143,12 @@ object app { * generalize the name from the composed modules' names * @param modules modules to compose into a single one */ - class CompositeModule(val name: String, modules: Seq[Module]) - extends Module with RouteConcatenation { + class CompositeModule(val name: String, modules: Seq[Module]) extends Module with RouteConcatenation { def route: Route = modules.map(_.route).reduce(_ ~ _) - def routeTypes = modules.flatMap(_.routeTypes) + def routeTypes = modules.flatMap(_.routeTypes) - override def activate() = modules.foreach(_.activate()) + override def activate() = modules.foreach(_.activate()) override def deactivate() = modules.reverse.foreach(_.deactivate()) } } -- cgit v1.2.3