Consistent support for Charset/StandardCharsets in UriUtils etc

Issue: SPR-15613

Author: jhoeller

spring-core/src/main/java/org/springframework/core/codec/ResourceEncoder.java

@@ -68,7 +68,7 @@ public boolean canEncode(ResolvableType elementType, @Nullable MimeType mimeType
 
 	@Override
 	protected Flux<DataBuffer> encode(Resource resource, DataBufferFactory dataBufferFactory,
-			ResolvableType type, MimeType mimeType, @Nullable Map<String, Object> hints) {
+			ResolvableType type, @Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
 
 		try {
 			if (resource.isFile()) {

spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -21,7 +21,7 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.sql.Blob;
 import java.sql.Clob;
 import java.sql.PreparedStatement;
@@ -322,17 +322,12 @@ public void setClobAsAsciiStream(
 
 			if (streamAsLob) {
 				if (asciiStream != null) {
-					try {
-						Reader reader = new InputStreamReader(asciiStream, "US-ASCII");
-						if (contentLength >= 0) {
-							ps.setClob(paramIndex, reader, contentLength);
-						}
-						else {
-							ps.setClob(paramIndex, reader);
-						}
+					Reader reader = new InputStreamReader(asciiStream, StandardCharsets.US_ASCII);
+					if (contentLength >= 0) {
+						ps.setClob(paramIndex, reader, contentLength);
 					}
-					catch (UnsupportedEncodingException ex) {
-						throw new SQLException("US-ASCII encoding not supported: " + ex);
+					else {
+						ps.setClob(paramIndex, reader);
 					}
 				}
 				else {

spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughClob.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -23,7 +23,6 @@
 import java.io.OutputStream;
 import java.io.Reader;
 import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
 import java.sql.Clob;
@@ -72,19 +71,14 @@ public long length() throws SQLException {
 
 	@Override
 	public Reader getCharacterStream() throws SQLException {
-		try {
-			if (this.content != null) {
-				return new StringReader(this.content);
-			}
-			else if (this.characterStream != null) {
-				return this.characterStream;
-			}
-			else {
-				return new InputStreamReader(this.asciiStream, "US-ASCII");
-			}
+		if (this.content != null) {
+			return new StringReader(this.content);
 		}
-		catch (UnsupportedEncodingException ex) {
-			throw new SQLException("US-ASCII encoding not supported: " + ex);
+		else if (this.characterStream != null) {
+			return this.characterStream;
+		}
+		else {
+			return new InputStreamReader(this.asciiStream, StandardCharsets.US_ASCII);
 		}
 	}
 
@@ -102,9 +96,6 @@ else if (this.characterStream != null) {
 				return this.asciiStream;
 			}
 		}
-		catch (UnsupportedEncodingException ex) {
-			throw new SQLException("US-ASCII encoding not supported: " + ex);
-		}
 		catch (IOException ex) {
 			throw new SQLException("Failed to read stream content: " + ex);
 		}

spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java

@@ -19,7 +19,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.security.Principal;
@@ -698,17 +697,12 @@ private void updatePathRequestProperties(MockHttpServletRequest request, String
 	}
 
 	private void addRequestParams(MockHttpServletRequest request, MultiValueMap<String, String> map) {
-		try {
-			for (Entry<String, List<String>> entry : map.entrySet()) {
-				for (String value : entry.getValue()) {
-					value = (value != null) ? UriUtils.decode(value, "UTF-8") : null;
-					request.addParameter(UriUtils.decode(entry.getKey(), "UTF-8"), value);
-				}
+		for (Entry<String, List<String>> entry : map.entrySet()) {
+			for (String value : entry.getValue()) {
+				value = (value != null ? UriUtils.decode(value, StandardCharsets.UTF_8) : null);
+				request.addParameter(UriUtils.decode(entry.getKey(), StandardCharsets.UTF_8), value);
 			}
 		}
-		catch (UnsupportedEncodingException ex) {
-			// shouldn't happen
-		}
 	}
 
 	private MultiValueMap<String, String> parseFormData(final MediaType mediaType) {

spring-web/src/main/java/org/springframework/http/codec/xml/Jaxb2XmlEncoder.java

@@ -71,7 +71,7 @@ public boolean canEncode(ResolvableType elementType, @Nullable MimeType mimeType
 
 	@Override
 	protected Flux<DataBuffer> encode(Object value, DataBufferFactory dataBufferFactory,
-			ResolvableType type, MimeType mimeType, @Nullable Map<String, Object> hints) {
+			ResolvableType type, @Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
 		try {
 			DataBuffer buffer = dataBufferFactory.allocateBuffer(1024);
 			OutputStream outputStream = buffer.asOutputStream();

spring-web/src/main/java/org/springframework/http/converter/feed/AbstractWireFeedHttpMessageConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -66,8 +66,8 @@ protected T readInternal(Class<? extends T> clazz, HttpInputMessage inputMessage
 
 		WireFeedInput feedInput = new WireFeedInput();
 		MediaType contentType = inputMessage.getHeaders().getContentType();
-		Charset charset =
-				(contentType != null && contentType.getCharset() != null? contentType.getCharset() : DEFAULT_CHARSET);
+		Charset charset = (contentType != null && contentType.getCharset() != null ?
+				contentType.getCharset() : DEFAULT_CHARSET);
 		try {
 			Reader reader = new InputStreamReader(inputMessage.getBody(), charset);
 			return (T) feedInput.build(reader);
@@ -81,20 +81,17 @@ protected T readInternal(Class<? extends T> clazz, HttpInputMessage inputMessage
 	protected void writeInternal(T wireFeed, HttpOutputMessage outputMessage)
 			throws IOException, HttpMessageNotWritableException {
 
-		String wireFeedEncoding = wireFeed.getEncoding();
-		if (!StringUtils.hasLength(wireFeedEncoding)) {
-			wireFeedEncoding = DEFAULT_CHARSET.name();
-		}
+		Charset charset = (StringUtils.hasLength(wireFeed.getEncoding()) ?
+				Charset.forName(wireFeed.getEncoding()) : DEFAULT_CHARSET);
 		MediaType contentType = outputMessage.getHeaders().getContentType();
 		if (contentType != null) {
-			Charset wireFeedCharset = Charset.forName(wireFeedEncoding);
-			contentType = new MediaType(contentType.getType(), contentType.getSubtype(), wireFeedCharset);
+			contentType = new MediaType(contentType.getType(), contentType.getSubtype(), charset);
 			outputMessage.getHeaders().setContentType(contentType);
 		}
 
 		WireFeedOutput feedOutput = new WireFeedOutput();
 		try {
-			Writer writer = new OutputStreamWriter(outputMessage.getBody(), wireFeedEncoding);
+			Writer writer = new OutputStreamWriter(outputMessage.getBody(), charset);
 			feedOutput.output(wireFeed, writer);
 		}
 		catch (FeedException ex) {

spring-web/src/main/java/org/springframework/web/client/RestClientResponseException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -18,6 +18,7 @@
 
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.lang.Nullable;
@@ -32,7 +33,7 @@ public class RestClientResponseException extends RestClientException {
 
 	private static final long serialVersionUID = -8803556342728481792L;
 
-	private static final String DEFAULT_CHARSET = "ISO-8859-1";
+	private static final Charset DEFAULT_CHARSET = StandardCharsets.ISO_8859_1;
 
 
 	private final int rawStatusCode;
@@ -62,7 +63,7 @@ public RestClientResponseException(String message, int statusCode, String status
 		this.statusText = statusText;
 		this.responseHeaders = responseHeaders;
 		this.responseBody = (responseBody != null ? responseBody : new byte[0]);
-		this.responseCharset = (responseCharset != null ? responseCharset.name() : DEFAULT_CHARSET);
+		this.responseCharset = (responseCharset != null ? responseCharset.name() : null);
 	}
 
 
@@ -98,6 +99,9 @@ public byte[] getResponseBodyAsByteArray() {
 	 * Return the response body as a string.
 	 */
 	public String getResponseBodyAsString() {
+		if (this.responseCharset == null) {
+			return new String(this.responseBody, DEFAULT_CHARSET);
+		}
 		try {
 			return new String(this.responseBody, this.responseCharset);
 		}