Spring/spring-hateoas
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#724 - Make sure EncodingUtils compiles on both Spring 4.3 and 5.

Browse Source 
We now catch Throwable instead of UnsupportedEncodingException as in Spring 5, the methods on UriUtils don't throw the latter anymore.
This commit is contained in:
Oliver Gierke
2018-06-20 19:33:27 +02:00
parent 80d13ed80e
commit ddcf01adf1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/springframework/hateoas/core/EncodingUtils.java
View File

@@ -17,7 +17,7 @@ package org.springframework.hateoas.core;
import lombok.experimental.UtilityClass;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import org.springframework.util.Assert;
import org.springframework.web.util.UriUtils;
@@ -32,7 +32,7 @@ import org.springframework.web.util.UriUtils;
@UtilityClass
public class EncodingUtils {
private static final String ENCODING = "UTF-8";
private static final String ENCODING = StandardCharsets.UTF_8.name();
/**
* Encodes the given path value.
@@ -46,7 +46,7 @@ public class EncodingUtils {
try {
return UriUtils.encodePath(source.toString(), ENCODING);
} catch (UnsupportedEncodingException o_O) {
} catch (Throwable o_O) {
throw new IllegalStateException(o_O);
}
}
@@ -63,7 +63,7 @@ public class EncodingUtils {
try {
return UriUtils.encodeQueryParam(source.toString(), ENCODING);
} catch (UnsupportedEncodingException o_O) {
} catch (Throwable o_O) {
throw new IllegalStateException(o_O);
}
}
@@ -80,7 +80,7 @@ public class EncodingUtils {
try {
return UriUtils.encodeFragment(source.toString(), ENCODING);
} catch (UnsupportedEncodingException o_O) {
} catch (Throwable o_O) {
throw new IllegalStateException(o_O);
}
}