Merge branch '5.1.x'

build.gradle

@@ -37,7 +37,7 @@ ext {
 	junit5Version        = "5.4.0"
 	kotlinVersion        = "1.3.21"
 	log4jVersion         = "2.11.2"
-	nettyVersion         = "4.1.33.Final"
+	nettyVersion         = "4.1.34.Final"
 	quartzVersion        = "2.3.0"
 	reactorVersion       = "Californium-SR5"
 	rxjavaVersion        = "1.3.8"

spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.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.
@@ -313,9 +313,9 @@ else if (StringUtils.hasText(operation.getCacheManager())) {
 	 * @param expectedType type for the bean
 	 * @return the bean matching that name
 	 * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException if such bean does not exist
-	 * @see CacheOperation#keyGenerator
-	 * @see CacheOperation#cacheManager
-	 * @see CacheOperation#cacheResolver
+	 * @see CacheOperation#getKeyGenerator()
+	 * @see CacheOperation#getCacheManager()
+	 * @see CacheOperation#getCacheResolver()
 	 */
 	protected <T> T getBean(String beanName, Class<T> expectedType) {
 		if (this.beanFactory == null) {
@@ -353,8 +353,8 @@ protected Object execute(CacheOperationInvoker invoker, Object target, Method me
 
 	/**
 	 * Execute the underlying operation (typically in case of cache miss) and return
-	 * the result of the invocation. If an exception occurs it will be wrapped in
-	 * a {@link CacheOperationInvoker.ThrowableWrapper}: the exception can be handled
+	 * the result of the invocation. If an exception occurs it will be wrapped in a
+	 * {@link CacheOperationInvoker.ThrowableWrapper}: the exception can be handled
 	 * or modified but it <em>must</em> be wrapped in a
 	 * {@link CacheOperationInvoker.ThrowableWrapper} as well.
 	 * @param invoker the invoker handling the operation being cached

spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperationSource.java

@@ -51,8 +51,8 @@ default boolean isCandidateClass(Class<?> targetClass) {
 	}
 
 	/**
-	 * Return the collection of cache operations for this method, or {@code null}
-	 * if the method contains no <em>cacheable</em> annotations.
+	 * Return the collection of cache operations for this method,
+	 * or {@code null} if the method contains no <em>cacheable</em> annotations.
 	 * @param method the method to introspect
 	 * @param targetClass the target class (may be {@code null}, in which case
 	 * the declaring class of the method must be used)

spring-context/src/main/java/org/springframework/cache/interceptor/CompositeCacheOperationSource.java

@@ -81,4 +81,5 @@ public Collection<CacheOperation> getCacheOperations(Method method, @Nullable Cl
 		}
 		return ops;
 	}
+
 }

spring-context/src/main/java/org/springframework/scripting/support/StandardScriptFactory.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.
@@ -36,7 +36,7 @@
 /**
  * {@link org.springframework.scripting.ScriptFactory} implementation based
  * on the JSR-223 script engine abstraction (as included in Java 6+).
- * Supports JavaScript, Groovy, JRuby and other JSR-223 compliant engines.
+ * Supports JavaScript, Groovy, JRuby, and other JSR-223 compliant engines.
  *
  * <p>Typically used in combination with a
  * {@link org.springframework.scripting.support.ScriptFactoryPostProcessor};

spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSource.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.
@@ -27,6 +27,7 @@
  * metadata attributes at source level (such as Java 5 annotations), or anywhere else.
  *
  * @author Rod Johnson
+ * @author Juergen Hoeller
  * @since 15.04.2003
  * @see TransactionInterceptor#setTransactionAttributeSource
  * @see TransactionProxyFactoryBean#setTransactionAttributeSource

spring-web/src/main/java/org/springframework/http/server/ServerHttpRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 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.
@@ -21,6 +21,7 @@
 
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpRequest;
+import org.springframework.lang.Nullable;
 
 /**
  * Represents a server-side HTTP request.
@@ -33,9 +34,10 @@ public interface ServerHttpRequest extends HttpRequest, HttpInputMessage {
 
 	/**
 	 * Return a {@link java.security.Principal} instance containing the name of the
-	 * authenticated user. If the user has not been authenticated, the method returns
-	 * <code>null</code>.
+	 * authenticated user.
+	 * <p>If the user has not been authenticated, the method returns <code>null</code>.
 	 */
+	@Nullable
 	Principal getPrincipal();
 
 	/**