diff options
author | vlad <vlad@drivergrp.com> | 2016-07-19 15:01:30 -0400 |
---|---|---|
committer | vlad <vlad@drivergrp.com> | 2016-07-19 15:01:30 -0400 |
commit | 979ff9e765e3c08501cbd00354a87013853fe796 (patch) | |
tree | c5d41ed99759c3bf97ba4ef9162aeb68ed4c29f8 /src/main/scala/com/drivergrp/core/app.scala | |
parent | 8d45c2ec5e8abc63046c610109471cc3fa7bfaa2 (diff) | |
download | driver-core-979ff9e765e3c08501cbd00354a87013853fe796.tar.gz driver-core-979ff9e765e3c08501cbd00354a87013853fe796.tar.bz2 driver-core-979ff9e765e3c08501cbd00354a87013853fe796.zip |
Unit tests for core code and bug fixes
Diffstat (limited to 'src/main/scala/com/drivergrp/core/app.scala')
-rw-r--r-- | src/main/scala/com/drivergrp/core/app.scala | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/main/scala/com/drivergrp/core/app.scala b/src/main/scala/com/drivergrp/core/app.scala index 13663ab..4639fc0 100644 --- a/src/main/scala/com/drivergrp/core/app.scala +++ b/src/main/scala/com/drivergrp/core/app.scala @@ -52,14 +52,22 @@ object app { } protected def bindHttp(modules: Seq[Module]): Unit = { - import SprayJsonSupport._ - import DefaultJsonProtocol._ - val serviceTypes = modules.flatMap(_.routeTypes) val swaggerService = new Swagger(actorSystem, serviceTypes, config) val swaggerRoutes = swaggerService.routes ~ swaggerService.swaggerUI + val versionRt = versionRoute(version, buildNumber) + + val _ = http.bindAndHandle( + route2HandlerFlow(logRequestResult("log")(modules.map(_.route).foldLeft(versionRt ~ swaggerRoutes)(_ ~ _))), + interface, + port)(materializer) + } - val versionRoute = path("version") { + protected def versionRoute(version: String, buildNumber: Int) = { + import SprayJsonSupport._ + import DefaultJsonProtocol._ + + path("version") { complete( Map( "version" -> version, @@ -67,12 +75,6 @@ object app { "serverTime" -> time.currentTime().millis.toString )) } - - val _ = http.bindAndHandle( - route2HandlerFlow( - logRequestResult("log")(modules.map(_.route).foldLeft(versionRoute ~ swaggerRoutes)(_ ~ _))), - interface, - port)(materializer) } /** |