Polishing

jhoeller · jhoeller · commit 39f8bd663ee9 · 2017-05-05T23:19:08.000+02:00
diff --git a/spring-web/src/main/java/org/springframework/http/codec/DecoderHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/DecoderHttpMessageReader.java
@@ -81,17 +81,13 @@ public boolean canRead(ResolvableType elementType, MediaType mediaType) {
 	}
 
 	@Override
-	public Flux<T> read(ResolvableType elementType, ReactiveHttpInputMessage message,
-			Map<String, Object> hints) {
-
+	public Flux<T> read(ResolvableType elementType, ReactiveHttpInputMessage message, Map<String, Object> hints) {
 		MediaType contentType = getContentType(message);
 		return this.decoder.decode(message.getBody(), elementType, contentType, hints);
 	}
 
 	@Override
-	public Mono<T> readMono(ResolvableType elementType, ReactiveHttpInputMessage message,
-			Map<String, Object> hints) {
-
+	public Mono<T> readMono(ResolvableType elementType, ReactiveHttpInputMessage message, Map<String, Object> hints) {
 		MediaType contentType = getContentType(message);
 		return this.decoder.decodeToMono(message.getBody(), elementType, contentType, hints);
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java
@@ -28,7 +28,6 @@
 import org.springframework.core.ResolvableType;
 import org.springframework.core.codec.Encoder;
 import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.core.io.buffer.DataBufferFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.ReactiveHttpOutputMessage;
 import org.springframework.http.server.reactive.ServerHttpRequest;
@@ -92,17 +91,15 @@ public boolean canWrite(ResolvableType elementType, MediaType mediaType) {
 
 	@Override
 	public Mono<Void> write(Publisher<? extends T> inputStream, ResolvableType elementType,
-			MediaType mediaType, ReactiveHttpOutputMessage message,
-			Map<String, Object> hints) {
+			MediaType mediaType, ReactiveHttpOutputMessage message, Map<String, Object> hints) {
 
 		MediaType contentType = updateContentType(message, mediaType);
-		DataBufferFactory factory = message.bufferFactory();
 
-		Flux<DataBuffer> body = this.encoder.encode(inputStream, factory, elementType, contentType, hints);
+		Flux<DataBuffer> body = this.encoder.encode(
+				inputStream, message.bufferFactory(), elementType, contentType, hints);
 
-		return isStreamingMediaType(contentType) ?
-				message.writeAndFlushWith(body.map(Flux::just)) :
-				message.writeWith(body);
+		return (isStreamingMediaType(contentType) ?
+				message.writeAndFlushWith(body.map(Flux::just)) : message.writeWith(body));
 	}
 
 	private MediaType updateContentType(ReactiveHttpOutputMessage message, MediaType mediaType) {
@@ -120,8 +117,8 @@ private MediaType updateContentType(ReactiveHttpOutputMessage message, MediaType
 	}
 
 	private static boolean useFallback(MediaType main, MediaType fallback) {
-		return main == null || !main.isConcrete() ||
-				main.equals(MediaType.APPLICATION_OCTET_STREAM) && fallback != null;
+		return (main == null || !main.isConcrete() ||
+				main.equals(MediaType.APPLICATION_OCTET_STREAM) && fallback != null);
 	}
 
 	private static MediaType addDefaultCharset(MediaType main, MediaType defaultType) {
diff --git a/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageReader.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.
@@ -53,7 +53,6 @@ public class FormHttpMessageReader implements HttpMessageReader<MultiValueMap<St
 	private static final ResolvableType MULTIVALUE_TYPE =
 			ResolvableType.forClassWithGenerics(MultiValueMap.class, String.class, String.class);
 
-
 	private Charset defaultCharset = DEFAULT_CHARSET;
 
 
@@ -63,7 +62,7 @@ public class FormHttpMessageReader implements HttpMessageReader<MultiValueMap<St
 	 * <p>By default this is set to "UTF-8".
 	 */
 	public void setDefaultCharset(Charset charset) {
-		Assert.notNull(charset, "'charset' must not be null");
+		Assert.notNull(charset, "Charset must not be null");
 		this.defaultCharset = charset;
 	}
 
@@ -77,8 +76,8 @@ public Charset getDefaultCharset() {
 
 	@Override
 	public boolean canRead(ResolvableType elementType, MediaType mediaType) {
-		return MULTIVALUE_TYPE.isAssignableFrom(elementType) &&
-				(mediaType == null || MediaType.APPLICATION_FORM_URLENCODED.isCompatibleWith(mediaType));
+		return (MULTIVALUE_TYPE.isAssignableFrom(elementType) &&
+				(mediaType == null || MediaType.APPLICATION_FORM_URLENCODED.isCompatibleWith(mediaType)));
 	}
 
 	@Override
diff --git a/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageWriter.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.
@@ -62,7 +62,7 @@ public class FormHttpMessageWriter implements HttpMessageWriter<MultiValueMap<St
 	 * <p>By default this is set to "UTF-8".
 	 */
 	public void setDefaultCharset(Charset charset) {
-		Assert.notNull(charset, "'charset' must not be null");
+		Assert.notNull(charset, "Charset must not be null");
 		this.defaultCharset = charset;
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/codec/HttpMessageDecoder.java b/spring-web/src/main/java/org/springframework/http/codec/HttpMessageDecoder.java
@@ -35,7 +35,6 @@ public interface HttpMessageDecoder<T> extends Decoder<T> {
 	/**
 	 * Get decoding hints based on the server request or annotations on the
 	 * target controller method parameter.
-	 *
 	 * @param actualType the actual target type to decode to, possibly a reactive
 	 * wrapper and sourced from {@link org.springframework.core.MethodParameter},
 	 * i.e. providing access to method parameter annotations.
diff --git a/spring-web/src/main/java/org/springframework/http/codec/HttpMessageEncoder.java b/spring-web/src/main/java/org/springframework/http/codec/HttpMessageEncoder.java
@@ -26,7 +26,6 @@
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 
-
 /**
  * Extension of {@code Encoder} exposing extra methods relevant in the context
  * of HTTP request or response body encoding.
@@ -45,7 +44,6 @@ public interface HttpMessageEncoder<T> extends Encoder<T> {
 	/**
 	 * Get decoding hints based on the server request or annotations on the
 	 * target controller method parameter.
-	 *
 	 * @param actualType the actual source type to encode, possibly a reactive
 	 * wrapper and sourced from {@link org.springframework.core.MethodParameter},
 	 * i.e. providing access to method annotations.
diff --git a/spring-web/src/main/java/org/springframework/http/codec/HttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/HttpMessageReader.java
@@ -57,7 +57,6 @@ public interface HttpMessageReader<T> {
 
 	/**
 	 * Read from the input message and encode to a stream of objects.
-	 *
 	 * @param elementType the type of objects in the stream which must have been
 	 * previously checked via {@link #canRead(ResolvableType, MediaType)}
 	 * @param message the message to read from
@@ -68,7 +67,6 @@ public interface HttpMessageReader<T> {
 
 	/**
 	 * Read from the input message and encode to a single object.
-	 *
 	 * @param elementType the type of objects in the stream which must have been
 	 * previously checked via {@link #canRead(ResolvableType, MediaType)}
 	 * @param message the message to read from
@@ -79,12 +77,11 @@ public interface HttpMessageReader<T> {
 
 	/**
 	 * Server-side only alternative to
-	 * {@link #read(ResolvableType, ReactiveHttpInputMessage, Map)} with
-	 * additional context available.
-	 *
-	 * @param actualType the actual type of the target method parameter; for
-	 * annotated controllers, the {@link MethodParameter} can be accessed via
-	 * {@link ResolvableType#getSource()}.
+	 * {@link #read(ResolvableType, ReactiveHttpInputMessage, Map)}
+	 * with additional context available.
+	 * @param actualType the actual type of the target method parameter;
+	 * for annotated controllers, the {@link MethodParameter} can be accessed
+	 * via {@link ResolvableType#getSource()}.
 	 * @param elementType the type of Objects in the output stream
 	 * @param request the current request
 	 * @param response the current response
@@ -99,12 +96,11 @@ default Flux<T> read(ResolvableType actualType, ResolvableType elementType, Serv
 
 	/**
 	 * Server-side only alternative to
-	 * {@link #readMono(ResolvableType, ReactiveHttpInputMessage, Map)} with
-	 * additional, context available.
-	 *
-	 * @param actualType the actual type of the target method parameter; for
-	 * annotated controllers, the {@link MethodParameter} can be accessed via
-	 * {@link ResolvableType#getSource()}.
+	 * {@link #readMono(ResolvableType, ReactiveHttpInputMessage, Map)}
+	 * with additional, context available.
+	 * @param actualType the actual type of the target method parameter;
+	 * for annotated controllers, the {@link MethodParameter} can be accessed
+	 * via {@link ResolvableType#getSource()}.
 	 * @param elementType the type of Objects in the output stream
 	 * @param request the current request
 	 * @param response the current response
diff --git a/spring-web/src/main/java/org/springframework/http/codec/HttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/HttpMessageWriter.java
@@ -69,7 +69,6 @@ public interface HttpMessageWriter<T> {
 	Mono<Void> write(Publisher<? extends T> inputStream, ResolvableType elementType,
 			MediaType mediaType, ReactiveHttpOutputMessage message, Map<String, Object> hints);
 
-
 	/**
 	 * Server-side only alternative to
 	 * {@link #write(Publisher, ResolvableType, MediaType, ReactiveHttpOutputMessage, Map)}
diff --git a/spring-web/src/main/java/org/springframework/http/codec/xml/JaxbContextContainer.java b/spring-web/src/main/java/org/springframework/http/codec/xml/JaxbContextContainer.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.
@@ -26,14 +26,14 @@
 import org.springframework.util.Assert;
 
 /**
+ * Holder for {@link JAXBContext} isntances.
+ *
  * @author Arjen Poutsma
  * @since 5.0
  */
 final class JaxbContextContainer {
 
-
-	private final ConcurrentMap<Class<?>, JAXBContext> jaxbContexts =
-			new ConcurrentHashMap<>(64);
+	private final ConcurrentMap<Class<?>, JAXBContext> jaxbContexts = new ConcurrentHashMap<>(64);
 
 
 	public Marshaller createMarshaller(Class<?> clazz) throws JAXBException {
@@ -47,7 +47,7 @@ public Unmarshaller createUnmarshaller(Class<?> clazz) throws JAXBException {
 	}
 
 	private JAXBContext getJaxbContext(Class<?> clazz) throws JAXBException {
-		Assert.notNull(clazz, "'clazz' must not be null");
+		Assert.notNull(clazz, "Class must not be null");
 		JAXBContext jaxbContext = this.jaxbContexts.get(clazz);
 		if (jaxbContext == null) {
 			jaxbContext = JAXBContext.newInstance(clazz);
diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.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.
@@ -109,9 +109,9 @@ public T extractData(ClientHttpResponse response) throws IOException {
 				}
 			}
 		}
-		catch(IOException | HttpMessageNotReadableException exc) {
-			throw new RestClientException("Error while extracting response for type ["
-					+ this.responseType + "] and content type [" + contentType + "]", exc);
+		catch (IOException | HttpMessageNotReadableException ex) {
+			throw new RestClientException("Error while extracting response for type [" +
+					this.responseType + "] and content type [" + contentType + "]", ex);
 		}
 
 		throw new RestClientException("Could not extract response: no suitable HttpMessageConverter found " +
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java
@@ -102,7 +102,7 @@ public void write() throws IOException {
 				outputMessage.getHeaders().getContentType());
 	}
 
-	@Test(expected = HttpMessageNotReadableException.class)
+	@Test(expected = IOException.class)
 	public void readInvalidXml() throws IOException {
 		String body = "FooBar";
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
@@ -154,7 +154,7 @@ public void readWithExternalReference() throws IOException {
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
 		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
 
-		this.thrown.expect(HttpMessageNotReadableException.class);
+		this.thrown.expect(IOException.class);
 		this.converter.read(MyBean.class, inputMessage);
 	}
 
@@ -181,7 +181,7 @@ public void readWithXmlBomb() throws IOException {
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
 		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
 
-		this.thrown.expect(HttpMessageNotReadableException.class);
+		this.thrown.expect(IOException.class);
 		this.converter.read(MyBean.class, inputMessage);
 	}
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/ServerResponseResultHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/ServerResponseResultHandler.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.
@@ -35,21 +35,23 @@ public class ServerResponseResultHandler implements HandlerResultHandler {
 
 	private final HandlerStrategies strategies;
 
+
 	/**
-	 * Create a {@code ResponseResultHandler} with default strategies.
+	 * Create a {@code ServerResponseResultHandler} with default strategies.
 	 */
 	public ServerResponseResultHandler() {
 		this(HandlerStrategies.builder().build());
 	}
 
 	/**
-	 * Create a {@code ResponseResultHandler} with the given strategies.
+	 * Create a {@code ServerResponseResultHandler} with the given strategies.
 	 */
 	public ServerResponseResultHandler(HandlerStrategies strategies) {
-		Assert.notNull(strategies, "'strategies' must not be null");
+		Assert.notNull(strategies, "HandlerStrategies must not be null");
 		this.strategies = strategies;
 	}
 
+
 	@Override
 	public boolean supports(HandlerResult result) {
 		return result.getReturnValue()
@@ -59,8 +61,8 @@ public boolean supports(HandlerResult result) {
 
 	@Override
 	public Mono<Void> handleResult(ServerWebExchange exchange, HandlerResult result) {
-		ServerResponse response = (ServerResponse) result.getReturnValue().orElseThrow(
-				IllegalStateException::new);
+		ServerResponse response = (ServerResponse) result.getReturnValue().orElseThrow(IllegalStateException::new);
 		return response.writeTo(exchange, this.strategies);
 	}
+
 }
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/HandlerResultHandlerSupport.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/HandlerResultHandlerSupport.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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.result;
 
 import java.util.ArrayList;
@@ -54,15 +55,11 @@ public abstract class HandlerResultHandlerSupport implements Ordered {
 	private int order = LOWEST_PRECEDENCE;
 
 
-	protected HandlerResultHandlerSupport(RequestedContentTypeResolver contentTypeResolver) {
-		this(contentTypeResolver, new ReactiveAdapterRegistry());
-	}
-
 	protected HandlerResultHandlerSupport(RequestedContentTypeResolver contentTypeResolver,
 			ReactiveAdapterRegistry adapterRegistry) {
 
-		Assert.notNull(contentTypeResolver, "'contentTypeResolver' is required.");
-		Assert.notNull(adapterRegistry, "'adapterRegistry' is required.");
+		Assert.notNull(contentTypeResolver, "RequestedContentTypeResolver is required");
+		Assert.notNull(adapterRegistry, "ReactiveAdapterRegistry is required");
 		this.contentTypeResolver = contentTypeResolver;
 		this.adapterRegistry = adapterRegistry;
 	}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java
@@ -17,7 +17,6 @@
 package org.springframework.web.reactive.result.method.annotation;
 
 import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -84,8 +83,8 @@ protected AbstractMessageReaderArgumentResolver(List<HttpMessageReader<?>> messa
 			ReactiveAdapterRegistry adapterRegistry) {
 
 		super(adapterRegistry);
-		Assert.notEmpty(messageReaders, "At least one HttpMessageReader is required.");
-		Assert.notNull(adapterRegistry, "'adapterRegistry' is required");
+		Assert.notEmpty(messageReaders, "At least one HttpMessageReader is required");
+		Assert.notNull(adapterRegistry, "ReactiveAdapterRegistry is required");
 		this.messageReaders = messageReaders;
 		this.supportedMediaTypes = messageReaders.stream()
 				.flatMap(converter -> converter.getReadableMediaTypes().stream())
@@ -156,13 +155,12 @@ protected Mono<Object> readBody(MethodParameter bodyParameter, boolean isBodyReq
 	}
 
 	private Throwable handleReadError(MethodParameter parameter, Throwable ex) {
-		return ex instanceof DecodingException ?
-				new ServerWebInputException("Failed to read HTTP message", parameter, ex) : ex;
+		return (ex instanceof DecodingException ?
+				new ServerWebInputException("Failed to read HTTP message", parameter, ex) : ex);
 	}
 
-	private ServerWebInputException handleMissingBody(MethodParameter parameter) {
-		Method method = parameter.getMethod();
-		return new ServerWebInputException("Request body is missing: " + method.toGenericString());
+	private ServerWebInputException handleMissingBody(MethodParameter param) {
+		return new ServerWebInputException("Request body is missing: " + param.getMethod().toGenericString());
 	}
 
 	/**
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/HandlerResultHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/HandlerResultHandlerTests.java
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java

Original file line number	Diff line number	Diff line change
`@@ -81,17 +81,13 @@ public boolean canRead(ResolvableType elementType, MediaType mediaType) {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`@Override`
`84`		`- public Flux<T> read(ResolvableType elementType, ReactiveHttpInputMessage message,`
`85`		`- Map<String, Object> hints) {`
`86`		`-`
	`84`	`+ public Flux<T> read(ResolvableType elementType, ReactiveHttpInputMessage message, Map<String, Object> hints) {`
`87`	`85`	`MediaType contentType = getContentType(message);`
`88`	`86`	`return this.decoder.decode(message.getBody(), elementType, contentType, hints);`
`89`	`87`	`}`
`90`	`88`
`91`	`89`	`@Override`
`92`		`- public Mono<T> readMono(ResolvableType elementType, ReactiveHttpInputMessage message,`
`93`		`- Map<String, Object> hints) {`
`94`		`-`
	`90`	`+ public Mono<T> readMono(ResolvableType elementType, ReactiveHttpInputMessage message, Map<String, Object> hints) {`
`95`	`91`	`MediaType contentType = getContentType(message);`
`96`	`92`	`return this.decoder.decodeToMono(message.getBody(), elementType, contentType, hints);`
`97`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2016 the original author or authors.`
	`2`	`+ * Copyright 2002-2017 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -62,7 +62,7 @@ public class FormHttpMessageWriter implements HttpMessageWriter<MultiValueMap<St`
`62`	`62`	`* <p>By default this is set to "UTF-8".`
`63`	`63`	`*/`
`64`	`64`	`public void setDefaultCharset(Charset charset) {`
`65`		`- Assert.notNull(charset, "'charset' must not be null");`
	`65`	`+ Assert.notNull(charset, "Charset must not be null");`
`66`	`66`	`this.defaultCharset = charset;`
`67`	`67`	`}`
`68`	`68`