Simplify PropertyValueSource.from overload implementation

ajalt · Sep 26, 2023 · d661506 · d661506
1 parent 31a16b8
commit d661506
Showing 1 changed file with 1 addition and 13 deletions.
diff --git a/clikt/src/jvmMain/kotlin/com/github/ajalt/clikt/sources/PropertiesValueSource.kt b/clikt/src/jvmMain/kotlin/com/github/ajalt/clikt/sources/PropertiesValueSource.kt
@@ -57,19 +57,7 @@ object PropertiesValueSource {
         requireValid: Boolean = false,
         getKey: (Context, Option) -> String = ValueSource.getKey(joinSubcommands = "."),
     ): ValueSource {
-        val properties = Properties()
-        if (file.isFile) {
-            try {
-                file.bufferedReader().use { properties.load(it) }
-            } catch (e: Throwable) {
-                if (requireValid) throw InvalidFileFormat(
-                    file.name,
-                    e.message ?: "could not read file"
-                )
-            }
-        }
-
-        return from(properties, getKey)
+        return from(file.toPath(), requireValid, getKey)
     }
 
     /**