Kotlinize environment property

FAForever · Aug 9, 2023 · b08708a · b08708a
1 parent 20d4c73
commit b08708a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/kotlin/com/faforever/userservice/config/FafProperties.kt b/src/main/kotlin/com/faforever/userservice/config/FafProperties.kt
@@ -7,7 +7,7 @@ import java.util.*
 
 @ConfigMapping(prefix = "faf")
 interface FafProperties {
-    fun environment(): Optional<String>
+    fun environment(): String?
 
     /**
      * Define the header, where to pick the real ip address from. For regular reverse proxies such as nginx or Traefik,

diff --git a/src/main/kotlin/com/faforever/userservice/ui/layout/BackgroundImageLayout.kt b/src/main/kotlin/com/faforever/userservice/ui/layout/BackgroundImageLayout.kt
@@ -48,10 +48,10 @@ class BackgroundHeader(fafProperties: FafProperties) : Header() {
         leftHeader.add(imageLink)
 
         val environment = fafProperties.environment()
-            .map { it.ifBlank { null } }
-            .map { it?.uppercase() }
-            .map { "[$it] FAForever" }
-            .orElse("FAForever")
+            ?.uppercase()
+            ?.ifBlank { null }
+            ?.let { "[$it] FAForever" }
+            ?: "FAForever"
 
         leftHeader.add(H1(environment))
 
@@ -65,4 +65,4 @@ class CardLayout : VerticalLayout(), RouterLayout {
     init {
         addClassName("main-card")
     }
-}
+}