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

Utilize StandardCharsets

Browse Source 
Closes gh-10972
This commit is contained in:
Johnny Lim
2017-11-10 05:43:06 +09:00
committed by Stephane Nicoll
parent e9c81bf702
commit bd0dcfb172
30 changed files with 77 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java
View File

@@ -19,6 +19,7 @@ package org.springframework.boot.configurationmetadata;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -32,12 +33,7 @@ import java.util.Map;
*/
public final class ConfigurationMetadataRepositoryJsonBuilder {
/**
* UTF-8 Charset.
*/
public static final Charset UTF_8 = Charset.forName("UTF-8");
private Charset defaultCharset = UTF_8;
private Charset defaultCharset = StandardCharsets.UTF_8;
private final JsonReader reader = new JsonReader();
@@ -159,7 +155,7 @@ public final class ConfigurationMetadataRepositoryJsonBuilder {
}
/**
* Create a new builder instance using {@link #UTF_8} as the default charset and the
* Create a new builder instance using {@link StandardCharsets#UTF_8} as the default charset and the
* specified json resource.
* @param inputStreams the source input streams
* @return a new {@link ConfigurationMetadataRepositoryJsonBuilder} instance.
@@ -175,11 +171,11 @@ public final class ConfigurationMetadataRepositoryJsonBuilder {
}
/**
* Create a new builder instance using {@link #UTF_8} as the default charset.
* Create a new builder instance using {@link StandardCharsets#UTF_8} as the default charset.
* @return a new {@link ConfigurationMetadataRepositoryJsonBuilder} instance.
*/
public static ConfigurationMetadataRepositoryJsonBuilder create() {
return create(UTF_8);
return create(StandardCharsets.UTF_8);
}
/**

5
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/JsonReaderTests.java
View File

@@ -18,6 +18,7 @@ package org.springframework.boot.configurationmetadata;
import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.List;
import org.hamcrest.CoreMatchers;
@@ -27,13 +28,13 @@ import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link JsonReader}
* Tests for {@link JsonReader}.
*
* @author Stephane Nicoll
*/
public class JsonReaderTests extends AbstractConfigurationMetadataTests {
private static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
private final JsonReader reader = new JsonReader();