SpotifySerializer now serializes all super class fields

Author: Gruncan

src/main/java/com/spotify/objects/SpotifySerializer.java

@@ -9,9 +9,28 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 public abstract class SpotifySerializer {
 
+
+    /**
+     * Recursively gets all fields from current class to highest in hierarchy
+     */
+    private List<Field> getAllFields(Class<?> cls){
+        Class<?> supperCls = cls.getSuperclass();
+        if (supperCls == null) return new ArrayList<>();
+
+        List<Field> fields = this.getAllFields(supperCls);
+        fields.addAll(Arrays.asList(cls.getDeclaredFields()));
+
+        return fields;
+    }
+
+
     @SuppressWarnings({"unchecked", "rawtypes"})
     private <E extends Serializable> E serializer(Class<E> cls, JSONObject json) {
         try {
@@ -25,7 +44,9 @@ private <E extends Serializable> E serializer(Class<E> cls, JSONObject json) {
             boolean clsRequired = notRequiredCls != null;
 
 
-            for (Field field : cls.getDeclaredFields()) {
+            List<Field> allFields = this.getAllFields(cls);
+            for (Field field : allFields) {
+
                 SpotifyField spotifyField = field.getAnnotation(SpotifyField.class);
                 // if not field not annotated ignore
                 if (spotifyField == null) continue;