Additional data populated for collections (e.g. drive items)

Author: kitherill

src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java

@@ -25,12 +25,13 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.CaseFormat;
 import com.google.gson.Gson;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.graph.logger.ILogger;
-
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -142,6 +143,21 @@ private void setChildAdditionalData(IJsonBackedObject serializedObject, JsonObje
                         }
                     }
                 }
+                // If the object is a list of Graph objects, iterate through elements
+                else if (fieldObject instanceof List && rawJson != null) {
+                    final JsonElement collectionJson = rawJson.get(field.getName());
+                    final List fieldObjectList = (List) fieldObject;
+                    if (collectionJson.isJsonArray() && ((JsonArray)collectionJson).size() == fieldObjectList.size()) {
+                        final JsonArray rawJsonArray = (JsonArray) collectionJson;
+                        for (int i = 0; i < fieldObjectList.size(); i++) {
+                            final Object element = fieldObjectList.get(i);
+                            if (element instanceof IJsonBackedObject) {
+                                final JsonElement elementRawJson = rawJsonArray.get(i);
+                                setChildAdditionalData((IJsonBackedObject) element, elementRawJson.getAsJsonObject());
+                            }
+                        }
+                    }
+                }
                 // If the object is a valid Graph object, set its additional data
                 else if (fieldObject != null && fieldObject instanceof IJsonBackedObject) {
                     IJsonBackedObject serializedChild = (IJsonBackedObject) fieldObject;