Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix duration converter with multiple units #34562

Merged
merged 1 commit into from
Sep 20, 2023
Merged

Fix duration converter with multiple units #34562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/runtime/src/main/java/io/quarkus/runtime/configuration/DurationConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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$");

Expand Down
14 changes: 14 additions & 0 deletions core/runtime/src/test/java/io/quarkus/runtime/configuration/DurationConverterTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Loading