Skip to content

Commit 6bcb454

Browse files
committed
Polishing
1 parent 84300b7 commit 6bcb454

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,9 @@ interface Builder {
449449
Builder responseTimeout(Duration timeout);
450450

451451
/**
452-
* Apply the given {@code Consumer} to this builder instance.
452+
* Apply the given configurer to this builder instance.
453453
* <p>This can be useful for applying pre-packaged customizations.
454+
* @param configurer the configurer to apply
454455
*/
455456
Builder apply(WebTestClientConfigurer configurer);
456457

spring-web/src/main/java/org/springframework/web/client/RestOperations.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -657,7 +657,7 @@ <T> ResponseEntity<T> exchange(RequestEntity<?> requestEntity, ParameterizedType
657657
throws RestClientException;
658658

659659

660-
// general execution
660+
// General execution
661661

662662
/**
663663
* Execute the HTTP method to the given URI template, preparing the request with the

spring-web/src/main/java/org/springframework/web/client/RestTemplate.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public RestTemplate(ClientHttpRequestFactory requestFactory) {
193193
/**
194194
* Create a new instance of the {@link RestTemplate} using the given list of
195195
* {@link HttpMessageConverter} to use.
196-
* @param messageConverters the list of {@link HttpMessageConverter} to use.
196+
* @param messageConverters the list of {@link HttpMessageConverter} to use
197197
* @since 3.2.7
198198
*/
199199
public RestTemplate(List<HttpMessageConverter<?>> messageConverters) {
@@ -204,7 +204,7 @@ public RestTemplate(List<HttpMessageConverter<?>> messageConverters) {
204204

205205
private static DefaultUriBuilderFactory initUriTemplateHandler() {
206206
DefaultUriBuilderFactory uriFactory = new DefaultUriBuilderFactory();
207-
uriFactory.setEncodingMode(EncodingMode.URI_COMPONENT); // for backwards compatibility..
207+
uriFactory.setEncodingMode(EncodingMode.URI_COMPONENT); // for backwards compatibility..
208208
return uriFactory;
209209
}
210210

@@ -279,13 +279,11 @@ else if (this.uriTemplateHandler instanceof org.springframework.web.util.Abstrac
279279
* backwards compatibility, the encoding mode is set to
280280
* {@link EncodingMode#URI_COMPONENT URI_COMPONENT}. As of 5.0.8, prefer
281281
* using {@link EncodingMode#TEMPLATE_AND_VALUES TEMPLATE_AND_VALUES}.
282-
*
283282
* <p><strong>Note:</strong> in 5.0 the switch from
284283
* {@link org.springframework.web.util.DefaultUriTemplateHandler
285284
* DefaultUriTemplateHandler} (deprecated in 4.3), as the default to use, to
286285
* {@link DefaultUriBuilderFactory} brings in a different default for the
287286
* {@code parsePath} property (switching from false to true).
288-
*
289287
* @param handler the URI template handler to use
290288
*/
291289
public void setUriTemplateHandler(UriTemplateHandler handler) {
@@ -649,7 +647,7 @@ public <T> ResponseEntity<T> exchange(RequestEntity<?> requestEntity, Parameteri
649647
}
650648

651649

652-
// general execution
650+
// General execution
653651

654652
/**
655653
* {@inheritDoc}
@@ -817,7 +815,7 @@ public <T> ResponseExtractor<ResponseEntity<T>> responseEntityExtractor(Type res
817815
}
818816

819817
/**
820-
* Returns a response extractor for {@link HttpHeaders}.
818+
* Return a response extractor for {@link HttpHeaders}.
821819
*/
822820
protected ResponseExtractor<HttpHeaders> headersExtractor() {
823821
return this.headersExtractor;

spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,10 @@ default HttpMethod method() {
8585
/**
8686
* Return a {@code UriBuilderComponents} from the URI associated with this
8787
* {@code ServerRequest}.
88-
*
8988
* <p><strong>Note:</strong> as of 5.1 this method ignores
9089
* {@code "Forwarded"} and {@code "X-Forwarded-*"} headers that specify the
9190
* client-originated address. Consider using the {@code ForwardedHeaderFilter}
9291
* to extract and use, or to discard such headers.
93-
*
9492
* @return a URI builder
9593
*/
9694
UriBuilder uriBuilder();

0 commit comments

Comments
 (0)