From 5aa131a259571a19497c0bba48f7030b16f682a8 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Tue, 8 Jan 2019 22:43:42 -0500 Subject: [PATCH] Correction for commit #c6e500 Issue: SPR-17630 --- .../org/springframework/web/util/UriComponentsBuilder.java | 2 +- .../springframework/web/util/UriComponentsBuilderTests.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java index 8658710b46..49e2f78080 100644 --- a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java +++ b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java @@ -458,7 +458,7 @@ public class UriComponentsBuilder implements UriBuilder, Cloneable { */ public String toUriString() { return this.uriVariables.isEmpty() ? - encode().build().toUriString() : + build().encode().toUriString() : buildInternal(EncodingHint.ENCODE_TEMPLATE).toUriString(); } diff --git a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java index 4d41aefe85..b44f6a3148 100644 --- a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java @@ -919,4 +919,9 @@ public class UriComponentsBuilderTests { assertEquals("http://localhost:8081/{path}?sort={sort}&sort=another_value", uri); } + @Test // SPR-17630 + public void toUriStringWithCurlyBraces() { + assertEquals("/path?q=%7Basa%7Dasa", + UriComponentsBuilder.fromUriString("/path?q={asa}asa").toUriString()); + } }