Merge pull request #471 from microsoftgraph/bugfix/additional-properties-chidprop

- fixes a bug where additional properties would not be attached at the right level

Author: baywet

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

@@ -196,9 +196,10 @@ public <T> String serializeObject(final T serializableObject) {
                 if(outJson.has(field.getName())) {
                     final Type[] interfaces = field.getType().getGenericInterfaces();
                     for(Type interfaceType : interfaces) {
-                        if(interfaceType == IJsonBackedObject.class) {
+                        if(interfaceType == IJsonBackedObject.class && outJson.get(field.getName()).isJsonObject()) {
                             try {
-                                outJsonTree = getDataFromAdditionalDataManager(outJsonTree, field.get(serializableObject));
+                                final JsonElement outdatedValue = outJson.remove(field.getName());
+                                outJson.add(field.getName(), getDataFromAdditionalDataManager(outdatedValue.getAsJsonObject(), field.get(serializableObject)));
                             } catch (IllegalAccessException ex ) {
                                 logger.logDebug("Couldn't access prop" + field.getName());
                             }

src/test/java/com/microsoft/graph/serializer/AdditionalDataTests.java

@@ -3,14 +3,19 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
 
+import okhttp3.Request;
+
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonPrimitive;
+import com.microsoft.graph.functional.TestBase;
+import com.microsoft.graph.http.HttpMethod;
 import com.microsoft.graph.logger.DefaultLogger;
 import com.microsoft.graph.models.extensions.Drive;
 import com.microsoft.graph.models.extensions.DriveItemCreateUploadSessionBody;
@@ -66,7 +71,7 @@ public void testPropsAdditionalDataOnNonIJSONObjects() {
 		final DriveItemCreateUploadSessionBody body = new DriveItemCreateUploadSessionBody();
 		body.item = upProps;
 		String serializedObject = serializer.serializeObject(body);
-		assertEquals("{\"item\":{\"name\":\"vacation.gif\"},\"@microsoft.graph.conflictBehavior\":\"rename\"}", serializedObject);
+		assertEquals("{\"item\":{\"name\":\"vacation.gif\",\"@microsoft.graph.conflictBehavior\":\"rename\"}}", serializedObject);
 	}
 
 	@Test