From ea8ad4f8ce1208a08efc8557240c5499b06e4b9a Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sun, 18 Apr 2021 21:09:41 +0000
Subject: [PATCH] Code cleanup, json.prettyprint removed.
---
borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/VersionRest.kt | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/VersionRest.kt b/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/VersionRest.kt
index dfa3165..548bbdd 100644
--- a/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/VersionRest.kt
+++ b/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/VersionRest.kt
@@ -6,7 +6,6 @@
import org.apache.commons.lang3.StringUtils
import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RequestParam
import org.springframework.web.bind.annotation.RestController
import java.util.*
import javax.servlet.http.HttpServletRequest
@@ -17,28 +16,21 @@
/**
*
* @param request For detecting the user's client locale.
- * @param prettyPrinter If true then the json output will be in pretty format.
* @see JsonUtils.toJson
*/
@GetMapping("version")
- fun getVersion(
- request: HttpServletRequest,
- @RequestParam("prettyPrinter", required = false) prettyPrinter: Boolean?
- ): String {
+ fun getVersion(request: HttpServletRequest): MyVersion {
val user = RestUtils.getUser()
var language = Languages.asString(user.getLocale())
if (StringUtils.isBlank(language)) {
val locale: Locale = request.locale
- language = locale.getLanguage()
+ language = locale.language
}
- val version = MyVersion(language, RestUtils.checkLocalDesktopAvailable(request) == null)
- return JsonUtils.toJson(version, prettyPrinter)
+ return MyVersion(language, RestUtils.checkLocalDesktopAvailable(request) == null)
}
- inner class MyVersion(language: String, localDesktopAvailable: Boolean) {
- private val version: Version
- val language: String
- val isLocalDesktopAvailable: Boolean
+ inner class MyVersion(val language: String, val localDesktopAvailable: Boolean) {
+ private val version: Version = Version.getInstance()
val appName: String
get() = version.appName
@@ -57,10 +49,5 @@
val updateVersion: String?
get() = version.updateVersion
- init {
- version = Version.getInstance()
- this.language = language
- isLocalDesktopAvailable = localDesktopAvailable
- }
}
}
--
Gitblit v1.10.0