2.2.4 - bugfix ResourceLink needs to encode uri

Signed-off-by: Silvio Wangler <71073+saw303@users.noreply.github.com>
emazzotta · Jun 17, 2020 · 35814d6 · 35814d6
1 parent 31f6ce2
commit 35814d6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -27,7 +27,7 @@ buildscript {
 
 subprojects {
 
-  version = "2.2.3"
+  version = "2.2.4"
 
   apply from: "${rootDir}/gradle/java.gradle"
   apply from: "${rootDir}/gradle/groovy.gradle"

diff --git a/gradle-plugin/src/main/groovy/ch/silviowangler/gradle/restapi/RestApiPlugin.groovy b/gradle-plugin/src/main/groovy/ch/silviowangler/gradle/restapi/RestApiPlugin.groovy
@@ -95,7 +95,7 @@ class RestApiPlugin implements Plugin<Project> {
 		}
 
 		final String springVersion = "5.2.4.RELEASE"
-		final String pluginVersion = "2.2.3"
+		final String pluginVersion = "2.2.4"
 		final String libPhoneNumberVersion = "8.11.5"
 
 		project.afterEvaluate {

diff --git a/rest-model/src/main/java/ch/silviowangler/rest/model/ResourceLink.java b/rest-model/src/main/java/ch/silviowangler/rest/model/ResourceLink.java
@@ -24,7 +24,10 @@
 package ch.silviowangler.rest.model;
 
 import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -104,6 +107,11 @@ public static ResourceLink selfLink(String uri) {
   }
 
   public static ResourceLink relLink(String rel, String uri) {
-    return new ResourceLink(rel, "GET", URI.create(uri));
+    try {
+      return new ResourceLink(
+          rel, "GET", URI.create(URLEncoder.encode(uri, StandardCharsets.UTF_8.toString())));
+    } catch (UnsupportedEncodingException e) {
+      return new ResourceLink(rel, "GET", URI.create(uri));
+    }
   }
 }