fankes/moshi
2
0
Fork 0
mirror of https://github.com/fankes/moshi.git synced 2025-10-19 16:09:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor missing/null properties to helper utils instead (#900)

Browse Source 
* Create missing property and unexpected null templates

* Fix rebase conflicts
This commit is contained in:
Zac Sweers
2019-09-08 17:36:58 -04:00
committed by GitHub
parent 329d0e14b0
commit 619be26e95
2 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
moshi/src/main/java/com/squareup/moshi/internal/Util.java
View File

@@ -17,7 +17,9 @@ package com.squareup.moshi.internal;
import com.squareup.moshi.JsonAdapter;
import com.squareup.moshi.JsonClass;
import com.squareup.moshi.JsonDataException;
import com.squareup.moshi.JsonQualifier;
import com.squareup.moshi.JsonReader;
import com.squareup.moshi.Moshi;
import com.squareup.moshi.Types;
import java.lang.annotation.Annotation;
@@ -42,6 +44,8 @@ import static com.squareup.moshi.Types.subtypeOf;
import static com.squareup.moshi.Types.supertypeOf;
public final class Util {
private static final String REQUIRED_PROPERTY_TEMPLATE = "Required property '%s' missing at %s";
private static final String UNEXPECTED_NULL_TEMPLATE = "Non-null value '%s' was null at %s";
public static final Set<Annotation> NO_ANNOTATIONS = Collections.emptySet();
public static final Type[] EMPTY_TYPE_ARRAY = new Type[] {};
@Nullable private static final Class<?> DEFAULT_CONSTRUCTOR_MARKER;
@@ -619,4 +623,18 @@ public final class Util {
}
return mask;
}
public static JsonDataException missingProperty(String property, JsonReader reader) {
return jsonDataException(REQUIRED_PROPERTY_TEMPLATE, property, reader);
}
public static JsonDataException unexpectedNull(String property, JsonReader reader) {
return jsonDataException(UNEXPECTED_NULL_TEMPLATE, property, reader);
}
private static JsonDataException jsonDataException(
String template, String property, JsonReader reader) {
return new JsonDataException(
String.format(template, property, reader.getPath()));
}
}