From 9a3a3b4a97e0cc10d2dfeb247d36fd9fdce3bc97 Mon Sep 17 00:00:00 2001 From: Marcin Procyk Date: Thu, 24 Mar 2022 08:00:59 +0100 Subject: [PATCH 1/3] fix(version): fix displayed versions --- .../knora/webapi/routing/VersionRoute.scala | 47 +++++-------------- 1 file changed, 11 insertions(+), 36 deletions(-) diff --git a/webapi/src/main/scala/org/knora/webapi/routing/VersionRoute.scala b/webapi/src/main/scala/org/knora/webapi/routing/VersionRoute.scala index fed3dce5b0..e3c416e466 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/VersionRoute.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/VersionRoute.scala @@ -15,15 +15,6 @@ import spray.json.{JsObject, JsString} import scala.concurrent.duration._ -case class VersionCheckResult( - name: String, - webapi: String, - scala: String, - akkaHttp: String, - sipi: String, - fuseki: String -) - /** * Provides version check logic */ @@ -32,39 +23,23 @@ trait VersionCheck { override implicit val timeout: Timeout = 1.second - protected def createResponse(result: VersionCheckResult): HttpResponse = + protected def createResponse(): HttpResponse = { + val sipiVersion: String = BuildInfo.sipi.split(":").apply(1) + val fusekiVersion: String = BuildInfo.fuseki.split(":").apply(1) + HttpResponse( status = StatusCodes.OK, entity = HttpEntity( ContentTypes.`application/json`, JsObject( - "name" -> JsString(result.name), - "webapi" -> JsString(result.webapi), - "scala" -> JsString(result.scala), - "akkaHttp" -> JsString(result.akkaHttp), - "sipi" -> JsString(result.sipi), - "fuseki" -> JsString(result.fuseki) - ).compactPrint + "webapi" -> JsString(BuildInfo.version), + "scala" -> JsString(BuildInfo.scalaVersion), + "akkaHttp" -> JsString(BuildInfo.akkaHttp), + "sipi" -> JsString(sipiVersion), + "fuseki" -> JsString(fusekiVersion) + ).prettyPrint ) ) - - protected def getVersion: VersionCheckResult = { - var sipiVersion = BuildInfo.sipi - val sipiIndex = sipiVersion.indexOf(':') - sipiVersion = if (sipiIndex > 0) sipiVersion.substring(sipiIndex + 1) else sipiVersion - - var fusekiVersion = BuildInfo.fuseki - val fusekiIndex = fusekiVersion.indexOf(':') - fusekiVersion = if (fusekiIndex > 0) fusekiVersion.substring(fusekiIndex + 1) else fusekiVersion - - VersionCheckResult( - name = "version", - webapi = BuildInfo.version, - scala = BuildInfo.version, - akkaHttp = BuildInfo.akkaHttp, - sipi = sipiVersion, - fuseki = fusekiVersion - ) } } @@ -79,7 +54,7 @@ class VersionRoute(routeData: KnoraRouteData) extends KnoraRoute(routeData) with override def makeRoute(featureFactoryConfig: FeatureFactoryConfig): Route = path("version") { get { requestContext => - requestContext.complete(createResponse(getVersion)) + requestContext.complete(createResponse()) } } } From 5e8948b039f99abba255961e2d51a4fd3a1bdb4a Mon Sep 17 00:00:00 2001 From: Marcin Procyk Date: Thu, 24 Mar 2022 08:09:42 +0100 Subject: [PATCH 2/3] added missing name + formatting fix --- .../scala/org/knora/webapi/routing/VersionRoute.scala | 1 + .../scala/org/knora/webapi/it/VersionRouteITSpec.scala | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/webapi/src/main/scala/org/knora/webapi/routing/VersionRoute.scala b/webapi/src/main/scala/org/knora/webapi/routing/VersionRoute.scala index e3c416e466..fb492ba663 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/VersionRoute.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/VersionRoute.scala @@ -32,6 +32,7 @@ trait VersionCheck { entity = HttpEntity( ContentTypes.`application/json`, JsObject( + "name" -> JsString(BuildInfo.name), "webapi" -> JsString(BuildInfo.version), "scala" -> JsString(BuildInfo.scalaVersion), "akkaHttp" -> JsString(BuildInfo.akkaHttp), diff --git a/webapi/src/test/scala/org/knora/webapi/it/VersionRouteITSpec.scala b/webapi/src/test/scala/org/knora/webapi/it/VersionRouteITSpec.scala index c64baf13df..0ffc66bd60 100644 --- a/webapi/src/test/scala/org/knora/webapi/it/VersionRouteITSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/it/VersionRouteITSpec.scala @@ -17,10 +17,11 @@ import scala.concurrent.duration._ import scala.languageFeature.postfixOps object VersionRouteITSpec { - val config: Config = ConfigFactory.parseString(""" - |akka.loglevel = "DEBUG" - |akka.stdout-loglevel = "DEBUG" - """.stripMargin) + val config: Config = ConfigFactory.parseString( + """ + |akka.loglevel = "DEBUG" + |akka.stdout-loglevel = "DEBUG" + """.stripMargin) } /** From 13d340838ba87d645f177d0b15beefba520c78c5 Mon Sep 17 00:00:00 2001 From: Marcin Procyk Date: Thu, 24 Mar 2022 08:12:33 +0100 Subject: [PATCH 3/3] fix --- .../src/main/scala/org/knora/webapi/routing/VersionRoute.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapi/src/main/scala/org/knora/webapi/routing/VersionRoute.scala b/webapi/src/main/scala/org/knora/webapi/routing/VersionRoute.scala index fb492ba663..3fc64993b2 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/VersionRoute.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/VersionRoute.scala @@ -32,7 +32,7 @@ trait VersionCheck { entity = HttpEntity( ContentTypes.`application/json`, JsObject( - "name" -> JsString(BuildInfo.name), + "name" -> JsString("version"), "webapi" -> JsString(BuildInfo.version), "scala" -> JsString(BuildInfo.scalaVersion), "akkaHttp" -> JsString(BuildInfo.akkaHttp),