fankes/moshi
2
0
Fork 0
mirror of https://github.com/fankes/moshi.git synced 2025-12-13 02:11:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use functions in Util where possible (#1444)

Browse Source
This commit is contained in:
Jesse Wilson
2021-12-04 17:22:12 -05:00
committed by GitHub
parent 81bf3b1835
commit 75abba37ef
7 changed files with 94 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
adapters/src/main/java/com/squareup/moshi/adapters/EnumJsonAdapter.java
View File

@@ -15,7 +15,8 @@
*/
package com.squareup.moshi.adapters;
import com.squareup.moshi.Json;
import static com.squareup.moshi.internal.Util.jsonName;
import com.squareup.moshi.JsonAdapter;
import com.squareup.moshi.JsonDataException;
import com.squareup.moshi.JsonReader;
@@ -67,12 +68,7 @@ public final class EnumJsonAdapter<T extends Enum<T>> extends JsonAdapter<T> {
nameStrings = new String[constants.length];
for (int i = 0; i < constants.length; i++) {
String constantName = constants[i].name();
Json annotation = enumType.getField(constantName).getAnnotation(Json.class);
String name =
annotation != null && !Json.UNSET_NAME.equals(annotation.name())
? annotation.name()
: constantName;
nameStrings[i] = name;
nameStrings[i] = jsonName(constantName, enumType.getField(constantName));
}
options = JsonReader.Options.of(nameStrings);
} catch (NoSuchFieldException e) {