A {@code SingletonSupplier} can be constructed via {@code of} factory methods diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java index 6cfc149cca..bbb33d61e3 100644 --- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java +++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java @@ -363,8 +363,10 @@ public interface WebTestClient { /** - * Steps for customizing the {@link WebClient} used to test with - * internally delegating to a {@link WebClient.Builder}. + * Steps for customizing the {@link WebClient} used to test with, + * internally delegating to a + * {@link org.springframework.web.reactive.function.client.WebClient.Builder + * WebClient.Builder}. */ interface Builder { diff --git a/spring-web/src/main/java/org/springframework/web/client/ExtractingResponseErrorHandler.java b/spring-web/src/main/java/org/springframework/web/client/ExtractingResponseErrorHandler.java index 2179cd8c66..2b6743e825 100644 --- a/spring-web/src/main/java/org/springframework/web/client/ExtractingResponseErrorHandler.java +++ b/spring-web/src/main/java/org/springframework/web/client/ExtractingResponseErrorHandler.java @@ -29,15 +29,16 @@ import org.springframework.lang.Nullable; import org.springframework.util.CollectionUtils; /** - * Implementation of {@link ResponseErrorHandler} that uses {@link HttpMessageConverter ResponseErrorHandler} that uses {@link HttpMessageConverters} to - * convert HTTP error responses to {@link RestClientException}. + * Implementation of {@link ResponseErrorHandler} that uses {@link HttpMessageConverter + * HttpMessageConverters} to convert HTTP error responses to {@link RestClientException + * RestClientExceptions}. * *
To use this error handler, you must specify a * {@linkplain #setStatusMapping(Map) status mapping} and/or a * {@linkplain #setSeriesMapping(Map) series mapping}. If either of these mappings has a match * for the {@linkplain ClientHttpResponse#getStatusCode() status code} of a given * {@code ClientHttpResponse}, {@link #hasError(ClientHttpResponse)} will return - * {@code true} and {@link #handleError(ClientHttpResponse)} will attempt to use the + * {@code true}, and {@link #handleError(ClientHttpResponse)} will attempt to use the * {@linkplain #setMessageConverters(List) configured message converters} to convert the response * into the mapped subclass of {@link RestClientException}. Note that the * {@linkplain #setStatusMapping(Map) status mapping} takes precedence over diff --git a/spring-web/src/main/java/org/springframework/web/server/handler/FilteringWebHandler.java b/spring-web/src/main/java/org/springframework/web/server/handler/FilteringWebHandler.java index 25f43acae3..fc705bceca 100644 --- a/spring-web/src/main/java/org/springframework/web/server/handler/FilteringWebHandler.java +++ b/spring-web/src/main/java/org/springframework/web/server/handler/FilteringWebHandler.java @@ -26,8 +26,8 @@ import org.springframework.web.server.WebFilter; import org.springframework.web.server.WebHandler; /** - * {@link WebHandler} decorator that invokes a chain of {@link WebFilter WebHandler} decorator that invokes a chain of {@link WebFilters} - * before the delegate {@link WebHandler}. + * {@link WebHandlerDecorator} that invokes a chain of {@link WebFilter WebFilters} + * before invoking the delegate {@link WebHandler}. * * @author Rossen Stoyanchev * @since 5.0 diff --git a/spring-web/src/main/java/org/springframework/web/server/handler/WebHandlerDecorator.java b/spring-web/src/main/java/org/springframework/web/server/handler/WebHandlerDecorator.java index e2181ef41a..fa2ccf7ce5 100644 --- a/spring-web/src/main/java/org/springframework/web/server/handler/WebHandlerDecorator.java +++ b/spring-web/src/main/java/org/springframework/web/server/handler/WebHandlerDecorator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -23,7 +23,7 @@ import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebHandler; /** - * {@link WebHandler} that decorates and delegates to another. + * {@link WebHandler} that decorates and delegates to another {@code WebHandler}. * * @author Rossen Stoyanchev * @since 5.0 diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurer.java index 1519b6d9ad..e93a352626 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurer.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurer.java @@ -45,7 +45,7 @@ public interface WebFluxConfigurer { /** * Configure how the content type requested for the response is resolved - * when handling reqests with annotated controllers. + * when handling requests with annotated controllers. * @param builder for configuring the resolvers to use */ default void configureContentTypeResolver(RequestedContentTypeResolverBuilder builder) { @@ -96,8 +96,8 @@ public interface WebFluxConfigurer { } /** - * Add custom {@link Converter}s and {@link Formatter Converter}s and {@link Formatters} for performing type - * conversion and formatting of annotated controller method arguments. + * Add custom {@link Converter Converters} and {@link Formatter Formatters} for + * performing type conversion and formatting of annotated controller method arguments. */ default void addFormatters(FormatterRegistry registry) { } @@ -105,7 +105,7 @@ public interface WebFluxConfigurer { /** * Provide a custom {@link Validator}. *
By default a validator for standard bean validation is created if - * bean validation api is present on the classpath. + * bean validation API is present on the classpath. *
The configured validator is used for validating annotated controller * method arguments. */ diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java index 394b7d56ab..43d7afc37a 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java @@ -27,7 +27,8 @@ import org.springframework.web.servlet.HandlerExceptionResolver; import org.springframework.web.servlet.ModelAndView; /** - * A {@link HandlerExceptionResolver} that delegates to a list of other {@link HandlerExceptionResolver HandlerExceptionResolver} that delegates to a list of other {@link HandlerExceptionResolvers}. + * A {@link HandlerExceptionResolver} that delegates to a list of other + * {@link HandlerExceptionResolver HandlerExceptionResolvers}. * * @author Rossen Stoyanchev * @since 3.1 @@ -66,7 +67,8 @@ public class HandlerExceptionResolverComposite implements HandlerExceptionResolv /** * Resolve the exception by iterating over the list of configured exception resolvers. - * The first one to return a ModelAndView instance wins. Otherwise {@code null} is returned. + *
The first one to return a {@link ModelAndView} wins. Otherwise {@code null} + * is returned. */ @Override @Nullable