Merge pull request #34562 from manofthepeace/durationConverterFixup

Fix duration converter with multiple units
quarkusio · Sep 20, 2023 · c3149c3 · c3149c3
2 parents 30d7be6 + 5173d04
commit c3149c3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/DurationConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/DurationConverter.java
@@ -20,7 +20,7 @@ public class DurationConverter implements Converter<Duration>, Serializable {
     private static final String PERIOD = "P";
     private static final String PERIOD_OF_TIME = "PT";
     public static final Pattern DIGITS = Pattern.compile("^[-+]?\\d+$");
-    private static final Pattern DIGITS_AND_UNIT = Pattern.compile("^[-+]?\\d+(?:\\.\\d+)?(?i)[hms]$");
+    private static final Pattern DIGITS_AND_UNIT = Pattern.compile("^(?:[-+]?\\d+(?:\\.\\d+)?(?i)[hms])+$");
     private static final Pattern DAYS = Pattern.compile("^[-+]?\\d+(?i)d$");
     private static final Pattern MILLIS = Pattern.compile("^[-+]?\\d+(?i)ms$");
 

diff --git a/core/runtime/src/test/java/io/quarkus/runtime/configuration/DurationConverterTestCase.java b/core/runtime/src/test/java/io/quarkus/runtime/configuration/DurationConverterTestCase.java
@@ -68,4 +68,18 @@ public void testValueIsInSec() {
         Duration actualDuration = durationConverter.convert("2s");
         assertEquals(expectedDuration, actualDuration);
     }
+
+    @Test
+    public void testValuesWithMultipleUnits() {
+        Duration expectedDuration = Duration.ofSeconds(150);
+        Duration actualDuration = durationConverter.convert("2m30s");
+        assertEquals(expectedDuration, actualDuration);
+    }
+
+    @Test
+    public void testValuesWithMultipleUnitsSigned() {
+        Duration expectedDuration = Duration.ofSeconds(90);
+        Duration actualDuration = durationConverter.convert("+2m-30s");
+        assertEquals(expectedDuration, actualDuration);
+    }
 }