From 58d5fbc1e3fdbc7d8c826ecb8fbceebe82529492 Mon Sep 17 00:00:00 2001 From: bskjon Date: Sun, 23 Feb 2025 03:04:05 +0100 Subject: [PATCH] Adjusted ui --- .../no/iktdev/mediaprocessing/ui/Configuration.kt | 14 +++++++++++--- .../kotlin/no/iktdev/mediaprocessing/ui/UIEnv.kt | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/Configuration.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/Configuration.kt index f836ee6a..bff7ba79 100644 --- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/Configuration.kt +++ b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/Configuration.kt @@ -55,10 +55,18 @@ class ApiCommunicationConfig { @Bean fun coordinatorTemplate(): RestTemplate { - val restTemplate = RestTemplate() - restTemplate.uriTemplateHandler = DefaultUriBuilderFactory(UIEnv.coordinatorUrl) - return restTemplate + return try { + val url = UIEnv.coordinatorUrl + require(url.isNotBlank()) { "UIEnv.coordinatorUrl er ikke satt!" } + + val restTemplate = RestTemplate() + restTemplate.uriTemplateHandler = DefaultUriBuilderFactory(url) + restTemplate + } catch (e: Exception) { + throw IllegalStateException("Feil ved opprettelse av coordinatorTemplate: ${e.message}", e) + } } + } diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/UIEnv.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/UIEnv.kt index 2e9561ef..dc141d25 100644 --- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/UIEnv.kt +++ b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/UIEnv.kt @@ -4,5 +4,5 @@ import java.io.File object UIEnv { val socketEncoder: String = if (System.getenv("EncoderWs").isNullOrBlank()) System.getenv("EncoderWs") else "ws://encoder:8080" - val coordinatorUrl: String = if (System.getenv("Coordinator").isNullOrBlank()) System.getenv("Coordinator") else "http://coordinator" + val coordinatorUrl: String = System.getenv("Coordinator")?.takeIf { it.isNotBlank() } ?: "http://coordinator" } \ No newline at end of file