Merge branch '5.1.x'

Author: jhoeller

spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java

@@ -303,7 +303,7 @@ public Jackson2ObjectMapperBuilder filters(FilterProvider filters) {
 	 * @param mixinSource class (or interface) whose annotations are to be "added"
 	 * to target's annotations as value
 	 * @since 4.1.2
-	 * @see com.fasterxml.jackson.databind.ObjectMapper#addMixInAnnotations(Class, Class)
+	 * @see com.fasterxml.jackson.databind.ObjectMapper#addMixIn(Class, Class)
 	 */
 	public Jackson2ObjectMapperBuilder mixIn(Class<?> target, Class<?> mixinSource) {
 		this.mixIns.put(target, mixinSource);
@@ -316,7 +316,7 @@ public Jackson2ObjectMapperBuilder mixIn(Class<?> target, Class<?> mixinSource)
 	 * to effectively override as key and mix-in classes (or interface) whose
 	 * annotations are to be "added" to target's annotations as value.
 	 * @since 4.1.2
-	 * @see com.fasterxml.jackson.databind.ObjectMapper#addMixInAnnotations(Class, Class)
+	 * @see com.fasterxml.jackson.databind.ObjectMapper#addMixIn(Class, Class)
 	 */
 	public Jackson2ObjectMapperBuilder mixIns(Map<Class<?>, Class<?>> mixIns) {
 		this.mixIns.putAll(mixIns);

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

@@ -66,6 +66,7 @@ public class InvocableHandlerMethod extends HandlerMethod {
 
 	private ReactiveAdapterRegistry reactiveAdapterRegistry = ReactiveAdapterRegistry.getSharedInstance();
 
+
 	/**
 	 * Create an instance from a {@code HandlerMethod}.
 	 */
@@ -113,8 +114,8 @@ public ParameterNameDiscoverer getParameterNameDiscoverer() {
 	}
 
 	/**
-	 * Configure a reactive registry. This is needed for cases where the response is fully
-	 * handled within the controller in combination with an async void return value.
+	 * Configure a reactive adapter registry. This is needed for cases where the response is
+	 * fully handled within the controller in combination with an async void return value.
 	 * <p>By default this is a {@link ReactiveAdapterRegistry} with default settings.
 	 */
 	public void setReactiveAdapterRegistry(ReactiveAdapterRegistry registry) {
@@ -127,7 +128,7 @@ public void setReactiveAdapterRegistry(ReactiveAdapterRegistry registry) {
 	 * @param exchange the current exchange
 	 * @param bindingContext the binding context to use
 	 * @param providedArgs optional list of argument values to match by type
-	 * @return a Mono with a {@link HandlerResult}.
+	 * @return a Mono with a {@link HandlerResult}
 	 */
 	@SuppressWarnings("KotlinInternalInJava")
 	public Mono<HandlerResult> invoke(