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

Revise encoding steps towards use of JDK Charset and StandardCharsets

Browse Source 
Issue: SPR-14492
This commit is contained in:
Juergen Hoeller
2016-07-19 23:43:05 +02:00
parent 79d30d8c8a
commit 99be15f58b
95 changed files with 480 additions and 569 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionServiceTests.java
View File

@@ -21,6 +21,7 @@ import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.time.ZoneId;
import java.util.AbstractList;
import java.util.ArrayList;
@@ -277,12 +278,12 @@ public class DefaultConversionServiceTests {
@Test
public void testStringToCharset() {
assertEquals(Charset.forName("UTF-8"), conversionService.convert("UTF-8", Charset.class));
assertEquals(StandardCharsets.UTF_8, conversionService.convert("UTF-8", Charset.class));
}
@Test
public void testCharsetToString() {
assertEquals("UTF-8", conversionService.convert(Charset.forName("UTF-8"), String.class));
assertEquals("UTF-8", conversionService.convert(StandardCharsets.UTF_8, String.class));
}
@Test

5
spring-core/src/test/java/org/springframework/util/MimeTypeTests.java
View File

@@ -17,6 +17,7 @@
package org.springframework.util;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -27,7 +28,7 @@ import org.junit.Test;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.support.DefaultConversionService;
import static java.util.Collections.singletonMap;
import static java.util.Collections.*;
import static org.junit.Assert.*;
/**
@@ -84,7 +85,7 @@ public class MimeTypeTests {
MimeType mimeType = MimeType.valueOf(s);
assertEquals("Invalid type", "application", mimeType.getType());
assertEquals("Invalid subtype", "xml", mimeType.getSubtype());
assertEquals("Invalid charset", Charset.forName("UTF-8"), mimeType.getCharset());
assertEquals("Invalid charset", StandardCharsets.UTF_8, mimeType.getCharset());
}
@Test