Polishing (includes minor performance refinements from master)

spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -254,13 +254,12 @@ public class SimpleJndiBeanFactory extends JndiLocatorSupport implements BeanFac
 	@SuppressWarnings("unchecked")
 	private <T> T doGetSingleton(String name, @Nullable Class<T> requiredType) throws NamingException {
 		synchronized (this.singletonObjects) {
-			if (this.singletonObjects.containsKey(name)) {
+			Object singleton = this.singletonObjects.get(name);
-				Object jndiObject = this.singletonObjects.get(name);
+			if (singleton != null) {
-				if (requiredType != null && !requiredType.isInstance(jndiObject)) {
+				if (requiredType != null && !requiredType.isInstance(singleton)) {
-					throw new TypeMismatchNamingException(
+					throw new TypeMismatchNamingException(convertJndiName(name), requiredType, singleton.getClass());
-							convertJndiName(name), requiredType, (jndiObject != null ? jndiObject.getClass() : null));
 				}
-				return (T) jndiObject;
+				return (T) singleton;
 			}
 			T jndiObject = lookup(name, requiredType);
 			this.singletonObjects.put(name, jndiObject);
@@ -274,14 +273,12 @@ public class SimpleJndiBeanFactory extends JndiLocatorSupport implements BeanFac
 		}
 		else {
 			synchronized (this.resourceTypes) {
-				if (this.resourceTypes.containsKey(name)) {
+				Class<?> type = this.resourceTypes.get(name);
-					return this.resourceTypes.get(name);
+				if (type == null) {
-				}
+					type = lookup(name, null).getClass();
-				else {
-					Class<?> type = lookup(name, null).getClass();
 					this.resourceTypes.put(name, type);
-					return type;
 				}
+				return type;
 			}
 		}
 	}

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

@@ -40,10 +40,10 @@ import org.springframework.util.MimeType;
  */
 public abstract class AbstractDecoder<T> implements Decoder<T> {
 
-	protected Log logger = LogFactory.getLog(getClass());
-
 	private final List<MimeType> decodableMimeTypes;
 
+	protected Log logger = LogFactory.getLog(getClass());
+
 
 	protected AbstractDecoder(MimeType... supportedMimeTypes) {
 		this.decodableMimeTypes = Arrays.asList(supportedMimeTypes);

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

@@ -36,10 +36,10 @@ import org.springframework.util.MimeType;
  */
 public abstract class AbstractEncoder<T> implements Encoder<T> {
 
-	protected Log logger = LogFactory.getLog(getClass());
-
 	private final List<MimeType> encodableMimeTypes;
 
+	protected Log logger = LogFactory.getLog(getClass());
+
 
 	protected AbstractEncoder(MimeType... supportedMimeTypes) {
 		this.encodableMimeTypes = Arrays.asList(supportedMimeTypes);

spring-core/src/main/java/org/springframework/core/log/CompositeLog.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -63,38 +63,43 @@ final class CompositeLog implements Log {
 	}
 
 	private static Log initLogger(List<Log> loggers, Predicate<Log> predicate) {
-		return loggers.stream().filter(predicate).findFirst().orElse(NO_OP_LOG);
+		for (Log logger : loggers) {
+			if (predicate.test(logger)) {
+				return logger;
+			}
+		}
+		return NO_OP_LOG;
 	}
 
 
 	@Override
 	public boolean isFatalEnabled() {
-		return this.fatalLogger != NO_OP_LOG;
+		return (this.fatalLogger != NO_OP_LOG);
 	}
 
 	@Override
 	public boolean isErrorEnabled() {
-		return this.errorLogger != NO_OP_LOG;
+		return (this.errorLogger != NO_OP_LOG);
 	}
 
 	@Override
 	public boolean isWarnEnabled() {
-		return this.warnLogger != NO_OP_LOG;
+		return (this.warnLogger != NO_OP_LOG);
 	}
 
 	@Override
 	public boolean isInfoEnabled() {
-		return this.infoLogger != NO_OP_LOG;
+		return (this.infoLogger != NO_OP_LOG);
 	}
 
 	@Override
 	public boolean isDebugEnabled() {
-		return this.debugLogger != NO_OP_LOG;
+		return (this.debugLogger != NO_OP_LOG);
 	}
 
 	@Override
 	public boolean isTraceEnabled() {
-		return this.traceLogger != NO_OP_LOG;
+		return (this.traceLogger != NO_OP_LOG);
 	}
 
 	@Override

spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -58,8 +58,6 @@ public class HandlerMethod {
 	public static final Log defaultLogger = LogFactory.getLog(HandlerMethod.class);
 
 
-	protected Log logger = defaultLogger;
-
 	private final Object bean;
 
 	@Nullable
@@ -76,6 +74,8 @@ public class HandlerMethod {
 	@Nullable
 	private HandlerMethod resolvedFromHandlerMethod;
 
+	protected Log logger = defaultLogger;
+
 
 	/**
 	 * Create an instance from a bean instance and a method.

spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AsyncHandlerMethodReturnValueHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -43,8 +43,8 @@ public interface AsyncHandlerMethodReturnValueHandler extends HandlerMethodRetur
 	 * {@link #supportsReturnType(org.springframework.core.MethodParameter)}
 	 * is called and it returns {@code true}.
 	 * @param returnValue the value returned from the handler method
-	 * @param returnType the type of the return value.
+	 * @param returnType the type of the return value
-	 * @return true if the return value type represents an async value.
+	 * @return {@code true} if the return value type represents an async value
 	 */
 	boolean isAsyncReturnValue(Object returnValue, MethodParameter returnType);
 
@@ -58,9 +58,9 @@ public interface AsyncHandlerMethodReturnValueHandler extends HandlerMethodRetur
 	 * {@link #supportsReturnType(org.springframework.core.MethodParameter)}
 	 * is called and it returns {@code true}.
 	 * @param returnValue the value returned from the handler method
-	 * @param returnType the type of the return value.
+	 * @param returnType the type of the return value
-	 * @return the resulting ListenableFuture or {@code null} in which case no
+	 * @return the resulting ListenableFuture, or {@code null} in which case
-	 * further handling will be performed.
+	 * no further handling will be performed
 	 */
 	@Nullable
 	ListenableFuture<?> toListenableFuture(Object returnValue, MethodParameter returnType);

spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/ReactiveReturnValueHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -48,7 +48,7 @@ public class ReactiveReturnValueHandler extends AbstractAsyncReturnValueHandler
 
 	@Override
 	public boolean supportsReturnType(MethodParameter returnType) {
-		return this.adapterRegistry.getAdapter(returnType.getParameterType()) != null;
+		return (this.adapterRegistry.getAdapter(returnType.getParameterType()) != null);
 	}
 
 	@Override

spring-messaging/src/main/java/org/springframework/messaging/support/AbstractMessageChannel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -42,10 +42,10 @@ public abstract class AbstractMessageChannel implements MessageChannel, Intercep
 
 	protected Log logger = LogFactory.getLog(getClass());
 
-	private final List<ChannelInterceptor> interceptors = new ArrayList<>(5);
-
 	private String beanName;
 
+	private final List<ChannelInterceptor> interceptors = new ArrayList<>(5);
+
 
 	public AbstractMessageChannel() {
 		this.beanName = getClass().getSimpleName() + "@" + ObjectUtils.getIdentityHexString(this);

spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -70,8 +70,6 @@ public class ReactorNettyTcpClient<P> implements TcpOperations<P> {
 
 	private static final int PUBLISH_ON_BUFFER_SIZE = 16;
 
-	private Log logger = LogFactory.getLog(ReactorNettyTcpClient.class);
-
 
 	private final TcpClient tcpClient;
 
@@ -81,13 +79,15 @@ public class ReactorNettyTcpClient<P> implements TcpOperations<P> {
 	private final ChannelGroup channelGroup;
 
 	@Nullable
-	private LoopResources loopResources;
+	private final LoopResources loopResources;
 
 	@Nullable
-	private ConnectionProvider poolResources;
+	private final ConnectionProvider poolResources;
 
 	private final Scheduler scheduler = Schedulers.newParallel("tcp-client-scheduler");
 
+	private Log logger = LogFactory.getLog(ReactorNettyTcpClient.class);
+
 	private volatile boolean stopping = false;
 
 

spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java

@@ -415,7 +415,7 @@ public class Jaxb2Marshaller implements MimeMarshaller, MimeUnmarshaller, Generi
 	}
 
 	/**
-	 * Indicates whether DTD parsing should be supported.
+	 * Indicate whether DTD parsing should be supported.
 	 * <p>Default is {@code false} meaning that DTD is disabled.
 	 */
 	public void setSupportDtd(boolean supportDtd) {
@@ -423,14 +423,14 @@ public class Jaxb2Marshaller implements MimeMarshaller, MimeUnmarshaller, Generi
 	}
 
 	/**
-	 * Whether DTD parsing is supported.
+	 * Return whether DTD parsing is supported.
 	 */
 	public boolean isSupportDtd() {
 		return this.supportDtd;
 	}
 
 	/**
-	 * Indicates whether external XML entities are processed when unmarshalling.
+	 * Indicate whether external XML entities are processed when unmarshalling.
 	 * <p>Default is {@code false}, meaning that external entities are not resolved.
 	 * Note that processing of external entities will only be enabled/disabled when the
 	 * {@code Source} passed to {@link #unmarshal(Source)} is a {@link SAXSource} or
@@ -442,12 +442,12 @@ public class Jaxb2Marshaller implements MimeMarshaller, MimeUnmarshaller, Generi
 	public void setProcessExternalEntities(boolean processExternalEntities) {
 		this.processExternalEntities = processExternalEntities;
 		if (processExternalEntities) {
-			setSupportDtd(true);
+			this.supportDtd = true;
 		}
 	}
 
 	/**
-	 * Returns the configured value for whether XML external entities are allowed.
+	 * Return whether XML external entities are allowed.
 	 */
 	public boolean isProcessExternalEntities() {
 		return this.processExternalEntities;

spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -86,7 +86,7 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 
 
 	/**
-	 * Indicates whether DTD parsing should be supported.
+	 * Indicate whether DTD parsing should be supported.
 	 * <p>Default is {@code false} meaning that DTD is disabled.
 	 */
 	public void setSupportDtd(boolean supportDtd) {
@@ -94,14 +94,14 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 	}
 
 	/**
-	 * Whether DTD parsing is supported.
+	 * Return whether DTD parsing is supported.
 	 */
 	public boolean isSupportDtd() {
 		return this.supportDtd;
 	}
 
 	/**
-	 * Indicates whether external XML entities are processed when unmarshalling.
+	 * Indicate whether external XML entities are processed when unmarshalling.
 	 * <p>Default is {@code false}, meaning that external entities are not resolved.
 	 * Note that processing of external entities will only be enabled/disabled when the
 	 * {@code Source} passed to {@link #unmarshal(Source)} is a {@link SAXSource} or
@@ -113,12 +113,12 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 	public void setProcessExternalEntities(boolean processExternalEntities) {
 		this.processExternalEntities = processExternalEntities;
 		if (processExternalEntities) {
-			setSupportDtd(true);
+			this.supportDtd = true;
 		}
 	}
 
 	/**
-	 * Returns the configured value for whether XML external entities are allowed.
+	 * Return whether XML external entities are allowed.
 	 * @see #createXmlReader()
 	 */
 	public boolean isProcessExternalEntities() {

spring-test/src/test/java/org/springframework/test/web/client/DefaultRequestExpectationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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,15 +26,11 @@ import org.junit.rules.ExpectedException;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 
-import static junit.framework.TestCase.assertFalse;
+import static org.junit.Assert.*;
-import static org.junit.Assert.assertTrue;
+import static org.springframework.http.HttpMethod.*;
-import static org.springframework.http.HttpMethod.GET;
+import static org.springframework.test.web.client.ExpectedCount.*;
-import static org.springframework.http.HttpMethod.POST;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.*;
-import static org.springframework.test.web.client.ExpectedCount.once;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.*;
-import static org.springframework.test.web.client.ExpectedCount.twice;
-import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
-import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
-import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
 
 /**
  * Unit tests for {@link DefaultRequestExpectation}.
@@ -86,7 +82,6 @@ public class DefaultRequestExpectationTests {
 	}
 
 
-
 	@SuppressWarnings("deprecation")
 	private ClientHttpRequest createRequest(HttpMethod method, String url) {
 		try {

spring-test/src/test/java/org/springframework/test/web/client/MockRestServiceServerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2019 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,6 +23,7 @@ import org.junit.Test;
 import org.springframework.test.web.client.MockRestServiceServer.MockRestServiceServerBuilder;
 import org.springframework.web.client.RestTemplate;
 
+import static org.junit.Assert.*;
 import static org.springframework.http.HttpMethod.*;
 import static org.springframework.test.web.client.match.MockRestRequestMatchers.*;
 import static org.springframework.test.web.client.response.MockRestResponseCreators.*;
@@ -124,6 +125,7 @@ public class MockRestServiceServerTests {
 
 		try {
 			this.restTemplate.getForEntity("/some-service/some-endpoint", String.class);
+			fail("Expected exception");
 		}
 		catch (Exception ex) {
 			this.restTemplate.postForEntity("/reporting-service/report-error", ex.toString(), String.class);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -50,7 +50,7 @@ public interface HttpMessageWriter<T> {
 	/**
 	 * Whether the given object type is supported by this writer.
 	 * @param elementType the type of object to check
-	 * @param mediaType the media type for the write, possibly {@code null}
+	 * @param mediaType the media type for the write (possibly {@code null})
 	 * @return {@code true} if writable, {@code false} otherwise
 	 */
 	boolean canWrite(ResolvableType elementType, @Nullable MediaType mediaType);
@@ -60,8 +60,8 @@ public interface HttpMessageWriter<T> {
 	 * @param inputStream the objects to write
 	 * @param elementType the type of objects in the stream which must have been
 	 * previously checked via {@link #canWrite(ResolvableType, MediaType)}
-	 * @param mediaType the content type for the write, possibly {@code null} to
+	 * @param mediaType the content type for the write (possibly {@code null} to
-	 * indicate that the default content type of the writer must be used.
+	 * indicate that the default content type of the writer must be used)
 	 * @param message the message to write to
 	 * @param hints additional information about how to encode and write
 	 * @return indicates completion or error
@@ -77,8 +77,8 @@ public interface HttpMessageWriter<T> {
 	 * value; for annotated controllers, the {@link MethodParameter} can be
 	 * accessed via {@link ResolvableType#getSource()}.
 	 * @param elementType the type of Objects in the input stream
-	 * @param mediaType the content type to use, possibly {@code null} indicating
+	 * @param mediaType the content type to use (possibly {@code null} indicating
-	 * the default content type of the writer should be used.
+	 * the default content type of the writer should be used)
 	 * @param request the current request
 	 * @param response the current response
 	 * @return a {@link Mono} that indicates completion of writing or error

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -68,7 +68,7 @@ public class Jaxb2RootElementHttpMessageConverter extends AbstractJaxb2HttpMessa
 
 
 	/**
-	 * Indicates whether DTD parsing should be supported.
+	 * Indicate whether DTD parsing should be supported.
 	 * <p>Default is {@code false} meaning that DTD is disabled.
 	 */
 	public void setSupportDtd(boolean supportDtd) {
@@ -76,14 +76,14 @@ public class Jaxb2RootElementHttpMessageConverter extends AbstractJaxb2HttpMessa
 	}
 
 	/**
-	 * Whether DTD parsing is supported.
+	 * Return whether DTD parsing is supported.
 	 */
 	public boolean isSupportDtd() {
 		return this.supportDtd;
 	}
 
 	/**
-	 * Indicates whether external XML entities are processed when converting to a Source.
+	 * Indicate whether external XML entities are processed when converting to a Source.
 	 * <p>Default is {@code false}, meaning that external entities are not resolved.
 	 * <p><strong>Note:</strong> setting this option to {@code true} also
 	 * automatically sets {@link #setSupportDtd} to {@code true}.
@@ -91,12 +91,12 @@ public class Jaxb2RootElementHttpMessageConverter extends AbstractJaxb2HttpMessa
 	public void setProcessExternalEntities(boolean processExternalEntities) {
 		this.processExternalEntities = processExternalEntities;
 		if (processExternalEntities) {
-			setSupportDtd(true);
+			this.supportDtd = true;
 		}
 	}
 
 	/**
-	 * Returns the configured value for whether XML external entities are allowed.
+	 * Return whether XML external entities are allowed.
 	 */
 	public boolean isProcessExternalEntities() {
 		return this.processExternalEntities;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -100,7 +100,7 @@ public class SourceHttpMessageConverter<T extends Source> extends AbstractHttpMe
 
 
 	/**
-	 * Indicates whether DTD parsing should be supported.
+	 * Indicate whether DTD parsing should be supported.
 	 * <p>Default is {@code false} meaning that DTD is disabled.
 	 */
 	public void setSupportDtd(boolean supportDtd) {
@@ -108,14 +108,14 @@ public class SourceHttpMessageConverter<T extends Source> extends AbstractHttpMe
 	}
 
 	/**
-	 * Whether DTD parsing is supported.
+	 * Return whether DTD parsing is supported.
 	 */
 	public boolean isSupportDtd() {
 		return this.supportDtd;
 	}
 
 	/**
-	 * Indicates whether external XML entities are processed when converting to a Source.
+	 * Indicate whether external XML entities are processed when converting to a Source.
 	 * <p>Default is {@code false}, meaning that external entities are not resolved.
 	 * <p><strong>Note:</strong> setting this option to {@code true} also
 	 * automatically sets {@link #setSupportDtd} to {@code true}.
@@ -123,12 +123,12 @@ public class SourceHttpMessageConverter<T extends Source> extends AbstractHttpMe
 	public void setProcessExternalEntities(boolean processExternalEntities) {
 		this.processExternalEntities = processExternalEntities;
 		if (processExternalEntities) {
-			setSupportDtd(true);
+			this.supportDtd = true;
 		}
 	}
 
 	/**
-	 * Returns the configured value for whether XML external entities are allowed.
+	 * Return whether XML external entities are allowed.
 	 */
 	public boolean isProcessExternalEntities() {
 		return this.processExternalEntities;

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

@@ -950,9 +950,9 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 						return;
 					}
 				}
-				String message = "No HttpMessageConverter for [" + requestBodyClass.getName() + "]";
+				String message = "No HttpMessageConverter for " + requestBodyClass.getName();
 				if (requestContentType != null) {
-					message += " and content type [" + requestContentType + "]";
+					message += " and content type \"" + requestContentType + "\"";
 				}
 				throw new RestClientException(message);
 			}
@@ -964,8 +964,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 					logger.debug("Writing [" + body + "] as \"" + mediaType + "\"");
 				}
 				else {
-					String classname = converter.getClass().getName();
+					logger.debug("Writing [" + body + "] with " + converter.getClass().getName());
-					logger.debug("Writing [" + body + "] with " + classname);
 				}
 			}
 		}

spring-web/src/main/java/org/springframework/web/method/support/AsyncHandlerMethodReturnValueHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -38,9 +38,9 @@ public interface AsyncHandlerMethodReturnValueHandler extends HandlerMethodRetur
 
 	/**
 	 * Whether the given return value represents asynchronous computation.
-	 * @param returnValue the return value
+	 * @param returnValue the value returned from the handler method
 	 * @param returnType the return type
-	 * @return {@code true} if the return value is asynchronous
+	 * @return {@code true} if the return value type represents an async value
 	 */
 	boolean isAsyncReturnValue(@Nullable Object returnValue, MethodParameter returnType);
 

spring-web/src/main/java/org/springframework/web/server/NotAcceptableStatusException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -43,10 +43,10 @@ public class NotAcceptableStatusException extends ResponseStatusException {
 	}
 
 	/**
-	 * Constructor for when requested Content-Type is not supported.
+	 * Constructor for when the requested Content-Type is not supported.
 	 */
 	public NotAcceptableStatusException(List<MediaType> supportedMediaTypes) {
-		super(HttpStatus.NOT_ACCEPTABLE, "Could not find acceptable representation", null);
+		super(HttpStatus.NOT_ACCEPTABLE, "Could not find acceptable representation");
 		this.supportedMediaTypes = Collections.unmodifiableList(supportedMediaTypes);
 	}
 

spring-webflux/src/main/java/org/springframework/web/reactive/result/HandlerResultHandlerSupport.java

@@ -117,8 +117,8 @@ public abstract class HandlerResultHandlerSupport implements Ordered {
 	 * @return the selected media type, or {@code null} if none
 	 */
 	@Nullable
-	protected MediaType selectMediaType(ServerWebExchange exchange,
+	protected MediaType selectMediaType(
-			Supplier<List<MediaType>> producibleTypesSupplier) {
+			ServerWebExchange exchange, Supplier<List<MediaType>> producibleTypesSupplier) {
 
 		MediaType contentType = exchange.getResponse().getHeaders().getContentType();
 		if (contentType != null && contentType.isConcrete()) {
@@ -157,8 +157,8 @@ public abstract class HandlerResultHandlerSupport implements Ordered {
 
 		if (selected != null) {
 			if (logger.isDebugEnabled()) {
-				logger.debug("Using '" + selected + "' given " +
+				logger.debug("Using '" + selected + "' given " + acceptableTypes +
-						acceptableTypes + " and supported " + producibleTypes);
+						" and supported " + producibleTypes);
 			}
 		}
 		else if (logger.isDebugEnabled()) {
@@ -173,9 +173,8 @@ public abstract class HandlerResultHandlerSupport implements Ordered {
 		return getContentTypeResolver().resolveMediaTypes(exchange);
 	}
 
-	@SuppressWarnings("unchecked")
+	private List<MediaType> getProducibleTypes(
-	private List<MediaType> getProducibleTypes(ServerWebExchange exchange,
+			ServerWebExchange exchange, Supplier<List<MediaType>> producibleTypesSupplier) {
-			Supplier<List<MediaType>> producibleTypesSupplier) {
 
 		Set<MediaType> mediaTypes = exchange.getAttribute(HandlerMapping.PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE);
 		return (mediaTypes != null ? new ArrayList<>(mediaTypes) : producibleTypesSupplier.get());

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -16,8 +16,8 @@
 
 package org.springframework.web.reactive.result.method.annotation;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Mono;
@@ -29,8 +29,6 @@ import org.springframework.core.ResolvableType;
 import org.springframework.core.codec.Hints;
 import org.springframework.http.MediaType;
 import org.springframework.http.codec.HttpMessageWriter;
-import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.web.reactive.accept.RequestedContentTypeResolver;
@@ -135,8 +133,6 @@ public abstract class AbstractMessageWriterResultHandler extends HandlerResultHa
 			return Mono.from((Publisher<Void>) publisher);
 		}
 
-		ServerHttpRequest request = exchange.getRequest();
-		ServerHttpResponse response = exchange.getResponse();
 		MediaType bestMediaType = selectMediaType(exchange, () -> getMediaTypesFor(elementType));
 		if (bestMediaType != null) {
 			String logPrefix = exchange.getLogPrefix();
@@ -146,18 +142,18 @@ public abstract class AbstractMessageWriterResultHandler extends HandlerResultHa
 			}
 			for (HttpMessageWriter<?> writer : getMessageWriters()) {
 				if (writer.canWrite(elementType, bestMediaType)) {
-					return writer.write((Publisher) publisher, actualType, elementType, bestMediaType,
+					return writer.write((Publisher) publisher, actualType, elementType,
-							request, response, Hints.from(Hints.LOG_PREFIX_HINT, logPrefix));
+							bestMediaType, exchange.getRequest(), exchange.getResponse(),
+							Hints.from(Hints.LOG_PREFIX_HINT, logPrefix));
 				}
 			}
 		}
-		else {
-			if (getMediaTypesFor(elementType).isEmpty()) {
-				return Mono.error(new IllegalStateException("No writer for : " + elementType));
-			}
-		}
 
-		return Mono.error(new NotAcceptableStatusException(getMediaTypesFor(elementType)));
+		List<MediaType> mediaTypes = getMediaTypesFor(elementType);
+		if (bestMediaType == null && mediaTypes.isEmpty()) {
+			return Mono.error(new IllegalStateException("No HttpMessageWriter for " + elementType));
+		}
+		return Mono.error(new NotAcceptableStatusException(mediaTypes));
 	}
 
 	private ResolvableType getElementType(ReactiveAdapter adapter, ResolvableType genericType) {
@@ -173,10 +169,13 @@ public abstract class AbstractMessageWriterResultHandler extends HandlerResultHa
 	}
 
 	private List<MediaType> getMediaTypesFor(ResolvableType elementType) {
-		return getMessageWriters().stream()
+		List<MediaType> writableMediaTypes = new ArrayList<>();
-				.filter(converter -> converter.canWrite(elementType, null))
+		for (HttpMessageWriter<?> converter : getMessageWriters()) {
-				.flatMap(converter -> converter.getWritableMediaTypes().stream())
+			if (converter.canWrite(elementType, null)) {
-				.collect(Collectors.toList());
+				writableMediaTypes.addAll(converter.getWritableMediaTypes());
+			}
+		}
+		return writableMediaTypes;
 	}
 
 }

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -112,56 +112,56 @@ class ControllerMethodResolver {
 	private final Map<Class<?>, SessionAttributesHandler> sessionAttributesHandlerCache = new ConcurrentHashMap<>(64);
 
 
-	ControllerMethodResolver(ArgumentResolverConfigurer customResolvers, ReactiveAdapterRegistry reactiveRegistry,
+	ControllerMethodResolver(ArgumentResolverConfigurer customResolvers, ReactiveAdapterRegistry adapterRegistry,
 			ConfigurableApplicationContext context, List<HttpMessageReader<?>> readers) {
 
 		Assert.notNull(customResolvers, "ArgumentResolverConfigurer is required");
-		Assert.notNull(readers, "'messageReaders' is required");
+		Assert.notNull(adapterRegistry, "ReactiveAdapterRegistry is required");
-		Assert.notNull(reactiveRegistry, "ReactiveAdapterRegistry is required");
 		Assert.notNull(context, "ApplicationContext is required");
+		Assert.notNull(readers, "HttpMessageReader List is required");
 
-		this.initBinderResolvers = initBinderResolvers(customResolvers, reactiveRegistry, context);
+		this.initBinderResolvers = initBinderResolvers(customResolvers, adapterRegistry, context);
-		this.modelAttributeResolvers = modelMethodResolvers(customResolvers, reactiveRegistry, context);
+		this.modelAttributeResolvers = modelMethodResolvers(customResolvers, adapterRegistry, context);
-		this.requestMappingResolvers = requestMappingResolvers(customResolvers, reactiveRegistry, context, readers);
+		this.requestMappingResolvers = requestMappingResolvers(customResolvers, adapterRegistry, context, readers);
-		this.exceptionHandlerResolvers = exceptionHandlerResolvers(customResolvers, reactiveRegistry, context);
+		this.exceptionHandlerResolvers = exceptionHandlerResolvers(customResolvers, adapterRegistry, context);
-		this.reactiveAdapterRegistry = reactiveRegistry;
+		this.reactiveAdapterRegistry = adapterRegistry;
 
 		initControllerAdviceCaches(context);
 	}
 
 	private List<SyncHandlerMethodArgumentResolver> initBinderResolvers(
-			ArgumentResolverConfigurer customResolvers, ReactiveAdapterRegistry reactiveRegistry,
+			ArgumentResolverConfigurer customResolvers, ReactiveAdapterRegistry adapterRegistry,
 			ConfigurableApplicationContext context) {
 
-		return initResolvers(customResolvers, reactiveRegistry, context, false, Collections.emptyList()).stream()
+		return initResolvers(customResolvers, adapterRegistry, context, false, Collections.emptyList()).stream()
 				.filter(resolver -> resolver instanceof SyncHandlerMethodArgumentResolver)
 				.map(resolver -> (SyncHandlerMethodArgumentResolver) resolver)
 				.collect(Collectors.toList());
 	}
 
 	private static List<HandlerMethodArgumentResolver> modelMethodResolvers(
-			ArgumentResolverConfigurer customResolvers, ReactiveAdapterRegistry reactiveRegistry,
+			ArgumentResolverConfigurer customResolvers, ReactiveAdapterRegistry adapterRegistry,
 			ConfigurableApplicationContext context) {
 
-		return initResolvers(customResolvers, reactiveRegistry, context, true, Collections.emptyList());
+		return initResolvers(customResolvers, adapterRegistry, context, true, Collections.emptyList());
 	}
 
 	private static List<HandlerMethodArgumentResolver> requestMappingResolvers(
-			ArgumentResolverConfigurer customResolvers, ReactiveAdapterRegistry reactiveRegistry,
+			ArgumentResolverConfigurer customResolvers, ReactiveAdapterRegistry adapterRegistry,
 			ConfigurableApplicationContext context, List<HttpMessageReader<?>> readers) {
 
-		return initResolvers(customResolvers, reactiveRegistry, context, true, readers);
+		return initResolvers(customResolvers, adapterRegistry, context, true, readers);
 	}
 
 	private static List<HandlerMethodArgumentResolver> exceptionHandlerResolvers(
-			ArgumentResolverConfigurer customResolvers, ReactiveAdapterRegistry reactiveRegistry,
+			ArgumentResolverConfigurer customResolvers, ReactiveAdapterRegistry adapterRegistry,
 			ConfigurableApplicationContext context) {
 
-		return initResolvers(customResolvers, reactiveRegistry, context, false, Collections.emptyList());
+		return initResolvers(customResolvers, adapterRegistry, context, false, Collections.emptyList());
 	}
 
 	private static List<HandlerMethodArgumentResolver> initResolvers(ArgumentResolverConfigurer customResolvers,
-			ReactiveAdapterRegistry reactiveRegistry, ConfigurableApplicationContext context,
+			ReactiveAdapterRegistry adapterRegistry, ConfigurableApplicationContext context,
 			boolean supportDataBinding, List<HttpMessageReader<?>> readers) {
 
 		ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
@@ -169,48 +169,48 @@ class ControllerMethodResolver {
 
 		// Annotation-based...
 		List<HandlerMethodArgumentResolver> result = new ArrayList<>();
-		result.add(new RequestParamMethodArgumentResolver(beanFactory, reactiveRegistry, false));
+		result.add(new RequestParamMethodArgumentResolver(beanFactory, adapterRegistry, false));
-		result.add(new RequestParamMapMethodArgumentResolver(reactiveRegistry));
+		result.add(new RequestParamMapMethodArgumentResolver(adapterRegistry));
-		result.add(new PathVariableMethodArgumentResolver(beanFactory, reactiveRegistry));
+		result.add(new PathVariableMethodArgumentResolver(beanFactory, adapterRegistry));
-		result.add(new PathVariableMapMethodArgumentResolver(reactiveRegistry));
+		result.add(new PathVariableMapMethodArgumentResolver(adapterRegistry));
-		result.add(new MatrixVariableMethodArgumentResolver(beanFactory, reactiveRegistry));
+		result.add(new MatrixVariableMethodArgumentResolver(beanFactory, adapterRegistry));
-		result.add(new MatrixVariableMapMethodArgumentResolver(reactiveRegistry));
+		result.add(new MatrixVariableMapMethodArgumentResolver(adapterRegistry));
 		if (!readers.isEmpty()) {
-			result.add(new RequestBodyArgumentResolver(readers, reactiveRegistry));
+			result.add(new RequestBodyArgumentResolver(readers, adapterRegistry));
-			result.add(new RequestPartMethodArgumentResolver(readers, reactiveRegistry));
+			result.add(new RequestPartMethodArgumentResolver(readers, adapterRegistry));
 		}
 		if (supportDataBinding) {
-			result.add(new ModelAttributeMethodArgumentResolver(reactiveRegistry, false));
+			result.add(new ModelAttributeMethodArgumentResolver(adapterRegistry, false));
 		}
-		result.add(new RequestHeaderMethodArgumentResolver(beanFactory, reactiveRegistry));
+		result.add(new RequestHeaderMethodArgumentResolver(beanFactory, adapterRegistry));
-		result.add(new RequestHeaderMapMethodArgumentResolver(reactiveRegistry));
+		result.add(new RequestHeaderMapMethodArgumentResolver(adapterRegistry));
-		result.add(new CookieValueMethodArgumentResolver(beanFactory, reactiveRegistry));
+		result.add(new CookieValueMethodArgumentResolver(beanFactory, adapterRegistry));
-		result.add(new ExpressionValueMethodArgumentResolver(beanFactory, reactiveRegistry));
+		result.add(new ExpressionValueMethodArgumentResolver(beanFactory, adapterRegistry));
-		result.add(new SessionAttributeMethodArgumentResolver(beanFactory, reactiveRegistry));
+		result.add(new SessionAttributeMethodArgumentResolver(beanFactory, adapterRegistry));
-		result.add(new RequestAttributeMethodArgumentResolver(beanFactory, reactiveRegistry));
+		result.add(new RequestAttributeMethodArgumentResolver(beanFactory, adapterRegistry));
 
 		// Type-based...
 		if (!readers.isEmpty()) {
-			result.add(new HttpEntityArgumentResolver(readers, reactiveRegistry));
+			result.add(new HttpEntityArgumentResolver(readers, adapterRegistry));
 		}
-		result.add(new ModelArgumentResolver(reactiveRegistry));
+		result.add(new ModelArgumentResolver(adapterRegistry));
 		if (supportDataBinding) {
-			result.add(new ErrorsMethodArgumentResolver(reactiveRegistry));
+			result.add(new ErrorsMethodArgumentResolver(adapterRegistry));
 		}
-		result.add(new ServerWebExchangeArgumentResolver(reactiveRegistry));
+		result.add(new ServerWebExchangeArgumentResolver(adapterRegistry));
-		result.add(new PrincipalArgumentResolver(reactiveRegistry));
+		result.add(new PrincipalArgumentResolver(adapterRegistry));
 		if (requestMappingMethod) {
 			result.add(new SessionStatusMethodArgumentResolver());
 		}
-		result.add(new WebSessionArgumentResolver(reactiveRegistry));
+		result.add(new WebSessionArgumentResolver(adapterRegistry));
 
 		// Custom...
 		result.addAll(customResolvers.getCustomResolvers());
 
 		// Catch-all...
-		result.add(new RequestParamMethodArgumentResolver(beanFactory, reactiveRegistry, true));
+		result.add(new RequestParamMethodArgumentResolver(beanFactory, adapterRegistry, true));
 		if (supportDataBinding) {
-			result.add(new ModelAttributeMethodArgumentResolver(reactiveRegistry, true));
+			result.add(new ModelAttributeMethodArgumentResolver(adapterRegistry, true));
 		}
 
 		return result;

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelAttributeMethodArgumentResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -160,10 +160,10 @@ public class ModelAttributeMethodArgumentResolver extends HandlerMethodArgumentR
 			return createAttribute(attributeName, attributeType.toClass(), context, exchange);
 		}
 
-		ReactiveAdapter adapterFrom = getAdapterRegistry().getAdapter(null, attribute);
+		ReactiveAdapter adapter = getAdapterRegistry().getAdapter(null, attribute);
-		if (adapterFrom != null) {
+		if (adapter != null) {
-			Assert.isTrue(!adapterFrom.isMultiValue(), "Data binding only supports single-value async types");
+			Assert.isTrue(!adapter.isMultiValue(), "Data binding only supports single-value async types");
-			return Mono.from(adapterFrom.toPublisher(attribute));
+			return Mono.from(adapter.toPublisher(attribute));
 		}
 		else {
 			return Mono.justOrEmpty(attribute);

spring-webflux/src/main/java/org/springframework/web/reactive/result/view/AbstractView.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -57,7 +57,7 @@ public abstract class AbstractView implements View, BeanNameAware, ApplicationCo
 	private static final Object NO_VALUE = new Object();
 
 
-	private final ReactiveAdapterRegistry reactiveAdapterRegistry;
+	private final ReactiveAdapterRegistry adapterRegistry;
 
 	private final List<MediaType> mediaTypes = new ArrayList<>(4);
 
@@ -78,7 +78,7 @@ public abstract class AbstractView implements View, BeanNameAware, ApplicationCo
 	}
 
 	public AbstractView(ReactiveAdapterRegistry reactiveAdapterRegistry) {
-		this.reactiveAdapterRegistry = reactiveAdapterRegistry;
+		this.adapterRegistry = reactiveAdapterRegistry;
 		this.mediaTypes.add(ViewResolverSupport.DEFAULT_CONTENT_TYPE);
 	}
 
@@ -240,7 +240,7 @@ public abstract class AbstractView implements View, BeanNameAware, ApplicationCo
 			if (value == null) {
 				continue;
 			}
-			ReactiveAdapter adapter = this.reactiveAdapterRegistry.getAdapter(null, value);
+			ReactiveAdapter adapter = this.adapterRegistry.getAdapter(null, value);
 			if (adapter != null) {
 				names.add(entry.getKey());
 				if (adapter.isMultiValue()) {

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -77,17 +77,17 @@ public class ResponseBodyEmitterReturnValueHandler implements HandlerMethodRetur
 	/**
 	 * Complete constructor with pluggable "reactive" type support.
 	 * @param messageConverters converters to write emitted objects with
-	 * @param reactiveRegistry for reactive return value type support
+	 * @param registry for reactive return value type support
 	 * @param executor for blocking I/O writes of items emitted from reactive types
 	 * @param manager for detecting streaming media types
 	 * @since 5.0
 	 */
 	public ResponseBodyEmitterReturnValueHandler(List<HttpMessageConverter<?>> messageConverters,
-			ReactiveAdapterRegistry reactiveRegistry, TaskExecutor executor, ContentNegotiationManager manager) {
+			ReactiveAdapterRegistry registry, TaskExecutor executor, ContentNegotiationManager manager) {
 
 		Assert.notEmpty(messageConverters, "HttpMessageConverter List must not be empty");
 		this.messageConverters = messageConverters;
-		this.reactiveHandler = new ReactiveTypeHandler(reactiveRegistry, executor, manager);
+		this.reactiveHandler = new ReactiveTypeHandler(registry, executor, manager);
 	}