Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Phillip Webb
2018-02-26 22:16:08 -08:00
parent 257e324bd5
commit 8f9c067a92
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot/src/main/java/org/springframework/boot/bind/RelaxedConversionService.java
View File

@@ -127,9 +127,8 @@ class RelaxedConversionService implements ConversionService {
}
source = source.trim();
for (T candidate : (Set<T>) EnumSet.allOf(this.enumType)) {
RelaxedNames names = new RelaxedNames(
candidate.name().replace('_', '-')
.toLowerCase(Locale.ENGLISH));
RelaxedNames names = new RelaxedNames(candidate.name()
.replace('_', '-').toLowerCase(Locale.ENGLISH));
for (String name : names) {
if (name.equals(source)) {
return candidate;

9
spring-boot/src/test/java/org/springframework/boot/bind/RelaxedConversionServiceTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2016 the original author or authors.
* Copyright 2012-2018 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.
@@ -31,13 +31,14 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
public class RelaxedConversionServiceTests {
private RelaxedConversionService conversionService = new RelaxedConversionService(new DefaultConversionService());
private RelaxedConversionService conversionService = new RelaxedConversionService(
new DefaultConversionService());
@Test
public void conversionServiceShouldAlwaysUseLocaleEnglish() {
Locale.setDefault(new Locale("tr"));
TestEnum result = this.conversionService.convert("accept-case-insensitive-properties",
TestEnum.class);
TestEnum result = this.conversionService
.convert("accept-case-insensitive-properties", TestEnum.class);
assertThat(result.equals(TestEnum.ACCEPT_CASE_INSENSITIVE_PROPERTIES));
}