From d16beb0e55e9184f74004bf126fa32abe567967e Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 7 May 2019 01:40:53 +0200 Subject: [PATCH 1/2] Polishing See gh-22900 --- .../web/reactive/result/method/InvocableHandlerMethod.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java index 4c9052ecda..15be39f2ac 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java @@ -63,6 +63,7 @@ public class InvocableHandlerMethod extends HandlerMethod { private ReactiveAdapterRegistry reactiveAdapterRegistry = ReactiveAdapterRegistry.getSharedInstance(); + /** * Create an instance from a {@code HandlerMethod}. */ @@ -110,8 +111,8 @@ public class InvocableHandlerMethod extends HandlerMethod { } /** - * 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. *

By default this is a {@link ReactiveAdapterRegistry} with default settings. */ public void setReactiveAdapterRegistry(ReactiveAdapterRegistry registry) { @@ -124,7 +125,7 @@ public class InvocableHandlerMethod extends HandlerMethod { * @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} */ public Mono invoke( ServerWebExchange exchange, BindingContext bindingContext, Object... providedArgs) { From 053b95ceeb12faced172c8f3d7069315c49cab18 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 7 May 2019 02:06:40 +0200 Subject: [PATCH 2/2] Refer to non-deprecated Jackson 2.5+ addMixIn method in javadoc --- .../http/converter/json/Jackson2ObjectMapperBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java index 0730771323..4709aef1db 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java @@ -303,7 +303,7 @@ public class Jackson2ObjectMapperBuilder { * @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 class Jackson2ObjectMapperBuilder { * 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> mixIns) { this.mixIns.putAll(mixIns);