From 6bcb454a0d653c9deaa4b18b38e6f1f6bd68fae1 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 16 Aug 2018 19:31:10 +0200 Subject: [PATCH] Polishing --- .../test/web/reactive/server/WebTestClient.java | 3 ++- .../org/springframework/web/client/RestOperations.java | 4 ++-- .../org/springframework/web/client/RestTemplate.java | 10 ++++------ .../web/reactive/function/server/ServerRequest.java | 2 -- 4 files changed, 8 insertions(+), 11 deletions(-) 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 bbb33d61e3b..8e5c67fff2c 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 @@ -449,8 +449,9 @@ public interface WebTestClient { Builder responseTimeout(Duration timeout); /** - * Apply the given {@code Consumer} to this builder instance. + * Apply the given configurer to this builder instance. *

This can be useful for applying pre-packaged customizations. + * @param configurer the configurer to apply */ Builder apply(WebTestClientConfigurer configurer); diff --git a/spring-web/src/main/java/org/springframework/web/client/RestOperations.java b/spring-web/src/main/java/org/springframework/web/client/RestOperations.java index afc9baa2032..4b6fed59ecb 100644 --- a/spring-web/src/main/java/org/springframework/web/client/RestOperations.java +++ b/spring-web/src/main/java/org/springframework/web/client/RestOperations.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 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. @@ -657,7 +657,7 @@ public interface RestOperations { throws RestClientException; - // general execution + // General execution /** * Execute the HTTP method to the given URI template, preparing the request with the diff --git a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java index 0b154ab753b..67539dddc31 100644 --- a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java +++ b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java @@ -193,7 +193,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat /** * Create a new instance of the {@link RestTemplate} using the given list of * {@link HttpMessageConverter} to use. - * @param messageConverters the list of {@link HttpMessageConverter} to use. + * @param messageConverters the list of {@link HttpMessageConverter} to use * @since 3.2.7 */ public RestTemplate(List> messageConverters) { @@ -204,7 +204,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat private static DefaultUriBuilderFactory initUriTemplateHandler() { DefaultUriBuilderFactory uriFactory = new DefaultUriBuilderFactory(); - uriFactory.setEncodingMode(EncodingMode.URI_COMPONENT); // for backwards compatibility.. + uriFactory.setEncodingMode(EncodingMode.URI_COMPONENT); // for backwards compatibility.. return uriFactory; } @@ -279,13 +279,11 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat * backwards compatibility, the encoding mode is set to * {@link EncodingMode#URI_COMPONENT URI_COMPONENT}. As of 5.0.8, prefer * using {@link EncodingMode#TEMPLATE_AND_VALUES TEMPLATE_AND_VALUES}. - * *

Note: in 5.0 the switch from * {@link org.springframework.web.util.DefaultUriTemplateHandler * DefaultUriTemplateHandler} (deprecated in 4.3), as the default to use, to * {@link DefaultUriBuilderFactory} brings in a different default for the * {@code parsePath} property (switching from false to true). - * * @param handler the URI template handler to use */ public void setUriTemplateHandler(UriTemplateHandler handler) { @@ -649,7 +647,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat } - // general execution + // General execution /** * {@inheritDoc} @@ -817,7 +815,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat } /** - * Returns a response extractor for {@link HttpHeaders}. + * Return a response extractor for {@link HttpHeaders}. */ protected ResponseExtractor headersExtractor() { return this.headersExtractor; diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java index b2c18c8bc95..7a2f11120ae 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java @@ -85,12 +85,10 @@ public interface ServerRequest { /** * Return a {@code UriBuilderComponents} from the URI associated with this * {@code ServerRequest}. - * *

Note: as of 5.1 this method ignores * {@code "Forwarded"} and {@code "X-Forwarded-*"} headers that specify the * client-originated address. Consider using the {@code ForwardedHeaderFilter} * to extract and use, or to discard such headers. - * * @return a URI builder */ UriBuilder uriBuilder();