Update genres and fix incorrect parsing of enums with delimiter in name

rubengees · rubengees · commit a9203aba9e3b · 2018-09-22T17:09:53.000+02:00
diff --git a/library/src/main/java/me/proxer/library/api/DelimitedEnumSetAdapterFactory.java b/library/src/main/java/me/proxer/library/api/DelimitedEnumSetAdapterFactory.java
@@ -20,9 +20,9 @@
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
 /**
@@ -60,14 +60,42 @@ private static class DelimitedEnumSetAdapter<T extends Enum<T>> extends JsonAdap
         private final Class<T> enumType;
         private final String delimiter;
 
+        private final T[] enumConstants;
+        private final String[] enumNames;
+        private final T fallbackEnum;
+
         DelimitedEnumSetAdapter(final Class<T> enumType, final String delimiter) {
             this.enumType = enumType;
             this.delimiter = delimiter;
+
+            this.enumConstants = enumType.getEnumConstants();
+            this.enumNames = new String[this.enumConstants.length];
+
+            for (int i = 0; i < this.enumConstants.length; i++) {
+                final T constant = this.enumConstants[i];
+
+                try {
+                    final Json annotation = enumType.getField(constant.name()).getAnnotation(Json.class);
+                    final String name = annotation != null ? annotation.name() : constant.name();
+
+                    this.enumNames[i] = name.toLowerCase(Locale.US);
+                } catch (NoSuchFieldException e) {
+                    throw new AssertionError("Missing field in " + enumType.getName(), e);
+                }
+            }
+
+            final FallbackEnum fallbackAnnotation = enumType.getAnnotation(FallbackEnum.class);
+
+            if (fallbackAnnotation != null) {
+                fallbackEnum = Enum.valueOf(enumType, fallbackAnnotation.name());
+            } else {
+                fallbackEnum = null;
+            }
         }
 
         @Override
         public Set<T> fromJson(final JsonReader reader) throws IOException {
-            final List<String> parts = parseParts(reader);
+            final String parts = parseParts(reader);
 
             return convertToEnumConstants(reader, parts);
         }
@@ -92,7 +120,7 @@ public void toJson(final JsonWriter writer, @Nullable final Set<T> value) throws
             writer.value(result.toString());
         }
 
-        private List<String> parseParts(final JsonReader reader) throws IOException {
+        private String parseParts(final JsonReader reader) throws IOException {
             final JsonReader.Token nextToken = reader.peek();
 
             if (nextToken == JsonReader.Token.BEGIN_ARRAY) {
@@ -106,57 +134,70 @@ private List<String> parseParts(final JsonReader reader) throws IOException {
 
                 reader.endArray();
 
-                return result;
+                return ProxerUtils.join(delimiter, result);
             } else if (nextToken == JsonReader.Token.NULL) {
                 reader.nextNull();
 
-                return Collections.emptyList();
+                return "";
             } else {
-                final String value = reader.nextString();
-
-                if (value.isEmpty()) {
-                    return Collections.emptyList();
-                } else {
-                    return Arrays.asList(value.split(delimiter));
-                }
+                return reader.nextString();
             }
         }
 
-        private Set<T> convertToEnumConstants(final JsonReader reader, final List<String> parts) {
+        private Set<T> convertToEnumConstants(final JsonReader reader, final String parts) {
             final EnumSet<T> result = EnumSet.noneOf(enumType);
 
-            for (final String part : parts) {
-                final T[] constants = enumType.getEnumConstants();
-                final String[] nameStrings = new String[constants.length];
-                T value = null;
+            String currentParts = parts.toLowerCase(Locale.US);
 
-                try {
-                    for (int i = 0; i < constants.length; i++) {
-                        final T constant = constants[i];
-                        final Json annotation = enumType.getField(constant.name()).getAnnotation(Json.class);
-                        final String name = annotation != null ? annotation.name() : constant.name();
-                        nameStrings[i] = name;
-
-                        if (name.equalsIgnoreCase(part)) {
-                            value = constant;
+            while (currentParts.length() > 0) {
+                boolean found = false;
+
+                for (int i = 0; i < enumNames.length; i++) {
+                    final String name = enumNames[i];
+
+                    if (currentParts.startsWith(name)) {
+                        final boolean isLast = currentParts.length() == name.length();
+                        final boolean matches = isLast || currentParts.startsWith(delimiter, name.length());
+
+                        if (matches) {
+                            result.add(enumConstants[i]);
+
+                            if (isLast) {
+                                currentParts = "";
+                            } else {
+                                currentParts = currentParts.substring(name.length() + delimiter.length());
+                            }
+
+                            found = true;
+                            break;
                         }
                     }
-                } catch (NoSuchFieldException e) {
-                    throw new AssertionError("Missing field in " + enumType.getName(), e);
                 }
 
-                if (value == null) {
-                    final FallbackEnum fallbackAnnotation = enumType.getAnnotation(FallbackEnum.class);
+                if (!found) {
+                    final int nextDelimiter = currentParts.indexOf(delimiter);
+
+                    if (fallbackEnum != null) {
+                        result.add(fallbackEnum);
 
-                    if (fallbackAnnotation != null) {
-                        value = Enum.valueOf(enumType, fallbackAnnotation.name());
+                        if (nextDelimiter >= 0 && currentParts.length() > nextDelimiter + delimiter.length()) {
+                            currentParts = currentParts.substring(nextDelimiter + delimiter.length());
+                        } else {
+                            currentParts = "";
+                        }
                     } else {
-                        throw new JsonDataException("Expected one of " + Arrays.asList(nameStrings)
+                        final String part;
+
+                        if (nextDelimiter >= 0) {
+                            part = currentParts.substring(0, nextDelimiter);
+                        } else {
+                            part = currentParts;
+                        }
+
+                        throw new JsonDataException("Expected one of " + Arrays.asList(enumNames)
                                 + " but was " + part + " at path " + reader.getPath());
                     }
                 }
-
-                result.add(value);
             }
 
             return result;
diff --git a/library/src/main/java/me/proxer/library/enums/Genre.java b/library/src/main/java/me/proxer/library/enums/Genre.java
@@ -10,9 +10,9 @@
  */
 @FallbackEnum(name = "UNKNOWN")
 public enum Genre {
-    @Json(name = "Abenteuer") ADVENTURE,
     @Json(name = "Action") ACTION,
     @Json(name = "Adult") ADULT,
+    @Json(name = "Adventure") ADVENTURE,
     @Json(name = "Comedy") COMEDY,
     @Json(name = "Cyberpunk") CYBERPUNK,
     @Json(name = "Drama") DRAMA,
@@ -39,13 +39,13 @@ public enum Genre {
     @Json(name = "Shoujou-Ai") SHOUJOU_AI,
     @Json(name = "Shounen") SHOUNEN,
     @Json(name = "Shounen-Ai") SHOUNEN_AI,
-    @Json(name = "Slice_of_Life") SLICE_OF_LIFE,
+    @Json(name = "Slice of Life") SLICE_OF_LIFE,
     @Json(name = "Smut") SMUT,
     @Json(name = "Splatter") SPLATTER,
     @Json(name = "Sport") SPORT,
+    @Json(name = "Steampunk") STEAMPUNK,
     @Json(name = "Supernatural") SUPERNATURAL,
     @Json(name = "Superpower") SUPERPOWER,
-    @Json(name = "Vampire") VAMPIRE,
     @Json(name = "Violence") VIOLENCE,
     @Json(name = "Yaoi") YAOI,
     @Json(name = "Yuri") YURI,
diff --git a/library/src/test/java/me/proxer/library/api/DelimitedEnumSetAdapterFactoryTest.java b/library/src/test/java/me/proxer/library/api/DelimitedEnumSetAdapterFactoryTest.java
@@ -79,7 +79,7 @@ public void testCreateNoParameterType() {
     @Test
     public void testFromJsonSingle() throws IOException {
         final GenresTestClass result = moshi.adapter(GenresTestClass.class)
-                .fromJson("{\"genres\":\"Abenteuer\"}");
+                .fromJson("{\"genres\":\"Adventure\"}");
 
         assertThat(result).isNotNull();
         assertThat(result.genres).containsExactly(Genre.ADVENTURE);
@@ -88,16 +88,16 @@ public void testFromJsonSingle() throws IOException {
     @Test
     public void testFromJsonMultiple() throws IOException {
         final GenresTestClass result = moshi.adapter(GenresTestClass.class)
-                .fromJson("{\"genres\":\"Abenteuer Action\"}");
+                .fromJson("{\"genres\":\"Adventure Action\"}");
 
         assertThat(result).isNotNull();
-        assertThat(result.genres).containsExactly(Genre.ADVENTURE, Genre.ACTION);
+        assertThat(result.genres).containsExactly(Genre.ACTION, Genre.ADVENTURE);
     }
 
     @Test
     public void testFromJsonInvalidDelimiter() throws IOException {
         final GenresTestClass result = moshi.adapter(GenresTestClass.class)
-                .fromJson("{\"genres\":\"Abenteuer;Action\"}");
+                .fromJson("{\"genres\":\"Action;Adventure\"}");
 
         assertThat(result).isNotNull();
         assertThat(result.genres).containsExactly(Genre.UNKNOWN);
@@ -154,7 +154,7 @@ public void testToJsonMultiple() {
         final GenresTestClass testSubject = new GenresTestClass(EnumSet.of(Genre.ADVENTURE, Genre.ACTION));
         final String result = moshi.adapter(GenresTestClass.class).toJson(testSubject);
 
-        assertThat(result).isEqualTo("{\"genres\":\"Abenteuer Action\"}");
+        assertThat(result).isEqualTo("{\"genres\":\"Action Adventure\"}");
     }
 
     @Value
diff --git a/library/src/test/java/me/proxer/library/api/EnumRetrofitConverterFactoryTest.java b/library/src/test/java/me/proxer/library/api/EnumRetrofitConverterFactoryTest.java
@@ -40,6 +40,6 @@ public void testCreateNoEnum() {
     @Test
     public void testConvert() throws IOException {
         assertThat(((Converter<Enum<?>, String>) factory.stringConverter(Genre.class, new Annotation[0], retrofit))
-                .convert(Genre.ADVENTURE)).isEqualTo("Abenteuer");
+                .convert(Genre.ADVENTURE)).isEqualTo("Adventure");
     }
 }
diff --git a/library/src/test/java/me/proxer/library/util/ProxerUtilsTest.java b/library/src/test/java/me/proxer/library/util/ProxerUtilsTest.java
@@ -60,8 +60,8 @@ public void testJoinEmpty() {
 
     @Test
     public void testJoinEnums() {
-        assertThat(ProxerUtils.joinEnums(";", EnumSet.of(Genre.ADVENTURE, Genre.ACTION, Genre.DRAMA)))
-                .isEqualTo("Abenteuer;Action;Drama");
+        assertThat(ProxerUtils.joinEnums(";", EnumSet.of(Genre.ACTION, Genre.ADVENTURE, Genre.SLICE_OF_LIFE)))
+                .isEqualTo("Action;Adventure;Slice of Life");
     }
 
     @Test
diff --git a/library/src/test/resources/calendar.json b/library/src/test/resources/calendar.json
@@ -13,7 +13,7 @@
       "weekday": "sat",
       "uptime": "1518266091",
       "entryname": "Time Bokan: Gyakushuu no San Akunin",
-      "genre": "Abenteuer Comedy Mecha",
+      "genre": "Adventure Comedy Mecha",
       "rate_sum": "7",
       "rate_count": "2",
       "industryname": null
diff --git a/library/src/test/resources/entry.json b/library/src/test/resources/entry.json
@@ -4,7 +4,7 @@
   "data": {
     "id": "6174",
     "name": "LuCu LuCu",
-    "genre": "Comedy Fantasy Seinen Slice_of_Life",
+    "genre": "Comedy Fantasy Seinen Slice of Life",
     "fsk": "",
     "description": "Humans are a despicable lot, committing sin after sin, filling the endless boundaries of the underworld with tortured souls. Now, it would seem, Hell isn't so endless after all, and it has become dangerously close to filling, and then overflowing into the human realm. Princess Lucuha sees this imminent disaster and has a plan: save Hell by making humans decent again. Of course, the angels can't simply allow demons to roam freely on Earth, and they do their best to stop Lucu and her dastardly plans.",
     "medium": "mangaseries",
diff --git a/library/src/test/resources/entry_core.json b/library/src/test/resources/entry_core.json
@@ -4,7 +4,7 @@
   "data": {
     "id": "6174",
     "name": "LuCu LuCu",
-    "genre": "Comedy Fantasy Seinen Slice_of_Life",
+    "genre": "Comedy Fantasy Seinen Slice of Life",
     "fsk": "bad_language",
     "description": "Humans are a despicable lot, committing sin after sin, filling the endless boundaries of the underworld with tortured souls. Now, it would seem, Hell isn't so endless after all, and it has become dangerously close to filling, and then overflowing into the human realm. Princess Lucuha sees this imminent disaster and has a plan: save Hell by making humans decent again. Of course, the angels can't simply allow demons to roam freely on Earth, and they do their best to stop Lucu and her dastardly plans.",
     "medium": "mangaseries",
diff --git a/library/src/test/resources/industry_project_list.json b/library/src/test/resources/industry_project_list.json
@@ -28,7 +28,7 @@
       "id": "5653",
       "name": "1-en no Otoko",
       "fsk": "fsk18 sex",
-      "genre": "Comedy Drama Romance Slice_of_Life Yaoi",
+      "genre": "Comedy Drama Romance Slice of Life Yaoi",
       "medium": "mangaseries",
       "state": "1",
       "rate_sum": "169",
@@ -50,7 +50,7 @@
       "id": "6627",
       "name": "A Channel",
       "fsk": "fsk6",
-      "genre": "Comedy Seinen Slice_of_Life",
+      "genre": "Comedy Seinen Slice of Life",
       "medium": "mangaseries",
       "state": "2",
       "rate_sum": "63",
@@ -116,7 +116,7 @@
       "id": "13635",
       "name": "Anne Happy♪",
       "fsk": "",
-      "genre": "Comedy School Seinen Slice_of_Life",
+      "genre": "Comedy School Seinen Slice of Life",
       "medium": "mangaseries",
       "state": "2",
       "rate_sum": "0",
diff --git a/library/src/test/resources/media_list_entry.json b/library/src/test/resources/media_list_entry.json
@@ -16,7 +16,7 @@
     {
       "name": ".hack//G.U. Returner",
       "id": "1412",
-      "genre": "Abenteuer SciFi",
+      "genre": "Adventure SciFi",
       "medium": "ova",
       "count": "1",
       "state": "1",
@@ -27,7 +27,7 @@
     {
       "name": ".hack//G.U. Trilogy",
       "id": "292",
-      "genre": "Abenteuer Action Drama SciFi",
+      "genre": "Adventure Action Drama SciFi",
       "medium": "movie",
       "count": "1",
       "state": "1",
@@ -49,7 +49,7 @@
     {
       "name": ".hack//LIMINALITY",
       "id": "295",
-      "genre": "Abenteuer Drama Mystery SciFi",
+      "genre": "Adventure Drama Mystery SciFi",
       "medium": "ova",
       "count": "4",
       "state": "1",
@@ -71,7 +71,7 @@
     {
       "name": ".hack//Roots",
       "id": "296",
-      "genre": "Abenteuer Action Drama Romance SciFi",
+      "genre": "Adventure Action Drama Romance SciFi",
       "medium": "animeseries",
       "count": "26",
       "state": "1",
@@ -82,7 +82,7 @@
     {
       "name": ".hack//Sekai no Mukou ni",
       "id": "4642",
-      "genre": "Abenteuer Action Fantasy Mystery SciFi",
+      "genre": "Adventure Action Fantasy Mystery SciFi",
       "medium": "movie",
       "count": "1",
       "state": "1",
@@ -93,7 +93,7 @@
     {
       "name": ".hack//SIGN",
       "id": "1148",
-      "genre": "Abenteuer Drama Magic Mystery Psychological SciFi",
+      "genre": "Adventure Drama Magic Mystery Psychological SciFi",
       "medium": "animeseries",
       "count": "26",
       "state": "1",
diff --git a/library/src/test/resources/relations.json b/library/src/test/resources/relations.json
@@ -23,7 +23,7 @@
     {
       "id": "4167",
       "name": "Sword Art Online",
-      "genre": "Abenteuer Action Comedy Drama Fantasy Romance SciFi",
+      "genre": "Adventure Action Comedy Drama Fantasy Romance SciFi",
       "fsk": "fsk12 bad_language violence",
       "description": "Kazuto Kirigaya testet als einer der ersten einen neuen Hightech-Helm, welcher die Psyche des Nutzers komplett in die Welt des MMORPGs „Sword Art Online“ transferiert. Als Tester der Beta-Version besitzt er bereits einiges an Erfahrung und kämpfte sich mehr als erfolgreich als „Kirito“ durch die ersten Ebenen der Fantasy-Welt. Doch schon kurz nach der Eröffnung SAOs merken die Spieler, dass etwas nicht stimmt: Im Menü gibt es keinen Logout-Button. Hinter dem Grund der allgemeinen aufkommenden Panik scheint der Administrator des Spiels zu stecken und die einzige Möglichkeit wieder in die reale Welt zurückzukehren besteht darin, SAO erfolgreich abzuschließen. Doch das ist leichter gesagt als getan, denn der Tod in der Fantasy-Welt bedeutet auch den richtigen Tod in der richtigen Welt.",
       "medium": "animeseries",
diff --git a/library/src/test/resources/translator_group_project_list.json b/library/src/test/resources/translator_group_project_list.json

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,6 @@ public void testCreateNoEnum() {`
`40`	`40`	`@Test`
`41`	`41`	`public void testConvert() throws IOException {`
`42`	`42`	`assertThat(((Converter<Enum<?>, String>) factory.stringConverter(Genre.class, new Annotation[0], retrofit))`
`43`		`- .convert(Genre.ADVENTURE)).isEqualTo("Abenteuer");`
	`43`	`+ .convert(Genre.ADVENTURE)).isEqualTo("Adventure");`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,8 @@ public void testJoinEmpty() {`
`60`	`60`
`61`	`61`	`@Test`
`62`	`62`	`public void testJoinEnums() {`
`63`		`- assertThat(ProxerUtils.joinEnums(";", EnumSet.of(Genre.ADVENTURE, Genre.ACTION, Genre.DRAMA)))`
`64`		`- .isEqualTo("Abenteuer;Action;Drama");`
	`63`	`+ assertThat(ProxerUtils.joinEnums(";", EnumSet.of(Genre.ACTION, Genre.ADVENTURE, Genre.SLICE_OF_LIFE)))`
	`64`	`+ .isEqualTo("Action;Adventure;Slice of Life");`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`@Test`