libeufin

commit 0395d8932a3fce80d0cbe3c91cf8d0b004f07251
parent ec21de305a661af99987f9b296f9cbabebc5b746
Author: MS <ms@taler.net>
Date:   Thu,  2 Nov 2023 09:14:00 +0100

allowing space(s) between number and duration unit

Diffstat:
M
nexus/src/main/kotlin/tech/libeufin/nexus/EbicsSubmit.kt
 | 
2
+-
M
nexus/src/test/kotlin/ConfigLoading.kt
 | 
3
+++

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsSubmit.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsSubmit.kt
@@ -99,7 +99,7 @@ fun getFrequencyInSeconds(humanFormat: String): Int? {
     }
     val maybeNumber = trimmed.dropLast(1)
     val howMany = try {
-        maybeNumber.toInt()
+        maybeNumber.trimEnd().toInt()
     } catch (e: Exception) {
         logger.error("Prefix was not a valid input: '$maybeNumber'")
         return null
diff --git a/nexus/src/test/kotlin/ConfigLoading.kt b/nexus/src/test/kotlin/ConfigLoading.kt
@@ -49,8 +49,11 @@ class ConfigLoading {
     @Test
     fun timeParsing() {
         assertEquals(1, getFrequencyInSeconds("1s"))
+        assertEquals(1, getFrequencyInSeconds("       1           s       "))
         assertEquals(10*60, getFrequencyInSeconds("10m"))
+        assertEquals(10*60, getFrequencyInSeconds("10 m"))
         assertEquals(24*60*60, getFrequencyInSeconds("24h"))
+        assertEquals(24*60*60, getFrequencyInSeconds(" 24h"))
         assertEquals(60*60, getFrequencyInSeconds("      1h      "))
         assertEquals(60*60, getFrequencyInSeconds("01h"))
         assertNull(getFrequencyInSeconds("1.1s"))