Merge pull request #259 from microsoftgraph/dev

release 2.0.8

Author: baywet

.github/CODEOWNERS

@@ -1 +1 @@
-* @baywet @ddyett @MichaelMainer @nikithauc @zengin 
+* @baywet @ddyett @MichaelMainer @nikithauc @zengin @ramsessanchez

android/build.gradle

@@ -23,13 +23,13 @@ apply plugin: "com.android.library"
 apply plugin: "com.github.ben-manes.versions"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         versionCode 1
         versionName "1.0"
         minSdkVersion 26
-        targetSdkVersion 30
+        targetSdkVersion 31
     }
 
     buildTypes {

gradle.properties

@@ -25,7 +25,7 @@ mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph-core
 mavenMajorVersion    = 2
 mavenMinorVersion    = 0
-mavenPatchVersion    = 7
+mavenPatchVersion    = 8
 mavenArtifactSuffix = 
 
 #These values are used to run functional tests

gradle/dependencies.gradle

@@ -2,12 +2,12 @@ dependencies {
     // Use JUnit test framework
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
-    testImplementation 'org.mockito:mockito-inline:3.11.1'
+    testImplementation 'org.mockito:mockito-inline:3.11.2'
 
     api 'com.squareup.okhttp3:okhttp:4.9.1'
 
     implementation 'com.google.guava:guava:30.1.1-jre'
 
     implementation 'com.google.code.gson:gson:2.8.7'
-    api 'com.azure:azure-core:1.17.0'
+    api 'com.azure:azure-core:1.18.0'
 }

pom.xml

@@ -8,7 +8,7 @@
 
     <groupId>com.microsoft.graph</groupId>
     <artifactId>microsoft-graph-core</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.8</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-core</artifactId>
-            <version>1.17.0</version>
+            <version>1.18.0</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -46,8 +46,8 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>
-            <version>3.11.1</version>
+            <version>3.11.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>

readme.md

@@ -22,7 +22,7 @@ repositories {
 
 dependencies {
     // Include the sdk as a dependency
-    implementation 'com.microsoft.graph:microsoft-graph-core:2.0.7'
+    implementation 'com.microsoft.graph:microsoft-graph-core:2.0.8'
     // This dependency is only needed if you are using the TokenCrendentialAuthProvider
     implementation 'com.azure:azure-identity:1.3.1'
 }
@@ -37,7 +37,7 @@ Add the dependency in `dependencies` in pom.xml
     <!-- Include the sdk as a dependency -->
     <groupId>com.microsoft.graph</groupId>
     <artifactId>microsoft-graph-core</artifactId>
-    <version>2.0.7</version>
+    <version>2.0.8</version>
     <!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>

src/main/java/com/microsoft/graph/http/CoreHttpProvider.java

@@ -296,7 +296,15 @@ public <Result, Body> Request getHttpRequest(@Nonnull final IHttpRequest request
 			}
 		} else {
 			logger.logDebug("Sending " + serializable.getClass().getName() + " as request body");
-			final String serializeObject = serializer.serializeObject(serializable);
+
+			String serializeObject = null;
+
+			if ("text/plain".equals(contenttype) && serializable instanceof String) {
+				serializeObject = (String)serializable;
+			} else {
+				serializeObject = serializer.serializeObject(serializable);
+			}
+
             if(serializeObject == null) {
                 throw new ClientException("Error during serialization of request body, the result was null", null);
             }

src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java

@@ -24,7 +24,7 @@ public class TelemetryHandler implements Interceptor{
     /**
      * Current SDK version
      */
-    public static final String VERSION = "v2.0.7";
+    public static final String VERSION = "v2.0.8";
     /**
      * Verion prefix
      */

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
      *
@@ -86,15 +86,7 @@ public static <T1> BaseCollectionResponse<T1> deserialize(@Nonnull final JsonEle
             for(JsonElement sourceElement : sourceArray) {
                 if(sourceElement.isJsonObject()) {
                     final JsonObject sourceObject = sourceElement.getAsJsonObject();
-                    Class<?> entityClass = serializer.getDerivedClass(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()) {