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

DurationFormatterUtils should not attempt to parse an empty duration #33669

Closed
wants to merge 1 commit into from
Closed

DurationFormatterUtils should not attempt to parse an empty duration #33669

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
5 changes: 4 additions & 1 deletion ...xt/src/main/java/org/springframework/format/datetime/standard/DurationFormatterUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
* @author Phillip Webb
* @author Valentine Wu
* @author Simon Baslé
* @author Kim Seungrae
* @since 6.2
*/
public abstract class DurationFormatterUtils {
Expand Down Expand Up @@ -62,6 +63,7 @@ public static Duration parse(String value, DurationFormat.Style style) {
* @return a duration
*/
public static Duration parse(String value, DurationFormat.Style style, @Nullable DurationFormat.Unit unit) {
Assert.hasText(value, () -> "Value must not be empty");
return switch (style) {
case ISO8601 -> parseIso8601(value);
case SIMPLE -> parseSimple(value, unit);
Expand All @@ -88,6 +90,7 @@ public static String print(Duration value, DurationFormat.Style style) {
* @return the printed result
*/
public static String print(Duration value, DurationFormat.Style style, @Nullable DurationFormat.Unit unit) {
Assert.notNull(value, "Value must not be null");
return switch (style) {
case ISO8601 -> value.toString();
case SIMPLE -> printSimple(value, unit);
Expand Down Expand Up @@ -149,7 +152,7 @@ private static Duration parseIso8601(String value) {
try {
return Duration.parse(value);
}
catch (Throwable ex) {
catch (Exception ex) {
throw new IllegalArgumentException("'" + value + "' is not a valid ISO-8601 duration", ex);
}
}
Expand Down
27 changes: 27 additions & 0 deletions ...c/test/java/org/springframework/format/datetime/standard/DurationFormatterUtilsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@

import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;

import org.springframework.format.annotation.DurationFormat;
import org.springframework.format.annotation.DurationFormat.Unit;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -188,6 +191,22 @@ void parseCompositeBadUnit() {
.havingCause().withMessage("Does not match composite duration pattern");
}

@ParameterizedTest
@EnumSource(DurationFormat.Style.class)
void parseEmptyStringThrowsForAllStyles(DurationFormat.Style style) {
assertThatIllegalArgumentException()
.isThrownBy(() -> DurationFormatterUtils.parse("", style))
.withMessage("Value must not be empty");
}

@ParameterizedTest
@EnumSource(DurationFormat.Style.class)
void parseNullStringThrowsForAllStyles(DurationFormat.Style style) {
assertThatIllegalArgumentException()
.isThrownBy(() -> DurationFormatterUtils.parse(null, style))
.withMessage("Value must not be empty");
}

@Test
void printSimple() {
assertThat(DurationFormatterUtils.print(Duration.ofNanos(12345), SIMPLE, Unit.NANOS))
Expand Down Expand Up @@ -240,6 +259,14 @@ void printCompositeNegative() {
.isEqualTo("-1d2h34m57s28ms3us2ns");
}

@ParameterizedTest
@EnumSource(DurationFormat.Style.class)
void printNullDurationThrowsForAllStyles(DurationFormat.Style style) {
assertThatIllegalArgumentException()
.isThrownBy(() -> DurationFormatterUtils.print(null, style))
.withMessage("Value must not be null");
}

@Test
void detectAndParse() {
assertThat(DurationFormatterUtils.detectAndParse("PT1.234S", Unit.NANOS))
Expand Down