Removed DerivedClassIdentifier and related code from:

- DefaultSerializer
- CollectionResponseDeserializer
... as this is now taken care by ODataTypeParametrizedJsonBackedTypeAdapter.

Tests covering this change:
- com.microsoft.graph.serializer.DefaultSerializerTest.testDeserializationOfObjectWithODataTypeProperty
- com.microsoft.graph.serializer.ODataTypeParametrizedIJsonBackedTypedAdapterTest.testDeserializationOfNestedODataTypeAnnotatedObjects

Author: PrimosK

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

@@ -24,7 +24,6 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Type;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -112,7 +111,7 @@ public static <T1, T2 extends BaseRequestBuilder<T1>> BaseCollectionPage<T1, T2>
             final Class<?> responseClass = Class.forName(responseClassCanonicalName);
             final JsonObject responseJson = new JsonObject();
             responseJson.add("value", json);
-            final BaseCollectionResponse<T1> response = CollectionResponseSerializer.deserialize(responseJson, responseClass, logger);
+            final BaseCollectionResponse<T1> response = CollectionResponseDeserializer.deserialize(responseJson, responseClass, logger);
             /** eg: com.microsoft.graph.requests.AttachmentCollectionRequestBuilder */
             final String responseBuilderCanonicalName = responseClassCanonicalName
                         .substring(0, responseClassCanonicalName.length() - responseLength) + "RequestBuilder";

…alizer/CollectionResponseSerializer.java …izer/CollectionResponseDeserializer.javasrc/main/java/com/microsoft/graph/serializer/CollectionResponseSerializer.java renamed to src/main/java/com/microsoft/graph/serializer/CollectionResponseDeserializer.java src/main/java/com/microsoft/graph/serializer/CollectionResponseSerializer.java renamed to src/main/java/com/microsoft/graph/serializer/CollectionResponseDeserializer.java

@@ -37,13 +37,13 @@
 import com.microsoft.graph.http.BaseCollectionResponse;
 import com.microsoft.graph.logger.ILogger;
 
-/** Specialized serializer to handle collection responses */
-public class CollectionResponseSerializer {
+/** Specialized de-serializer to handle collection responses */
+public class CollectionResponseDeserializer {
     private static DefaultSerializer serializer;
     /**
      * Not available for instantiation
      */
-    private CollectionResponseSerializer() {}
+    private CollectionResponseDeserializer() {}
     /**
      * Deserializes the JsonElement
      *
@@ -83,19 +83,10 @@ public static <T1> BaseCollectionResponse<T1> deserialize(@Nonnull final JsonEle
             logger.logDebug("could not find class" + baseEntityClassCanonicalName);
         }
         try {
-            final DerivedClassIdentifier derivedClassIdentifier = new DerivedClassIdentifier(logger);
             for(JsonElement sourceElement : sourceArray) {
                 if(sourceElement.isJsonObject()) {
                     final JsonObject sourceObject = sourceElement.getAsJsonObject();
-                    Class<?> entityClass = derivedClassIdentifier.identify(sourceObject, baseEntityClass);
-                    if(entityClass == null) {
-                        if(baseEntityClass == null) {
-                            logger.logError("Could not find target class for object " + sourceObject.toString(), null);
-                            continue;
-                        } else
-                            entityClass = baseEntityClass; // it is possible the odata type is absent or we can't find the derived type (not in SDK yet)
-                    }
-                    final T1 targetObject = (T1)serializer.deserializeObject(sourceObject, entityClass);
+                    final T1 targetObject = (T1)serializer.deserializeObject(sourceObject, baseEntityClass);
                     ((IJsonBackedObject)targetObject).setRawObject(serializer, sourceObject);
                     list.add(targetObject);
                 } else if (sourceElement.isJsonPrimitive()) {

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

@@ -58,10 +58,6 @@ public class DefaultSerializer implements ISerializer {
 	 */
 	private final Gson gson;
 
-    /**
-     * Derived class identifier
-     */
-    private final DerivedClassIdentifier derivedClassIdentifier;
 
 	/**
 	 * Creates a DefaultSerializer
@@ -71,7 +67,6 @@ public class DefaultSerializer implements ISerializer {
 	public DefaultSerializer(@Nonnull final ILogger logger) {
 		this.logger = Objects.requireNonNull(logger, "parameter logger cannot be null");
 		this.gson = GsonFactory.getGsonInstance(logger);
-		this.derivedClassIdentifier = new DerivedClassIdentifier(logger);
 	}
 
 	@Override
@@ -108,16 +103,7 @@ public <T> T deserializeObject(@Nonnull final JsonElement rawElement, @Nonnull f
 		if (jsonObject instanceof IJsonBackedObject) {
 			logger.logDebug("Deserializing type " + clazz.getSimpleName());
 			final JsonObject rawObject = rawElement.isJsonObject() ? rawElement.getAsJsonObject() : null;
-
-			// If there is a derived class, try to get it and deserialize to it
-			T jo = jsonObject;
-			if (rawElement.isJsonObject()) {
-				final Class<?> derivedClass = derivedClassIdentifier.identify(rawObject, clazz);
-				if (derivedClass != null)
-					jo = (T) gson.fromJson(rawElement, derivedClass);
-			}
-
-			final IJsonBackedObject jsonBackedObject = (IJsonBackedObject) jo;
+			final IJsonBackedObject jsonBackedObject = (IJsonBackedObject) jsonObject;
 
 			if(rawElement.isJsonObject()) {
 				jsonBackedObject.setRawObject(this, rawObject);
@@ -129,7 +115,7 @@ public <T> T deserializeObject(@Nonnull final JsonElement rawElement, @Nonnull f
 				JsonElement convertedHeaders = gson.toJsonTree(responseHeaders);
 				jsonBackedObject.additionalDataManager().put(GRAPH_RESPONSE_HEADERS_KEY, convertedHeaders);
 			}
-			return jo;
+			return jsonObject;
 		} else {
 			logger.logDebug("Deserializing a non-IJsonBackedObject type " + clazz.getSimpleName());
 			return jsonObject;

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

@@ -239,7 +239,7 @@ public JsonElement serialize(final BaseCollectionPage<?, ?> src,
             public BaseCollectionResponse<?> deserialize(final JsonElement json,
                                         final Type typeOfT,
                                         final JsonDeserializationContext context) throws JsonParseException {
-                return CollectionResponseSerializer.deserialize(json, typeOfT, logger);
+                return CollectionResponseDeserializer.deserialize(json, typeOfT, logger);
             }
         };
 

src/test/java/com/microsoft/graph/models/TestIJsonBackedObject.java

@@ -11,14 +11,22 @@
 
 public abstract class TestIJsonBackedObject implements IJsonBackedObject {
 
+    AdditionalDataManager additionalDataManager = mock(AdditionalDataManager.class);
+
+    String rawObject;
+
     @Override
     public void setRawObject(@NotNull ISerializer serializer, @NotNull JsonObject json) {
-        // Do nothing
+        this.rawObject = json.toString();
     }
 
     @Nullable
     @Override
     public AdditionalDataManager additionalDataManager() {
-        return mock(AdditionalDataManager.class);
+        return additionalDataManager;
+    }
+
+    public String getRawObject() {
+        return rawObject;
     }
 }

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

@@ -0,0 +1,36 @@
+package com.microsoft.graph.serializer;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.models.ReactionStub;
+import com.microsoft.graph.models.SubReactionStub1;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+
+public class DefaultSerializerTest {
+
+    final ILogger logger = mock(ILogger.class);
+    Gson gson = GsonFactory.getGsonInstance(logger);
+    DefaultSerializer defaultSerializer = new DefaultSerializer(logger);
+
+    @Test
+    public void testDeserializationOfObjectWithODataTypeProperty() {
+        // Given
+        final String testJsonResponse =
+            "{\"@odata.type\": \"#microsoft.graph.subReactionStub1\"}";
+
+        // When
+        ReactionStub reaction = defaultSerializer.deserializeObject(testJsonResponse, ReactionStub.class);
+
+        // Then
+        assertTrue(reaction instanceof SubReactionStub1);
+        assertEquals("{\"@odata.type\":\"#microsoft.graph.subReactionStub1\"}", reaction.getRawObject());
+        Mockito.verify(reaction.additionalDataManager()).setAdditionalData(gson.fromJson(testJsonResponse, JsonElement.class).getAsJsonObject());
+    }
+
+}