From 566285c227a59f2a6efc93ded171ab548efde3a2 Mon Sep 17 00:00:00 2001
From: Marcin Procyk <marcin.procyk@dasch.swiss>
Date: Thu, 24 Mar 2022 09:00:21 +0100
Subject: [PATCH] fix(version): fix displayed versions (#2026)

* fix(version): fix displayed versions

* added missing name + formatting fix

* fix
---
 .../knora/webapi/routing/VersionRoute.scala   | 48 +++++--------------
 .../knora/webapi/it/VersionRouteITSpec.scala  |  9 ++--
 2 files changed, 17 insertions(+), 40 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..3fc64993b2 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,24 @@ 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
+          "name" -> JsString("version"),
+          "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 +55,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())
       }
     }
 }
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)
 }
 
 /**