From 5082d83103d7f8c77f28154ed3b8bcf57feeea72 Mon Sep 17 00:00:00 2001
From: Alex Martel <13215031+manofthepeace@users.noreply.github.com>
Date: Wed, 26 Apr 2023 15:22:20 -0400
Subject: [PATCH] Add possibility to parse days and milliseconds with config
 DurationConverter

---
 .../configuration/DurationConverter.java      | 15 +++++++++----
 .../DurationConverterTestCase.java            | 21 +++++++++++++++++++
 .../_includes/duration-format-note.adoc       |  3 ++-
 3 files changed, 34 insertions(+), 5 deletions(-)

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
index 7104f303cd503..c0269c6c471a8 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/DurationConverter.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/DurationConverter.java
@@ -17,15 +17,18 @@
 @Priority(DEFAULT_QUARKUS_CONVERTER_PRIORITY)
 public class DurationConverter implements Converter<Duration>, Serializable {
     private static final long serialVersionUID = 7499347081928776532L;
+    private static final String PERIOD = "P";
     private static final String PERIOD_OF_TIME = "PT";
     private static final Pattern DIGITS = Pattern.compile("^[-+]?\\d+$");
-    private static final Pattern START_WITH_DIGITS = Pattern.compile("^[-+]?\\d+.*");
+    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$");
 
     public DurationConverter() {
     }
 
     /**
-     * The converter accepts a value which start with a number by implicitly appending `PT` to it.
+     * The converter accepts a value which start with a number by implicitly appending `PT` to it or `P` for days.
      * If the value consists only of a number, it implicitly treats the value as seconds.
      * Otherwise, tries to convert the value assuming that it is in the accepted ISO-8601 duration format.
      *
@@ -38,7 +41,7 @@ public Duration convert(String value) {
     }
 
     /**
-     * Converts a value which start with a number by implicitly appending `PT` to it.
+     * Converts a value which start with a number by implicitly appending `PT` to it or `P` for days.
      * If the value consists only of a number, it implicitly treats the value as seconds.
      * Otherwise, tries to convert the value assuming that it is in the accepted ISO-8601 duration format.
      *
@@ -52,11 +55,15 @@ public static Duration parseDuration(String value) {
         }
         if (DIGITS.asPredicate().test(value)) {
             return Duration.ofSeconds(Long.parseLong(value));
+        } else if (MILLIS.asPredicate().test(value)) {
+            return Duration.ofMillis(Long.parseLong(value.substring(0, value.length() - 2)));
         }
 
         try {
-            if (START_WITH_DIGITS.asPredicate().test(value)) {
+            if (DIGITS_AND_UNIT.asPredicate().test(value)) {
                 return Duration.parse(PERIOD_OF_TIME + value);
+            } else if (DAYS.asPredicate().test(value)) {
+                return Duration.parse(PERIOD + value);
             }
 
             return Duration.parse(value);
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
index 2e02d570a87f8..a3fa126ff7af8 100644
--- a/core/runtime/src/test/java/io/quarkus/runtime/configuration/DurationConverterTestCase.java
+++ b/core/runtime/src/test/java/io/quarkus/runtime/configuration/DurationConverterTestCase.java
@@ -47,4 +47,25 @@ public void testValueInCorrectFormatProvided() {
     public void testValueNotInCorrectFormatProvided() {
         assertThrows(IllegalArgumentException.class, () -> durationConverter.convert("PT"));
     }
+
+    @Test
+    public void testValueIsInDays() {
+        Duration expectedDuration = Duration.ofDays(3);
+        Duration actualDuration = durationConverter.convert("3d");
+        assertEquals(expectedDuration, actualDuration);
+    }
+
+    @Test
+    public void testValueIsInMillis() {
+        Duration expectedDuration = Duration.ofMillis(25);
+        Duration actualDuration = durationConverter.convert("25ms");
+        assertEquals(expectedDuration, actualDuration);
+    }
+
+    @Test
+    public void testValueIsInSec() {
+        Duration expectedDuration = Duration.ofSeconds(2);
+        Duration actualDuration = durationConverter.convert("2s");
+        assertEquals(expectedDuration, actualDuration);
+    }
 }
diff --git a/docs/src/main/asciidoc/_includes/duration-format-note.adoc b/docs/src/main/asciidoc/_includes/duration-format-note.adoc
index 823c283a5e3d8..5f0fc05d24ad4 100644
--- a/docs/src/main/asciidoc/_includes/duration-format-note.adoc
+++ b/docs/src/main/asciidoc/_includes/duration-format-note.adoc
@@ -5,5 +5,6 @@ You can learn more about it in the link:https://docs.oracle.com/javase/8/docs/ap
 
 You can also provide duration values starting with a number.
 In this case, if the value consists only of a number, the converter treats the value as seconds.
-Otherwise, `PT` is implicitly prepended to the value to obtain a standard `java.time.Duration` format.
+Otherwise, `PT` for seconds, minute and hours or `P` for days are implicitly prepended to the value to obtain a standard `java.time.Duration` format.
+Milliseconds are also supported by implicitly using `Duration.ofMillis()`
 ====