allow silent missing resource exception

guimauvedigital · Feb 22, 2025 · 0cd44be · 0cd44be
1 parent 61e2ad4
commit 0cd44be
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/i18n/src/jvmMain/kotlin/dev/kaccelero/commons/localization/TranslateFromPropertiesUseCase.kt b/i18n/src/jvmMain/kotlin/dev/kaccelero/commons/localization/TranslateFromPropertiesUseCase.kt
@@ -7,6 +7,7 @@ import java.util.*
 class TranslateFromPropertiesUseCase(
     private val baseName: String = DEFAULT_RESOURCE_BUNDLE,
     private val control: ResourceBundle.Control = UTF8Control(),
+    private val silentMissingResourceException: Boolean = false,
 ) : ITranslateUseCase {
 
     companion object {
@@ -19,7 +20,12 @@ class TranslateFromPropertiesUseCase(
 
     override fun invoke(input1: Locale, input2: String, input3: List<String>): String {
         val bundle = ResourceBundle.getBundle(baseName, input1, control)
-        val string = bundle.getString(input2)
+        val string = try {
+            bundle.getString(input2)
+        } catch (e: MissingResourceException) {
+            if (silentMissingResourceException) return input2
+            else throw e
+        }
         return input3.takeUnless { it.isEmpty() }?.let {
             cache.computeIfAbsent(Pair(string, bundle.locale)) {
                 MessageFormat(string, bundle.locale)

diff --git a/...c/jvmTest/kotlin/dev/kaccelero/commons/localization/TranslateFromPropertiesUseCaseTest.kt b/...c/jvmTest/kotlin/dev/kaccelero/commons/localization/TranslateFromPropertiesUseCaseTest.kt
@@ -1,7 +1,9 @@
 package dev.kaccelero.commons.localization
 
+import java.util.*
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
 
 class TranslateFromPropertiesUseCaseTest {
 
@@ -23,4 +25,19 @@ class TranslateFromPropertiesUseCaseTest {
         assertEquals("Hello Nathan!", useCase(Locale.ENGLISH, "hello_arg", listOf("Nathan")))
     }
 
+    @Test
+    fun testInvokeMissing() {
+        val useCase = TranslateFromPropertiesUseCase()
+        val exception = assertFailsWith<MissingResourceException> {
+            useCase(Locale.ENGLISH, "missing")
+        }
+        assertEquals("missing", exception.key)
+    }
+
+    @Test
+    fun testInvokeMissingSilent() {
+        val useCase = TranslateFromPropertiesUseCase(silentMissingResourceException = true)
+        assertEquals("missing", useCase(Locale.ENGLISH, "missing"))
+    }
+
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -34,7 +34,7 @@ dependencyResolutionManagement {
             library("tests-h2", "com.h2database:h2:2.3.232")
 
             // Exposed
-            version("exposed", "0.54.0")
+            version("exposed", "0.59.0")
             library("exposed-core", "org.jetbrains.exposed", "exposed-core").versionRef("exposed")
             library("exposed-jdbc", "org.jetbrains.exposed", "exposed-jdbc").versionRef("exposed")
             library("exposed-dao", "org.jetbrains.exposed", "exposed-dao").versionRef("exposed")
@@ -55,7 +55,7 @@ dependencyResolutionManagement {
             )
 
             // Ktor
-            version("ktor", "2.3.12")
+            version("ktor", "2.3.13")
             library("ktor-serialization-kotlinx-json", "io.ktor", "ktor-serialization-kotlinx-json").versionRef("ktor")
             library("ktor-server-core", "io.ktor", "ktor-server-core").versionRef("ktor")
             library("ktor-server-test-host", "io.ktor", "ktor-server-test-host").versionRef("ktor")