From 335d968f85ce0f40f868d74b229ce43dbe82671c Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 27 Apr 2016 08:55:52 -0400 Subject: [PATCH] Polish DefaultUrlTemplateHandler --- .../springframework/web/util/DefaultUriTemplateHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/util/DefaultUriTemplateHandler.java b/spring-web/src/main/java/org/springframework/web/util/DefaultUriTemplateHandler.java index 34f0baa550..1116df9e6b 100644 --- a/spring-web/src/main/java/org/springframework/web/util/DefaultUriTemplateHandler.java +++ b/spring-web/src/main/java/org/springframework/web/util/DefaultUriTemplateHandler.java @@ -92,14 +92,14 @@ public class DefaultUriTemplateHandler extends AbstractUriTemplateHandler { @Override - public URI expandInternal(String uriTemplate, Map uriVariables) { + protected URI expandInternal(String uriTemplate, Map uriVariables) { UriComponentsBuilder uriComponentsBuilder = initUriComponentsBuilder(uriTemplate); UriComponents uriComponents = expandAndEncode(uriComponentsBuilder, uriVariables); return createUri(uriComponents); } @Override - public URI expandInternal(String uriTemplate, Object... uriVariables) { + protected URI expandInternal(String uriTemplate, Object... uriVariables) { UriComponentsBuilder uriComponentsBuilder = initUriComponentsBuilder(uriTemplate); UriComponents uriComponents = expandAndEncode(uriComponentsBuilder, uriVariables); return createUri(uriComponents); @@ -161,6 +161,7 @@ public class DefaultUriTemplateHandler extends AbstractUriTemplateHandler { private URI createUri(UriComponents uriComponents) { try { + // Avoid further encoding (in the case of strictEncoding=true) return new URI(uriComponents.toUriString()); } catch (URISyntaxException ex) {