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

Consistent use of JDK 7 StandardCharsets over Charset.forName

Browse Source 
Issue: SPR-14492
This commit is contained in:
Juergen Hoeller
2016-08-26 14:16:19 +02:00
parent 50040e6139
commit 2e4a7480fc
18 changed files with 82 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java
View File

@@ -16,7 +16,7 @@
package org.springframework.util;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.charset.UnsupportedCharsetException;
import java.util.ArrayList;
import java.util.Collection;
@@ -47,8 +47,6 @@ public abstract class MimeTypeUtils {
private static final Random RND = new Random();
private static Charset US_ASCII = Charset.forName("US-ASCII");
/**
* Public constant mime type that includes all media ranges (i.e. "*/*").
*/
@@ -349,7 +347,7 @@ public abstract class MimeTypeUtils {
* Generate a random MIME boundary as String, often used in multipart mime types.
*/
public static String generateMultipartBoundaryString() {
return new String(generateMultipartBoundary(), US_ASCII);
return new String(generateMultipartBoundary(), StandardCharsets.US_ASCII);
}

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

@@ -16,7 +16,6 @@
package org.springframework.util;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
@@ -76,7 +75,7 @@ public class MimeTypeTests {
MimeType mimeType = MimeType.valueOf(s);
assertEquals("Invalid type", "text", mimeType.getType());
assertEquals("Invalid subtype", "html", mimeType.getSubtype());
assertEquals("Invalid charset", Charset.forName("ISO-8859-1"), mimeType.getCharset());
assertEquals("Invalid charset", StandardCharsets.ISO_8859_1, mimeType.getCharset());
}
@Test