eliminate double escaping in UriPage (fixes gooddata#428)

ostumpf · ostumpf · commit fe95cf589f31 · 2017-03-14T13:18:52.000+01:00
diff --git a/src/main/java/com/gooddata/collections/UriPage.java b/src/main/java/com/gooddata/collections/UriPage.java
@@ -7,7 +7,9 @@
 
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
+import org.springframework.web.util.UriUtils;
 
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.util.List;
 import java.util.Map.Entry;
@@ -27,7 +29,11 @@ class UriPage implements Page {
      * @param pageUri page URI
      */
     public UriPage(final String pageUri) {
-        this.pageUri = UriComponentsBuilder.fromUriString(notNull(pageUri, "pageUri")).build();
+        try {
+            this.pageUri = UriComponentsBuilder.fromUriString(UriUtils.decode(notNull(pageUri, "pageUri"), "UTF-8")).build();
+        } catch (final UnsupportedEncodingException e) {
+            throw new IllegalStateException(e);
+        }
     }
 
     /**
diff --git a/src/test/java/com/gooddata/collections/UriPageTest.java b/src/test/java/com/gooddata/collections/UriPageTest.java
@@ -63,4 +63,10 @@ public void testIdempotency() throws Exception {
         assertThat(components.getQueryParams(), hasEntry("offset", singletonList("god")));
         assertThat(components.getQueryParams(), hasEntry("limit", singletonList("10")));
     }
+
+    @Test
+    public void testEncoding() throws Exception {
+        final UriPage uri = new UriPage("uri?test=foo%20bar");
+        assertThat(uri.getPageUri(null).toString(), is("uri?test=foo%20bar"));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -63,4 +63,10 @@ public void testIdempotency() throws Exception {`
`63`	`63`	`assertThat(components.getQueryParams(), hasEntry("offset", singletonList("god")));`
`64`	`64`	`assertThat(components.getQueryParams(), hasEntry("limit", singletonList("10")));`
`65`	`65`	`}`
	`66`	`+`
	`67`	`+ @Test`
	`68`	`+ public void testEncoding() throws Exception {`
	`69`	`+ final UriPage uri = new UriPage("uri?test=foo%20bar");`
	`70`	`+ assertThat(uri.getPageUri(null).toString(), is("uri?test=foo%20bar"));`
	`71`	`+ }`
`66`	`72`	`}`