libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

KEYCLOAK-10796: fix build on MacOS by giving DeSerializerFunctions in the StringUtils a distinct name

Browse source
This commit is contained in:
Gregor Tudan 2019-07-08 13:37:01 +02:00 committed by Hynek Mlnařík
parent 55a6141bff
commit 334ca6e96b
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
common/src/main/java/org/keycloak/common/util/StringSerialization.java
View file

@ -14,14 +14,14 @@ import java.util.regex.Pattern;
public class StringSerialization { public class StringSerialization {
// Since there is still need to support JDK 7, we have to work without functional interfaces // Since there is still need to support JDK 7, we have to work without functional interfaces
private static enum DeSerializer { private static enum DeSerializerFunction {
OBJECT { OBJECT {
@Override public String serialize(Object o) { return o.toString(); }; @Override public String serialize(Object o) { return o.toString(); }
@Override public Object deserialize(String s) { return s; }; @Override public Object deserialize(String s) { return s; }
}, },
URI { URI {
@Override public String serialize(Object o) { return o.toString(); }; @Override public String serialize(Object o) { return o.toString(); }
@Override public Object deserialize(String s) { return java.net.URI.create(s); }; @Override public Object deserialize(String s) { return java.net.URI.create(s); }
}, },
; ;
@ -30,7 +30,7 @@ public class StringSerialization {
public abstract Object deserialize(String s); public abstract Object deserialize(String s);
} }
private static final Map<Class<?>, DeSerializer> WELL_KNOWN_DESERIALIZERS = new LinkedHashMap<>(); private static final Map<Class<?>, DeSerializerFunction> WELL_KNOWN_DESERIALIZERS = new LinkedHashMap<>();
private static final String SEPARATOR = ";"; private static final String SEPARATOR = ";";
private static final Pattern ESCAPE_PATTERN = Pattern.compile(SEPARATOR); private static final Pattern ESCAPE_PATTERN = Pattern.compile(SEPARATOR);
private static final Pattern UNESCAPE_PATTERN = Pattern.compile(SEPARATOR + SEPARATOR); private static final Pattern UNESCAPE_PATTERN = Pattern.compile(SEPARATOR + SEPARATOR);
@ -42,8 +42,8 @@ public class StringSerialization {
); );
static { static {
WELL_KNOWN_DESERIALIZERS.put(URI.class, DeSerializer.URI); WELL_KNOWN_DESERIALIZERS.put(URI.class, DeSerializerFunction.URI);
WELL_KNOWN_DESERIALIZERS.put(String.class, DeSerializer.OBJECT); WELL_KNOWN_DESERIALIZERS.put(String.class, DeSerializerFunction.OBJECT);
} }
/** /**
@ -78,12 +78,12 @@ public class StringSerialization {
} }
Class<?> c = o.getClass(); Class<?> c = o.getClass();
DeSerializer f = WELL_KNOWN_DESERIALIZERS.get(c); DeSerializerFunction f = WELL_KNOWN_DESERIALIZERS.get(c);
return "V" + (f == null ? o : f.serialize(o)); return "V" + (f == null ? o : f.serialize(o));
} }
private static <T> T getObjectFrom(String escapedString, Class<T> clazz) { private static <T> T getObjectFrom(String escapedString, Class<T> clazz) {
DeSerializer f = WELL_KNOWN_DESERIALIZERS.get(clazz); DeSerializerFunction f = WELL_KNOWN_DESERIALIZERS.get(clazz);
Object res = f == null ? escapedString : f.deserialize(escapedString); Object res = f == null ? escapedString : f.deserialize(escapedString);
return clazz.cast(res); return clazz.cast(res);
} }