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

Support Integer to Duration conversion during property binding 

Closes gh-11216
This commit is contained in:
Andy Wilkinson 2017-11-30 12:30:07 +00:00
parent 8aeb245393
commit e16579b416
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/convert/DurationConverter.java
View File

@ -45,6 +45,7 @@ class DurationConverter implements GenericConverter {
static { static {
Set<ConvertiblePair> types = new LinkedHashSet<>(); Set<ConvertiblePair> types = new LinkedHashSet<>();
types.add(new ConvertiblePair(String.class, Duration.class)); types.add(new ConvertiblePair(String.class, Duration.class));
types.add(new ConvertiblePair(Integer.class, Duration.class));
TYPES = Collections.unmodifiableSet(types); TYPES = Collections.unmodifiableSet(types);
} }

7
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/convert/BinderConversionServiceTests.java
View File

@ -161,6 +161,13 @@ public class BinderConversionServiceTests {
assertThat(converted).isEqualTo(Duration.ofSeconds(10)); assertThat(converted).isEqualTo(Duration.ofSeconds(10));
} }
@Test
public void conversionServiceShouldSupportIntegerToDuration() throws Exception {
this.service = new BinderConversionService(null);
Duration converted = this.service.convert(10, Duration.class);
assertThat(converted).isEqualTo(Duration.ofMillis(10));
}
enum TestEnum { enum TestEnum {
ONE, TWO ONE, TWO