Merge branch '5.3.x'

Author: sbrannen

build.gradle

@@ -128,10 +128,12 @@ configure(allprojects) { project ->
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
-			dependencySet(group: 'io.undertow', version: '2.2.10.Final') {
+			dependencySet(group: 'io.undertow', version: '2.2.12.Final') {
 				entry 'undertow-core'
-				entry('undertow-servlet-jakartaee9')
-				entry('undertow-websockets-jsr-jakartaee9')
+				entry('undertow-servlet-jakartaee9') {
+					exclude group: "org.jboss.spec.javax.annotation", name: "jboss-annotations-api_1.3_spec"
+				}
+				entry 'undertow-websockets-jsr-jakartaee9'
 			}
 
 			dependencySet(group: 'com.squareup.okhttp3', version: '3.14.9') {
@@ -345,7 +347,12 @@ configure([rootProject] + javaProjects) { project ->
 			"https://hc.apache.org/httpcomponents-client-5.1.x/current/httpclient5/apidocs/",
 			"https://projectreactor.io/docs/test/release/api/",
 			"https://junit.org/junit4/javadoc/4.13.2/",
-			"https://junit.org/junit5/docs/5.8.1/api/",
+			// TODO Uncomment link to JUnit 5 docs once we have sorted out
+			// the following warning in the build.
+			//
+			// warning: The code being documented uses packages in the unnamed module, but the packages defined in https://junit.org/junit5/docs/5.8.1/api/ are in named modules.
+			//
+			// "https://junit.org/junit5/docs/5.8.1/api/",
 			"https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/",
 			"https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/",
 			"https://r2dbc.io/spec/0.8.5.RELEASE/api/"

gradle/docs.gradle

@@ -46,8 +46,9 @@ task api(type: Javadoc) {
 		stylesheetFile = file("src/docs/api/stylesheet.css")
 		splitIndex = true
 		links(project.ext.javadocLinks)
-		addStringOption('Xdoclint:none', '-quiet')
-		if(JavaVersion.current().isJava9Compatible()) {
+		addBooleanOption('Xdoclint:syntax', true) // only check syntax with doclint
+		addBooleanOption('Werror', true) // fail build on Javadoc warnings
+		if (JavaVersion.current().isJava9Compatible()) {
 			addBooleanOption('html5', true)
 		}
 	}

spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java

@@ -25,9 +25,11 @@
 /**
  * Convenient TargetSourceCreator using bean name prefixes to create one of three
  * well-known TargetSource types:
- * <li>: CommonsPool2TargetSource
- * <li>% ThreadLocalTargetSource
- * <li>! PrototypeTargetSource
+ * <ul>
+ * <li>: CommonsPool2TargetSource</li>
+ * <li>% ThreadLocalTargetSource</li>
+ * <li>! PrototypeTargetSource</li>
+ * </ul>
  *
  * @author Rod Johnson
  * @author Stephane Nicoll

spring-beans/src/main/java/org/springframework/beans/BeanUtils.java

@@ -540,7 +540,7 @@ public static PropertyDescriptor findPropertyForMethod(Method method, Class<?> c
 
 	/**
 	 * Find a JavaBeans PropertyEditor following the 'Editor' suffix convention
-	 * (e.g. "mypackage.MyDomainClass" -> "mypackage.MyDomainClassEditor").
+	 * (e.g. "mypackage.MyDomainClass" &rarr; "mypackage.MyDomainClassEditor").
 	 * <p>Compatible to the standard JavaBeans convention as implemented by
 	 * {@link java.beans.PropertyEditorManager} but isolated from the latter's
 	 * registered default editors for primitive types.

spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java

@@ -134,8 +134,8 @@ public static boolean matchesProperty(String registeredPath, String propertyPath
 	/**
 	 * Determine the canonical name for the given property path.
 	 * Removes surrounding quotes from map keys:<br>
-	 * {@code map['key']} -> {@code map[key]}<br>
-	 * {@code map["key"]} -> {@code map[key]}
+	 * {@code map['key']} &rarr; {@code map[key]}<br>
+	 * {@code map["key"]} &rarr; {@code map[key]}
 	 * @param propertyName the bean property path
 	 * @return the canonical representation of the property path
 	 */

spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingBean.java

@@ -47,17 +47,17 @@
  * which uses this class to call a static initialization method:
  *
  * <pre class="code">
- * &lt;bean id="myObject" class="org.springframework.beans.factory.config.MethodInvokingBean">
- *   &lt;property name="staticMethod" value="com.whatever.MyClass.init"/>
- * &lt;/bean></pre>
+ * &lt;bean id="myObject" class="org.springframework.beans.factory.config.MethodInvokingBean"&gt;
+ *   &lt;property name="staticMethod" value="com.whatever.MyClass.init"/&gt;
+ * &lt;/bean&gt;</pre>
  *
  * <p>An example of calling an instance method to start some server bean:
  *
  * <pre class="code">
- * &lt;bean id="myStarter" class="org.springframework.beans.factory.config.MethodInvokingBean">
- *   &lt;property name="targetObject" ref="myServer"/>
- *   &lt;property name="targetMethod" value="start"/>
- * &lt;/bean></pre>
+ * &lt;bean id="myStarter" class="org.springframework.beans.factory.config.MethodInvokingBean"&gt;
+ *   &lt;property name="targetObject" ref="myServer"/&gt;
+ *   &lt;property name="targetMethod" value="start"/&gt;
+ * &lt;/bean&gt;</pre>
  *
  * @author Juergen Hoeller
  * @since 4.0.3

spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java

@@ -56,24 +56,24 @@
  * which uses this class to call a static factory method:
  *
  * <pre class="code">
- * &lt;bean id="myObject" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
- *   &lt;property name="staticMethod" value="com.whatever.MyClassFactory.getInstance"/>
- * &lt;/bean></pre>
+ * &lt;bean id="myObject" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean"&gt;
+ *   &lt;property name="staticMethod" value="com.whatever.MyClassFactory.getInstance"/&gt;
+ * &lt;/bean&gt;</pre>
  *
  * <p>An example of calling a static method then an instance method to get at a
  * Java system property. Somewhat verbose, but it works.
  *
  * <pre class="code">
- * &lt;bean id="sysProps" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
- *   &lt;property name="targetClass" value="java.lang.System"/>
- *   &lt;property name="targetMethod" value="getProperties"/>
- * &lt;/bean>
+ * &lt;bean id="sysProps" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean"&gt;
+ *   &lt;property name="targetClass" value="java.lang.System"/&gt;
+ *   &lt;property name="targetMethod" value="getProperties"/&gt;
+ * &lt;/bean&gt;
  *
- * &lt;bean id="javaVersion" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
- *   &lt;property name="targetObject" ref="sysProps"/>
- *   &lt;property name="targetMethod" value="getProperty"/>
- *   &lt;property name="arguments" value="java.version"/>
- * &lt;/bean></pre>
+ * &lt;bean id="javaVersion" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean"&gt;
+ *   &lt;property name="targetObject" ref="sysProps"/&gt;
+ *   &lt;property name="targetMethod" value="getProperty"/&gt;
+ *   &lt;property name="arguments" value="java.version"/&gt;
+ * &lt;/bean&gt;</pre>
  *
  * @author Colin Sampaleanu
  * @author Juergen Hoeller

spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java

@@ -83,22 +83,22 @@
  * <p>A sample config in an XML-based
  * {@link org.springframework.beans.factory.BeanFactory} might look as follows:
  *
- * <pre class="code">&lt;beans>
+ * <pre class="code">&lt;beans&gt;
  *
- *   &lt;!-- Prototype bean since we have state -->
- *   &lt;bean id="myService" class="a.b.c.MyService" singleton="false"/>
+ *   &lt;!-- Prototype bean since we have state --&gt;
+ *   &lt;bean id="myService" class="a.b.c.MyService" singleton="false"/&gt;
  *
- *   &lt;!-- will lookup the above 'myService' bean by *TYPE* -->
+ *   &lt;!-- will lookup the above 'myService' bean by *TYPE* --&gt;
  *   &lt;bean id="myServiceFactory"
- *            class="org.springframework.beans.factory.config.ServiceLocatorFactoryBean">
- *     &lt;property name="serviceLocatorInterface" value="a.b.c.ServiceFactory"/>
- *   &lt;/bean>
+ *            class="org.springframework.beans.factory.config.ServiceLocatorFactoryBean"&gt;
+ *     &lt;property name="serviceLocatorInterface" value="a.b.c.ServiceFactory"/&gt;
+ *   &lt;/bean&gt;
  *
- *   &lt;bean id="clientBean" class="a.b.c.MyClientBean">
- *     &lt;property name="myServiceFactory" ref="myServiceFactory"/>
- *   &lt;/bean>
+ *   &lt;bean id="clientBean" class="a.b.c.MyClientBean"&gt;
+ *     &lt;property name="myServiceFactory" ref="myServiceFactory"/&gt;
+ *   &lt;/bean&gt;
  *
- *&lt;/beans></pre>
+ *&lt;/beans&gt;</pre>
  *
  * <p>The attendant {@code MyClientBean} class implementation might then
  * look something like this:
@@ -135,22 +135,22 @@
  * <p>A sample config in an XML-based
  * {@link org.springframework.beans.factory.BeanFactory} might look as follows:
  *
- * <pre class="code">&lt;beans>
+ * <pre class="code">&lt;beans&gt;
  *
- *   &lt;!-- Prototype beans since we have state (both extend MyService) -->
- *   &lt;bean id="specialService" class="a.b.c.SpecialService" singleton="false"/>
- *   &lt;bean id="anotherService" class="a.b.c.AnotherService" singleton="false"/>
+ *   &lt;!-- Prototype beans since we have state (both extend MyService) --&gt;
+ *   &lt;bean id="specialService" class="a.b.c.SpecialService" singleton="false"/&gt;
+ *   &lt;bean id="anotherService" class="a.b.c.AnotherService" singleton="false"/&gt;
  *
  *   &lt;bean id="myServiceFactory"
- *            class="org.springframework.beans.factory.config.ServiceLocatorFactoryBean">
- *     &lt;property name="serviceLocatorInterface" value="a.b.c.ServiceFactory"/>
- *   &lt;/bean>
+ *            class="org.springframework.beans.factory.config.ServiceLocatorFactoryBean"&gt;
+ *     &lt;property name="serviceLocatorInterface" value="a.b.c.ServiceFactory"/&gt;
+ *   &lt;/bean&gt;
  *
- *   &lt;bean id="clientBean" class="a.b.c.MyClientBean">
- *     &lt;property name="myServiceFactory" ref="myServiceFactory"/>
- *   &lt;/bean>
+ *   &lt;bean id="clientBean" class="a.b.c.MyClientBean"&gt;
+ *     &lt;property name="myServiceFactory" ref="myServiceFactory"/&gt;
+ *   &lt;/bean&gt;
  *
- *&lt;/beans></pre>
+ *&lt;/beans&gt;</pre>
  *
  * <p>The attendant {@code MyClientBean} class implementation might then
  * look something like this:

spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java

@@ -86,7 +86,7 @@ public abstract class YamlProcessor {
 	 * </pre>
 	 * when mapped with
 	 * <pre class="code">
-	 * setDocumentMatchers(properties ->
+	 * setDocumentMatchers(properties -&gt;
 	 *     ("prod".equals(properties.getProperty("environment")) ? MatchStatus.FOUND : MatchStatus.NOT_FOUND));
 	 * </pre>
 	 * would end up as

spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java

@@ -1321,7 +1321,7 @@ protected BeanWrapper instantiateBean(String beanName, RootBeanDefinition mbd) {
 	 * @param beanName the name of the bean
 	 * @param mbd the bean definition for the bean
 	 * @param explicitArgs argument values passed in programmatically via the getBean method,
-	 * or {@code null} if none (-> use constructor argument values from bean definition)
+	 * or {@code null} if none (implying the use of constructor argument values from bean definition)
 	 * @return a BeanWrapper for the new instance
 	 * @see #getBean(String, Object[])
 	 */
@@ -1342,7 +1342,7 @@ protected BeanWrapper instantiateUsingFactoryMethod(
 	 * @param mbd the bean definition for the bean
 	 * @param ctors the chosen candidate constructors
 	 * @param explicitArgs argument values passed in programmatically via the getBean method,
-	 * or {@code null} if none (-> use constructor argument values from bean definition)
+	 * or {@code null} if none (implying the use of constructor argument values from bean definition)
 	 * @return a BeanWrapper for the new instance
 	 */
 	protected BeanWrapper autowireConstructor(