Merge branch '5.1.x'

Author: jhoeller

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 String[] getAliases(String name) {
 	@SuppressWarnings("unchecked")
 	private <T> T doGetSingleton(String name, @Nullable Class<T> requiredType) throws NamingException {
 		synchronized (this.singletonObjects) {
-			if (this.singletonObjects.containsKey(name)) {
-				Object jndiObject = this.singletonObjects.get(name);
-				if (requiredType != null && !requiredType.isInstance(jndiObject)) {
-					throw new TypeMismatchNamingException(
-							convertJndiName(name), requiredType, (jndiObject != null ? jndiObject.getClass() : null));
+			Object singleton = this.singletonObjects.get(name);
+			if (singleton != null) {
+				if (requiredType != null && !requiredType.isInstance(singleton)) {
+					throw new TypeMismatchNamingException(convertJndiName(name), requiredType, singleton.getClass());
 				}
-				return (T) jndiObject;
+				return (T) singleton;
 			}
 			T jndiObject = lookup(name, requiredType);
 			this.singletonObjects.put(name, jndiObject);
@@ -274,14 +273,12 @@ private Class<?> doGetType(String name) throws NamingException {
 		}
 		else {
 			synchronized (this.resourceTypes) {
-				if (this.resourceTypes.containsKey(name)) {
-					return this.resourceTypes.get(name);
-				}
-				else {
-					Class<?> type = lookup(name, null).getClass();
+				Class<?> type = this.resourceTypes.get(name);
+				if (type == null) {
+					type = lookup(name, null).getClass();
 					this.resourceTypes.put(name, type);
-					return type;
 				}
+				return type;
 			}
 		}
 	}

spring-core/src/main/java/org/springframework/core/Conventions.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.
@@ -118,13 +118,10 @@ else if (Collection.class.isAssignableFrom(parameter.getParameterType())) {
 		}
 		else {
 			valueClass = parameter.getParameterType();
-			ReactiveAdapterRegistry reactiveAdapterRegistry = ReactiveAdapterRegistry.getSharedInstance();
-			if (reactiveAdapterRegistry.hasAdapters()) {
-				ReactiveAdapter adapter = reactiveAdapterRegistry.getAdapter(valueClass);
-				if (adapter != null && !adapter.getDescriptor().isNoValue()) {
-					reactiveSuffix = ClassUtils.getShortName(valueClass);
-					valueClass = parameter.nested().getNestedParameterType();
-				}
+			ReactiveAdapter adapter = ReactiveAdapterRegistry.getSharedInstance().getAdapter(valueClass);
+			if (adapter != null && !adapter.getDescriptor().isNoValue()) {
+				reactiveSuffix = ClassUtils.getShortName(valueClass);
+				valueClass = parameter.nested().getNestedParameterType();
 			}
 		}
 
@@ -207,13 +204,10 @@ else if (Collection.class.isAssignableFrom(resolvedType)) {
 		}
 		else {
 			valueClass = resolvedType;
-			ReactiveAdapterRegistry reactiveAdapterRegistry = ReactiveAdapterRegistry.getSharedInstance();
-			if (reactiveAdapterRegistry.hasAdapters()) {
-				ReactiveAdapter adapter = reactiveAdapterRegistry.getAdapter(valueClass);
-				if (adapter != null && !adapter.getDescriptor().isNoValue()) {
-					reactiveSuffix = ClassUtils.getShortName(valueClass);
-					valueClass = ResolvableType.forMethodReturnType(method).getGeneric().toClass();
-				}
+			ReactiveAdapter adapter = ReactiveAdapterRegistry.getSharedInstance().getAdapter(valueClass);
+			if (adapter != null && !adapter.getDescriptor().isNoValue()) {
+				reactiveSuffix = ClassUtils.getShortName(valueClass);
+				valueClass = ResolvableType.forMethodReturnType(method).getGeneric().toClass();
 			}
 		}
 

spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java

@@ -59,15 +59,14 @@ public class ReactiveAdapterRegistry {
 
 	private final boolean reactorPresent;
 
-	private final List<ReactiveAdapter> adapters = new ArrayList<>(32);
+	private final List<ReactiveAdapter> adapters = new ArrayList<>();
 
 
 	/**
 	 * Create a registry and auto-register default adapters.
 	 * @see #getSharedInstance()
 	 */
 	public ReactiveAdapterRegistry() {
-
 		ClassLoader classLoader = ReactiveAdapterRegistry.class.getClassLoader();
 
 		// Reactor
@@ -118,8 +117,8 @@ public boolean hasAdapters() {
 
 	/**
 	 * Register a reactive type along with functions to adapt to and from a
-	 * Reactive Streams {@link Publisher}. The functions can assume their
-	 * input is never be {@code null} nor {@link Optional}.
+	 * Reactive Streams {@link Publisher}. The function arguments assume that
+	 * their input is neither {@code null} nor {@link Optional}.
 	 */
 	public void registerReactiveType(ReactiveTypeDescriptor descriptor,
 			Function<Object, Publisher<?>> toAdapter, Function<Publisher<?>, Object> fromAdapter) {
@@ -134,6 +133,7 @@ public void registerReactiveType(ReactiveTypeDescriptor descriptor,
 
 	/**
 	 * Get the adapter for the given reactive type.
+	 * @return the corresponding adapter, or {@code null} if none available
 	 */
 	@Nullable
 	public ReactiveAdapter getAdapter(Class<?> reactiveType) {
@@ -147,20 +147,25 @@ public ReactiveAdapter getAdapter(Class<?> reactiveType) {
 	 * (may be {@code null} if a concrete source object is given)
 	 * @param source an instance of the reactive type
 	 * (i.e. to adapt from; may be {@code null} if the reactive type is specified)
+	 * @return the corresponding adapter, or {@code null} if none available
 	 */
 	@Nullable
 	public ReactiveAdapter getAdapter(@Nullable Class<?> reactiveType, @Nullable Object source) {
+		if (this.adapters.isEmpty()) {
+			return null;
+		}
+
 		Object sourceToUse = (source instanceof Optional ? ((Optional<?>) source).orElse(null) : source);
 		Class<?> clazz = (sourceToUse != null ? sourceToUse.getClass() : reactiveType);
 		if (clazz == null) {
 			return null;
 		}
-		for(ReactiveAdapter adapter : this.adapters) {
+		for (ReactiveAdapter adapter : this.adapters) {
 			if (adapter.getReactiveType() == clazz) {
 				return adapter;
 			}
 		}
-		for(ReactiveAdapter adapter : this.adapters) {
+		for (ReactiveAdapter adapter : this.adapters) {
 			if (adapter.getReactiveType().isAssignableFrom(clazz)) {
 				return adapter;
 			}
@@ -170,13 +175,13 @@ public ReactiveAdapter getAdapter(@Nullable Class<?> reactiveType, @Nullable Obj
 
 
 	/**
-	 * Return a shared default {@code ReactiveAdapterRegistry} instance, lazily
-	 * building it once needed.
+	 * Return a shared default {@code ReactiveAdapterRegistry} instance,
+	 * lazily building it once needed.
 	 * <p><b>NOTE:</b> We highly recommend passing a long-lived, pre-configured
 	 * {@code ReactiveAdapterRegistry} instance for customization purposes.
 	 * This accessor is only meant as a fallback for code paths that want to
 	 * fall back on a default instance if one isn't provided.
-	 * @return the shared {@code ReactiveAdapterRegistry} instance (never {@code null})
+	 * @return the shared {@code ReactiveAdapterRegistry} instance
 	 * @since 5.0.2
 	 */
 	public static ReactiveAdapterRegistry getSharedInstance() {

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

@@ -40,10 +40,10 @@
  */
 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 @@
  */
 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

@@ -74,32 +74,32 @@ private static Log initLogger(List<Log> loggers, Predicate<Log> predicate) {
 
 	@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.
-	 * @return true if the return value type represents an async value.
+	 * @param returnType the type of the return 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.
-	 * @return the resulting ListenableFuture or {@code null} in which case no
-	 * further handling will be performed.
+	 * @param returnType the type of the return value
+	 * @return the resulting ListenableFuture, or {@code null} in which case
+	 * 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 ReactiveReturnValueHandler(ReactiveAdapterRegistry adapterRegistry) {
 
 	@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;