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

Detection of PeriodStyle.ISO8601 does not support lower-case input #32235

Closed
wants to merge 1 commit into from
Closed

Detection of PeriodStyle.ISO8601 does not support lower-case input #32235

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/PeriodStyle.java
View file
Open in desktop
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -29,6 +29,7 @@
*
* @author Eddú Meléndez
* @author Edson Chávez
* @author Valentine Wu
* @since 2.3.0
* @see Period
*/
Expand Down Expand Up @@ -102,7 +103,7 @@ private void append(StringBuilder result, Period value, Unit unit) {
/**
* ISO-8601 formatting.
*/
ISO8601("^[+-]?P.*$", 0) {
ISO8601("^[+-]?P.*$", Pattern.CASE_INSENSITIVE) {

@Override
public Period parse(String value, ChronoUnit unit) {
Expand Down
7 changes: 6 additions & 1 deletion ...-project/spring-boot/src/test/java/org/springframework/boot/convert/PeriodStyleTests.java
View file
Open in desktop
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -29,6 +29,7 @@
*
* @author Eddú Meléndez
* @author Edson Chávez
* @author Valentine Wu
*/
class PeriodStyleTests {

Expand All @@ -40,6 +41,7 @@ void detectAndParseWhenValueIsNullShouldThrowException() {

@Test
void detectAndParseWhenIso8601ShouldReturnPeriod() {
assertThat(PeriodStyle.detectAndParse("p15m")).isEqualTo(Period.parse("p15m"));
assertThat(PeriodStyle.detectAndParse("P15M")).isEqualTo(Period.parse("P15M"));
assertThat(PeriodStyle.detectAndParse("-P15M")).isEqualTo(Period.parse("P-15M"));
assertThat(PeriodStyle.detectAndParse("+P15M")).isEqualTo(Period.parse("P15M"));
Expand Down Expand Up @@ -123,6 +125,7 @@ void detectWhenSimpleShouldReturnSimple() {

@Test
void detectWhenIso8601ShouldReturnIso8601() {
assertThat(PeriodStyle.detect("p20")).isEqualTo(PeriodStyle.ISO8601);
assertThat(PeriodStyle.detect("P20")).isEqualTo(PeriodStyle.ISO8601);
assertThat(PeriodStyle.detect("-P15M")).isEqualTo(PeriodStyle.ISO8601);
assertThat(PeriodStyle.detect("+P15M")).isEqualTo(PeriodStyle.ISO8601);
Expand All @@ -140,6 +143,7 @@ void detectWhenUnknownShouldThrowException() {

@Test
void parseIso8601ShouldParse() {
assertThat(PeriodStyle.ISO8601.parse("p20d")).isEqualTo(Period.parse("p20d"));
assertThat(PeriodStyle.ISO8601.parse("P20D")).isEqualTo(Period.parse("P20D"));
assertThat(PeriodStyle.ISO8601.parse("P15M")).isEqualTo(Period.parse("P15M"));
assertThat(PeriodStyle.ISO8601.parse("+P15M")).isEqualTo(Period.parse("P15M"));
Expand All @@ -151,6 +155,7 @@ void parseIso8601ShouldParse() {

@Test
void parseIso8601WithUnitShouldIgnoreUnit() {
assertThat(PeriodStyle.ISO8601.parse("p20d", ChronoUnit.SECONDS)).isEqualTo(Period.parse("p20d"));
assertThat(PeriodStyle.ISO8601.parse("P20D", ChronoUnit.SECONDS)).isEqualTo(Period.parse("P20D"));
assertThat(PeriodStyle.ISO8601.parse("P15M", ChronoUnit.SECONDS)).isEqualTo(Period.parse("P15M"));
assertThat(PeriodStyle.ISO8601.parse("+P15M", ChronoUnit.SECONDS)).isEqualTo(Period.parse("P15M"));
Expand Down
3 changes: 2 additions & 1 deletion ...ing-boot/src/test/java/org/springframework/boot/convert/StringToPeriodConverterTests.java
View file
Open in desktop
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -37,6 +37,7 @@ class StringToPeriodConverterTests {

@ConversionServiceTest
void convertWhenIso8601ShouldReturnPeriod(ConversionService conversionService) {
assertThat(convert(conversionService, "p2y")).isEqualTo(Period.parse("p2y"));
assertThat(convert(conversionService, "P2Y")).isEqualTo(Period.parse("P2Y"));
assertThat(convert(conversionService, "P3M")).isEqualTo(Period.parse("P3M"));
assertThat(convert(conversionService, "P4W")).isEqualTo(Period.parse("P4W"));
Expand Down