From 472037994434e58def0c594e141703240a4e6c2a Mon Sep 17 00:00:00 2001 From: vlad Date: Tue, 27 Sep 2016 11:45:08 -0700 Subject: Api version to Swagger from the build --- src/main/scala/com/drivergrp/core/app.scala | 2 +- src/main/scala/com/drivergrp/core/rest.scala | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main/scala/com') diff --git a/src/main/scala/com/drivergrp/core/app.scala b/src/main/scala/com/drivergrp/core/app.scala index 17c63f5..a1e1082 100644 --- a/src/main/scala/com/drivergrp/core/app.scala +++ b/src/main/scala/com/drivergrp/core/app.scala @@ -57,7 +57,7 @@ object app { protected def bindHttp(modules: Seq[Module]): Unit = { val serviceTypes = modules.flatMap(_.routeTypes) - val swaggerService = new Swagger(baseUrl, actorSystem, serviceTypes, config) + val swaggerService = new Swagger(baseUrl, version, actorSystem, serviceTypes, config) val swaggerRoutes = swaggerService.routes ~ swaggerService.swaggerUI val versionRt = versionRoute(version, gitHash, time.currentTime()) diff --git a/src/main/scala/com/drivergrp/core/rest.scala b/src/main/scala/com/drivergrp/core/rest.scala index 89a0c75..0d718c9 100644 --- a/src/main/scala/com/drivergrp/core/rest.scala +++ b/src/main/scala/com/drivergrp/core/rest.scala @@ -89,6 +89,7 @@ object rest { import scala.reflect.runtime.universe._ class Swagger(override val host: String, + version: String, override val actorSystem: ActorSystem, override val apiTypes: Seq[Type], val config: Config) extends SwaggerHttpService with HasActorSystem { @@ -100,7 +101,7 @@ object rest { override val info = Info( config.getString("swagger.apiInfo.description"), - config.getString("swagger.apiVersion"), + version, config.getString("swagger.apiInfo.title"), config.getString("swagger.apiInfo.termsOfServiceUrl"), contact = Some(Contact( -- cgit v1.2.3