Skip to content

Reject non-standard Number classes during POJO serialization (RTDB) #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
schmidt-sebastian merged 2 commits into from
Mar 18, 2019
Merged

Reject non-standard Number classes during POJO serialization (RTDB) #262

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3935297
Reject non-standard Number classes during POJO serialization
schmidt-sebastian Mar 16, 2019
e0e7449
Removing string concatenation where unnecessary
schmidt-sebastian Mar 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 14 additions & 19 deletions src/main/java/com/google/firebase/database/utilities/encoding/CustomClassMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,20 +123,20 @@ private static <T> Object serialize(T obj) {
return ((Number) obj).longValue();
}
return doubleValue;
} else if (obj instanceof Short) {
throw new DatabaseException("Shorts are not supported, please use int or long");
} else if (obj instanceof Byte) {
throw new DatabaseException("Bytes are not supported, please use int or long");
} else {
// Long, Integer
} else if (obj instanceof Long || obj instanceof Integer) {
return obj;
} else {
throw new DatabaseException(
String.format(
"Numbers of type %s are not supported, please use an int, long, float or double",
obj.getClass().getSimpleName()));
}
} else if (obj instanceof String) {
return obj;
} else if (obj instanceof Boolean) {
return obj;
} else if (obj instanceof Character) {
throw new DatabaseException("Characters are not supported, please strings");
throw new DatabaseException("Characters are not supported, please use Strings");
} else if (obj instanceof Map) {
Map<String, Object> result = new HashMap<>();
for (Map.Entry<Object, Object> entry : ((Map<Object, Object>) obj).entrySet()) {
Expand All @@ -159,11 +159,11 @@ private static <T> Object serialize(T obj) {
return result;
} else {
throw new DatabaseException(
"Serializing Collections is not supported, " + "please use Lists instead");
"Serializing Collections is not supported, please use Lists instead");
}
} else if (obj.getClass().isArray()) {
throw new DatabaseException(
"Serializing Arrays is not supported, please use Lists " + "instead");
"Serializing Arrays is not supported, please use Lists instead");
} else if (obj instanceof Enum) {
return ((Enum<?>) obj).name();
} else {
Expand All @@ -185,7 +185,7 @@ private static <T> T deserializeToType(Object obj, Type type) {
throw new DatabaseException("Generic wildcard types are not supported");
} else if (type instanceof GenericArrayType) {
throw new DatabaseException(
"Generic Arrays are not supported, please use Lists " + "instead");
"Generic Arrays are not supported, please use Lists instead");
} else {
throw new IllegalStateException("Unknown type encountered: " + type);
}
Expand All @@ -204,7 +204,7 @@ private static <T> T deserializeToClass(Object obj, Class<T> clazz) {
return (T) convertString(obj);
} else if (clazz.isArray()) {
throw new DatabaseException(
"Converting to Arrays is not supported, please use Lists" + "instead");
"Converting to Arrays is not supported, please use Lists instead");
} else if (clazz.getTypeParameters().length > 0) {
throw new DatabaseException(
"Class "
Expand Down Expand Up @@ -282,14 +282,9 @@ private static <T> T deserializeToPrimitive(Object obj, Class<T> clazz) {
return (T) convertLong(obj);
} else if (Float.class.isAssignableFrom(clazz) || float.class.isAssignableFrom(clazz)) {
return (T) (Float) convertDouble(obj).floatValue();
} else if (Short.class.isAssignableFrom(clazz) || short.class.isAssignableFrom(clazz)) {
throw new DatabaseException("Deserializing to shorts is not supported");
} else if (Byte.class.isAssignableFrom(clazz) || byte.class.isAssignableFrom(clazz)) {
throw new DatabaseException("Deserializing to bytes is not supported");
} else if (Character.class.isAssignableFrom(clazz) || char.class.isAssignableFrom(clazz)) {
throw new DatabaseException("Deserializing to char is not supported");
} else {
throw new IllegalArgumentException("Unknown primitive type: " + clazz);
throw new DatabaseException(
String.format("Deserializing values to %s is not supported", clazz.getSimpleName()));
}
}

Expand Down Expand Up @@ -716,7 +711,7 @@ public T deserialize(Map<String, Object> values, Map<TypeVariable<Class<T>>, Typ
Method setter = this.setters.get(propertyName);
Type[] params = setter.getGenericParameterTypes();
if (params.length != 1) {
throw new IllegalStateException("Setter does not have exactly one " + "parameter");
throw new IllegalStateException("Setter does not have exactly one parameter");
}
Type resolvedType = resolveType(params[0], types);
Object value = CustomClassMapper.deserializeToType(entry.getValue(), resolvedType);
Expand Down