Polishing

Author: jhoeller

spring-web/src/main/java/org/springframework/http/HttpRange.java

@@ -244,7 +244,6 @@ public SuffixByteRange(long suffixLength) {
 			this.suffixLength = suffixLength;
 		}
 
-
 		@Override
 		public long getRangeStart(long length) {
 			if (this.suffixLength < length) {

spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpRequest.java

@@ -117,19 +117,18 @@ public ClientHttpResponse execute() throws IOException {
 		}
 	}
 
+
 	private static class OkHttpListenableFuture extends SettableListenableFuture<ClientHttpResponse> {
 
 	    private final Call call;
 
 	    public OkHttpListenableFuture(Call call) {
 	        this.call = call;
 	        this.call.enqueue(new Callback() {
-
 				@Override
 		        public void onResponse(Response response) {
 			        set(new OkHttpClientHttpResponse(response));
 		        }
-
 		        @Override
 		        public void onFailure(Request request, IOException ex) {
 			        setException(ex);

spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpRequestFactory.java

@@ -112,4 +112,5 @@ public void destroy() throws Exception {
 			this.client.getDispatcher().getExecutorService().shutdown();
 		}
 	}
+
 }

spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpResponse.java

@@ -25,8 +25,7 @@
 import org.springframework.util.Assert;
 
 /**
- * {@link org.springframework.http.client.ClientHttpResponse} implementation that uses
- * OkHttp.
+ * {@link ClientHttpResponse} implementation based on OkHttp.
  *
  * @author Luciano Leggieri
  * @author Arjen Poutsma
@@ -80,7 +79,8 @@ public void close() {
 			this.response.body().close();
 		}
 		catch (IOException ex) {
-			// Ignore
+			// ignore
 		}
 	}
+
 }

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

@@ -57,6 +57,7 @@ protected AbstractGenericHttpMessageConverter(MediaType... supportedMediaTypes)
 		super(supportedMediaTypes);
 	}
 
+
 	@Override
 	public boolean canRead(Type type, Class<?> contextClass, MediaType mediaType) {
 		return canRead(contextClass, mediaType);
@@ -78,8 +79,7 @@ public final void write(final T t, final Type type, MediaType contentType, HttpO
 		addDefaultHeaders(headers, t, contentType);
 
 		if (outputMessage instanceof StreamingHttpOutputMessage) {
-			StreamingHttpOutputMessage streamingOutputMessage =
-					(StreamingHttpOutputMessage) outputMessage;
+			StreamingHttpOutputMessage streamingOutputMessage = (StreamingHttpOutputMessage) outputMessage;
 			streamingOutputMessage.setBody(new StreamingHttpOutputMessage.Body() {
 				@Override
 				public void writeTo(final OutputStream outputStream) throws IOException {
@@ -106,6 +106,7 @@ public HttpHeaders getHeaders() {
 	@Override
 	protected void writeInternal(T t, HttpOutputMessage outputMessage)
 			throws IOException, HttpMessageNotWritableException {
+
 		writeInternal(t, null, outputMessage);
 	}
 

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

@@ -201,9 +201,7 @@ public HttpHeaders getHeaders() {
 	 * type was not provided, calls {@link #getContentLength}, and sets the corresponding headers
 	 * @since 4.2
 	 */
-	protected void addDefaultHeaders(final HttpHeaders headers, final T t, MediaType contentType)
-			throws IOException{
-
+	protected void addDefaultHeaders(HttpHeaders headers, T t, MediaType contentType) throws IOException{
 		if (headers.getContentType() == null) {
 			MediaType contentTypeToUse = contentType;
 			if (contentType == null || contentType.isWildcardType() || contentType.isWildcardSubtype()) {

spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java

@@ -88,18 +88,6 @@ public String getMessage() {
 		return sb.toString();
 	}
 
-	private static String requestParameterMapToString(Map<String, String[]> actualParams) {
-		StringBuilder result = new StringBuilder();
-		for (Iterator<Map.Entry<String, String[]>> it = actualParams.entrySet().iterator(); it.hasNext();) {
-			Map.Entry<String, String[]> entry = it.next();
-			result.append(entry.getKey()).append('=').append(ObjectUtils.nullSafeToString(entry.getValue()));
-			if (it.hasNext()) {
-				result.append(", ");
-			}
-		}
-		return result.toString();
-	}
-
 	/**
 	 * Return the parameter conditions that have been violated or the first group
 	 * in case of multiple groups.
@@ -126,4 +114,17 @@ public final Map<String, String[]> getActualParams() {
 		return this.actualParams;
 	}
 
+
+	private static String requestParameterMapToString(Map<String, String[]> actualParams) {
+		StringBuilder result = new StringBuilder();
+		for (Iterator<Map.Entry<String, String[]>> it = actualParams.entrySet().iterator(); it.hasNext();) {
+			Map.Entry<String, String[]> entry = it.next();
+			result.append(entry.getKey()).append('=').append(ObjectUtils.nullSafeToString(entry.getValue()));
+			if (it.hasNext()) {
+				result.append(", ");
+			}
+		}
+		return result.toString();
+	}
+
 }

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

@@ -116,7 +116,9 @@ public AsyncRestTemplate(AsyncClientHttpRequestFactory asyncRequestFactory) {
 	 * @param asyncRequestFactory the asynchronous request factory
 	 * @param syncRequestFactory the synchronous request factory
 	 */
-	public AsyncRestTemplate(AsyncClientHttpRequestFactory asyncRequestFactory, ClientHttpRequestFactory syncRequestFactory) {
+	public AsyncRestTemplate(
+			AsyncClientHttpRequestFactory asyncRequestFactory, ClientHttpRequestFactory syncRequestFactory) {
+
 		this(asyncRequestFactory, new RestTemplate(syncRequestFactory));
 	}
 
@@ -127,7 +129,7 @@ public AsyncRestTemplate(AsyncClientHttpRequestFactory asyncRequestFactory, Clie
 	 * @param restTemplate the synchronous template to use
 	 */
 	public AsyncRestTemplate(AsyncClientHttpRequestFactory requestFactory, RestTemplate restTemplate) {
-		Assert.notNull(restTemplate, "'restTemplate' must not be null");
+		Assert.notNull(restTemplate, "RestTemplate must not be null");
 		this.syncTemplate = restTemplate;
 		setAsyncRequestFactory(requestFactory);
 	}
@@ -142,7 +144,9 @@ public void setErrorHandler(ResponseErrorHandler errorHandler) {
 		this.syncTemplate.setErrorHandler(errorHandler);
 	}
 
-	/** Return the error handler. */
+	/**
+	 * Return the error handler.
+	 */
 	public ResponseErrorHandler getErrorHandler() {
 		return this.syncTemplate.getErrorHandler();
 	}
@@ -180,7 +184,7 @@ public void setMessageConverters(List<HttpMessageConverter<?>> messageConverters
 	 * Return the message body converters.
 	 */
 	public List<HttpMessageConverter<?>> getMessageConverters() {
-		return syncTemplate.getMessageConverters();
+		return this.syncTemplate.getMessageConverters();
 	}
 
 
@@ -232,6 +236,7 @@ public ListenableFuture<HttpHeaders> headForHeaders(URI url) throws RestClientEx
 		return execute(url, HttpMethod.HEAD, null, headersExtractor);
 	}
 
+
 	// POST
 
 	@Override

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

@@ -190,7 +190,7 @@ public RestTemplate(ClientHttpRequestFactory requestFactory) {
 	 * @since 3.2.7
 	 */
 	public RestTemplate(List<HttpMessageConverter<?>> messageConverters) {
-		Assert.notEmpty(messageConverters, "'messageConverters' must not be empty");
+		Assert.notEmpty(messageConverters, "At least one HttpMessageConverter required");
 		this.messageConverters.addAll(messageConverters);
 	}
 
@@ -200,7 +200,7 @@ public RestTemplate(List<HttpMessageConverter<?>> messageConverters) {
 	 * <p>These converters are used to convert from and to HTTP requests and responses.
 	 */
 	public void setMessageConverters(List<HttpMessageConverter<?>> messageConverters) {
-		Assert.notEmpty(messageConverters, "'messageConverters' must not be empty");
+		Assert.notEmpty(messageConverters, "At least one HttpMessageConverter required");
 		// Take getMessageConverters() List as-is when passed in here
 		if (this.messageConverters != messageConverters) {
 			this.messageConverters.clear();
@@ -220,7 +220,7 @@ public List<HttpMessageConverter<?>> getMessageConverters() {
 	 * <p>By default, RestTemplate uses a {@link DefaultResponseErrorHandler}.
 	 */
 	public void setErrorHandler(ResponseErrorHandler errorHandler) {
-		Assert.notNull(errorHandler, "'errorHandler' must not be null");
+		Assert.notNull(errorHandler, "ResponseErrorHandler must not be null");
 		this.errorHandler = errorHandler;
 	}
 
@@ -237,7 +237,7 @@ public ResponseErrorHandler getErrorHandler() {
 	 * @param handler the URI template handler to use
 	 */
 	public void setUriTemplateHandler(UriTemplateHandler handler) {
-		Assert.notNull(handler, "'uriTemplateHandler' is required.");
+		Assert.notNull(handler, "UriTemplateHandler must not be null");
 		this.uriTemplateHandler = handler;
 	}