From 87aaf5049b81bce2a8bbb37e7aef69128f79a1e5 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 8 Oct 2021 20:41:51 +0200 Subject: [PATCH] Polishing --- .../org/springframework/core/ReactiveAdapterRegistry.java | 2 +- .../web/bind/MethodArgumentNotValidException.java | 4 ++-- .../result/method/AbstractHandlerMethodMapping.java | 6 ++---- .../mvc/support/DefaultHandlerExceptionResolver.java | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java index 0193dff6c2..9e56b5d5e3 100644 --- a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java +++ b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java @@ -41,7 +41,7 @@ import org.springframework.util.ReflectionUtils; /** * A registry of adapters to adapt Reactive Streams {@link Publisher} to/from * various async/reactive types such as {@code CompletableFuture}, RxJava - * {@code Observable}, and others. + * {@code Flowable}, and others. * *

By default, depending on classpath availability, adapters are registered * for Reactor, RxJava 3, {@link CompletableFuture}, {@code Flow.Publisher}, diff --git a/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java b/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java index e51f136e47..3638ac1411 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java +++ b/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java @@ -56,8 +56,8 @@ public class MethodArgumentNotValidException extends BindException { @Override public String getMessage() { StringBuilder sb = new StringBuilder("Validation failed for argument [") - .append(this.parameter.getParameterIndex()).append("] in ") - .append(this.parameter.getExecutable().toGenericString()); + .append(this.parameter.getParameterIndex()).append("] in ") + .append(this.parameter.getExecutable().toGenericString()); BindingResult bindingResult = getBindingResult(); if (bindingResult.getErrorCount() > 1) { sb.append(" with ").append(bindingResult.getErrorCount()).append(" errors"); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java index 4487162cc9..7d59209955 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java @@ -157,12 +157,10 @@ public abstract class AbstractHandlerMethodMapping extends AbstractHandlerMap */ @Override public void afterPropertiesSet() { - initHandlerMethods(); - // Total includes detected mappings + explicit registrations via registerMapping.. - int total = this.getHandlerMethods().size(); - + // Total includes detected mappings + explicit registrations via registerMapping + int total = getHandlerMethods().size(); if ((logger.isTraceEnabled() && total == 0) || (logger.isDebugEnabled() && total > 0) ) { logger.debug(total + " mappings in " + formatMappingName()); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java index acb57f6652..47bb3de325 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java @@ -520,7 +520,7 @@ public class DefaultHandlerExceptionResolver extends AbstractHandlerExceptionRes /** * Handle the case where an async request timed out. *

The default implementation sends an HTTP 503 error. - * @param ex the {@link AsyncRequestTimeoutException }to be handled + * @param ex the {@link AsyncRequestTimeoutException} to be handled * @param request current HTTP request * @param response current HTTP response * @param handler the executed handler, or {@code null} if none chosen