root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.7.x' 

Closes gh-32245
This commit is contained in:
Stephane Nicoll 2022-09-07 08:45:29 +02:00
parent 59ecc962ca 9ef067d589
commit cfdceba687
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/PeriodStyle.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -29,6 +29,7 @@ import org.springframework.util.Assert;
* *
* @author Eddú Meléndez * @author Eddú Meléndez
* @author Edson Chávez * @author Edson Chávez
* @author Valentine Wu
* @since 2.3.0 * @since 2.3.0
* @see Period * @see Period
*/ */
@ -102,7 +103,7 @@ public enum PeriodStyle {
/** /**
* ISO-8601 formatting. * ISO-8601 formatting.
*/ */
ISO8601("^[+-]?P.*$", 0) { ISO8601("^[+-]?P.*$", Pattern.CASE_INSENSITIVE) {
@Override @Override
public Period parse(String value, ChronoUnit unit) { public Period parse(String value, ChronoUnit unit) {

7
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/PeriodStyleTests.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -29,6 +29,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
* *
* @author Eddú Meléndez * @author Eddú Meléndez
* @author Edson Chávez * @author Edson Chávez
* @author Valentine Wu
*/ */
class PeriodStyleTests { class PeriodStyleTests {
@ -40,6 +41,7 @@ class PeriodStyleTests {
@Test @Test
void detectAndParseWhenIso8601ShouldReturnPeriod() { 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("P15M"));
assertThat(PeriodStyle.detectAndParse("-P15M")).isEqualTo(Period.parse("P-15M")); assertThat(PeriodStyle.detectAndParse("-P15M")).isEqualTo(Period.parse("P-15M"));
assertThat(PeriodStyle.detectAndParse("+P15M")).isEqualTo(Period.parse("P15M")); assertThat(PeriodStyle.detectAndParse("+P15M")).isEqualTo(Period.parse("P15M"));
@ -123,6 +125,7 @@ class PeriodStyleTests {
@Test @Test
void detectWhenIso8601ShouldReturnIso8601() { void detectWhenIso8601ShouldReturnIso8601() {
assertThat(PeriodStyle.detect("p20")).isEqualTo(PeriodStyle.ISO8601);
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);
assertThat(PeriodStyle.detect("+P15M")).isEqualTo(PeriodStyle.ISO8601); assertThat(PeriodStyle.detect("+P15M")).isEqualTo(PeriodStyle.ISO8601);
@ -140,6 +143,7 @@ class PeriodStyleTests {
@Test @Test
void parseIso8601ShouldParse() { void parseIso8601ShouldParse() {
assertThat(PeriodStyle.ISO8601.parse("p20d")).isEqualTo(Period.parse("p20d"));
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"));
assertThat(PeriodStyle.ISO8601.parse("+P15M")).isEqualTo(Period.parse("P15M")); assertThat(PeriodStyle.ISO8601.parse("+P15M")).isEqualTo(Period.parse("P15M"));
@ -151,6 +155,7 @@ class PeriodStyleTests {
@Test @Test
void parseIso8601WithUnitShouldIgnoreUnit() { 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("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"));
assertThat(PeriodStyle.ISO8601.parse("+P15M", ChronoUnit.SECONDS)).isEqualTo(Period.parse("P15M")); assertThat(PeriodStyle.ISO8601.parse("+P15M", ChronoUnit.SECONDS)).isEqualTo(Period.parse("P15M"));

3
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/StringToPeriodConverterTests.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -37,6 +37,7 @@ class StringToPeriodConverterTests {
@ConversionServiceTest @ConversionServiceTest
void convertWhenIso8601ShouldReturnPeriod(ConversionService conversionService) { void convertWhenIso8601ShouldReturnPeriod(ConversionService conversionService) {
assertThat(convert(conversionService, "p2y")).isEqualTo(Period.parse("p2y"));
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, "P3M")).isEqualTo(Period.parse("P3M"));
assertThat(convert(conversionService, "P4W")).isEqualTo(Period.parse("P4W")); assertThat(convert(conversionService, "P4W")).isEqualTo(Period.parse("P4W"));