zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

compile fixes Java 10 methods

Browse source
This commit is contained in:
anhefti 2019-06-06 09:20:09 +02:00
parent 9e34312ef3
commit 920a497ef0
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java
View file

@ -8,6 +8,7 @@
package ch.ethz.seb.sebserver.gbl.util; package ch.ethz.seb.sebserver.gbl.util;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
@ -27,6 +28,8 @@ import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
@ -35,6 +38,8 @@ import ch.ethz.seb.sebserver.gbl.Constants;
public final class Utils { public final class Utils {
private static final Logger log = LoggerFactory.getLogger(Utils.class);
/** This Collector can be used within stream collect to get one expected singleton element from /** This Collector can be used within stream collect to get one expected singleton element from
* the given Stream. * the given Stream.
* This first collects the given Stream to a list and then check if there is one expected element. * This first collects the given Stream to a list and then check if there is one expected element.
@ -211,7 +216,12 @@ public final class Utils {
return value; return value;
} }
return URLEncoder.encode(value, StandardCharsets.UTF_8); try {
return URLEncoder.encode(value, StandardCharsets.UTF_8.name());
} catch (final UnsupportedEncodingException e) {
log.error("Failed to encode FormURL_UTF_8 for: {}", value, e);
return value;
}
} }
public static final String decodeFormURL_UTF_8(final String value) { public static final String decodeFormURL_UTF_8(final String value) {
@ -219,11 +229,16 @@ public final class Utils {
return value; return value;
} }
return URLDecoder.decode( try {
(value.indexOf('+') >= 0) return URLDecoder.decode(
? value.replaceAll("\\+", "%2b") (value.indexOf('+') >= 0)
: value, ? value.replaceAll("\\+", "%2b")
StandardCharsets.UTF_8); : value,
StandardCharsets.UTF_8.name());
} catch (final UnsupportedEncodingException e) {
log.error("Failed to decode FormURL_UTF_8 for: {}", value, e);
return value;
}
} }
public static void clearCharArray(final char[] array) { public static void clearCharArray(final char[] array) {