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

Use StandardCharsets where possible

Browse Source 
Closes gh-11036
This commit is contained in:
dreis2211
2017-11-15 19:00:31 +01:00
committed by Stephane Nicoll
parent bcab23e538
commit 1e4941e29a
8 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/JavaCompilerFieldValuesParser.java
View File

@@ -94,6 +94,10 @@ public class JavaCompilerFieldValuesParser implements FieldValuesParser {
Map<String, Object> values = new HashMap<>();
values.put("Boolean.TRUE", true);
values.put("Boolean.FALSE", false);
values.put("StandardCharsets.ISO_8859_1", "ISO-8859-1");
values.put("StandardCharsets.UTF_8", "UTF-8");
values.put("StandardCharsets.UTF_16", "UTF-16");
values.put("StandardCharsets.US_ASCII", "US-ASCII");
wellKnownStaticFinals = Collections.unmodifiableMap(values);
}

5
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/fieldvalues/FieldValues.java
View File

@@ -17,6 +17,7 @@
package org.springframework.boot.configurationsample.fieldvalues;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import org.springframework.boot.configurationsample.ConfigurationProperties;
import org.springframework.util.MimeType;
@@ -41,7 +42,7 @@ public class FieldValues {
private static final Integer INTEGER_OBJ_CONST = 4;
private static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
private static final MimeType DEFAULT_MIME_TYPE = MimeType.valueOf("text/plain");
@@ -77,7 +78,7 @@ public class FieldValues {
private Integer integerObjectConst = INTEGER_OBJ_CONST;
private Charset charset = Charset.forName("US-ASCII");
private Charset charset = StandardCharsets.US_ASCII;
private Charset charsetConst = DEFAULT_CHARSET;