Fix bug where custom snapshot parser was not applied in FirebaseArrayOfObjects.java if FirebaseArray.java already had data

Signed-off-by: Alex Saveau <[email protected]>

Author: SUPERCILEX

database/src/main/java/com/firebase/ui/database/FirebaseArrayOfObjects.java

@@ -23,28 +23,26 @@ public class FirebaseArrayOfObjects<E> extends ImmutableList<E> {
      * @param snapshots  a list of {@link DataSnapshot}s to be converted to a model type
      * @param modelClass the model representation of a {@link DataSnapshot}
      */
-    protected FirebaseArrayOfObjects(List<DataSnapshot> snapshots, Class<E> modelClass) {
+    protected FirebaseArrayOfObjects(List<DataSnapshot> snapshots,
+                                     Class<E> modelClass,
+                                     SnapshotParser<E> parser) {
         mSnapshots = snapshots;
         mEClass = modelClass;
-        mParser = new SnapshotParser<E>() {
-            @Override
-            public E parseSnapshot(DataSnapshot snapshot) {
-                return snapshot.getValue(mEClass);
-            }
-        };
+        mParser = parser;
     }
 
     /**
      * @param snapshots  a list of {@link DataSnapshot}s to be converted to a model type
      * @param modelClass the model representation of a {@link DataSnapshot}
      */
     public static <T> FirebaseArrayOfObjects<T> newInstance(List<DataSnapshot> snapshots,
-                                                            Class<T> modelClass) {
-        if (snapshots instanceof FirebaseArray) {
-            return new FirebaseArrayOfObjectsOptimized<>((FirebaseArray) snapshots, modelClass);
-        } else {
-            return new FirebaseArrayOfObjects<>(snapshots, modelClass);
-        }
+                                                            final Class<T> modelClass) {
+        return getArray(snapshots, modelClass, new SnapshotParser<T>() {
+            @Override
+            public T parseSnapshot(DataSnapshot snapshot) {
+                return snapshot.getValue(modelClass);
+            }
+        });
     }
 
     /**
@@ -55,9 +53,18 @@ public static <T> FirebaseArrayOfObjects<T> newInstance(List<DataSnapshot> snaps
     public static <T> FirebaseArrayOfObjects<T> newInstance(List<DataSnapshot> snapshots,
                                                             Class<T> modelClass,
                                                             SnapshotParser<T> parser) {
-        FirebaseArrayOfObjects<T> array = newInstance(snapshots, modelClass);
-        array.mParser = parser;
-        return array;
+        return getArray(snapshots, modelClass, parser);
+    }
+
+    private static <T> FirebaseArrayOfObjects<T> getArray(List<DataSnapshot> snapshots,
+                                                          Class<T> modelClass,
+                                                          SnapshotParser<T> parser) {
+        if (snapshots instanceof FirebaseArray) {
+            return new FirebaseArrayOfObjectsOptimized<>(
+                    (FirebaseArray) snapshots, modelClass, parser);
+        } else {
+            return new FirebaseArrayOfObjects<>(snapshots, modelClass, parser);
+        }
     }
 
     public List<DataSnapshot> getSnapshots() {
@@ -173,8 +180,10 @@ protected static class FirebaseArrayOfObjectsOptimized<E> extends FirebaseArrayO
             implements ChangeEventListener {
         protected List<E> mObjects = new ArrayList<>();
 
-        public FirebaseArrayOfObjectsOptimized(FirebaseArray snapshots, Class<E> modelClass) {
-            super(snapshots, modelClass);
+        public FirebaseArrayOfObjectsOptimized(FirebaseArray snapshots,
+                                               Class<E> modelClass,
+                                               SnapshotParser<E> parser) {
+            super(snapshots, modelClass, parser);
             snapshots.addChangeEventListener(this);
         }