Skip to content

Commit 4f28c28

Browse files
committed
Update Javadoc on uriTemplateHandler property
Issue: SPR-16419
1 parent 5ff7249 commit 4f28c28

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

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

Lines changed: 8 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.
@@ -301,9 +301,15 @@ else if (this.uriTemplateHandler instanceof org.springframework.web.util.Abstrac
301301
* Configure the {@link UriTemplateHandler} to use to expand URI templates.
302302
* By default the {@link DefaultUriBuilderFactory} is used which relies on
303303
* Spring's URI template support and exposes several useful properties that
304-
* customize its behavior for encoding and for prepending a common base URL.
304+
* customize its behavior for encoding and for pre-pending a common base URL.
305305
* An alternative implementation may be used to plug an external URI
306306
* template library.
307+
* <p><strong>Note:</strong> if switching from
308+
* {@link org.springframework.web.util.DefaultUriTemplateHandler
309+
* DefaultUriTemplateHandler} (deprecated in 4.3) to
310+
* {@link DefaultUriBuilderFactory} keep in mind that the
311+
* {@link DefaultUriBuilderFactory} has a different default for the
312+
* {@code parsePath} property (from false to true).
307313
* @param handler the URI template handler to use
308314
*/
309315
public void setUriTemplateHandler(UriTemplateHandler handler) {

spring-web/src/main/java/org/springframework/web/util/DefaultUriTemplateHandler.java

Lines changed: 5 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.
@@ -33,7 +33,10 @@
3333
*
3434
* @author Rossen Stoyanchev
3535
* @since 4.2
36-
* @deprecated as of 5.0 in favor of {@link DefaultUriBuilderFactory}
36+
* @deprecated as of 5.0 in favor of {@link DefaultUriBuilderFactory}.
37+
* <p><strong>Note:</strong> {@link DefaultUriBuilderFactory} has a different
38+
* default for the {@link #setParsePath(boolean) parsePath} property (from
39+
* false to true).
3740
*/
3841
@Deprecated
3942
public class DefaultUriTemplateHandler extends AbstractUriTemplateHandler {

0 commit comments

Comments
 (0)