Merge pull request #242 from microsoftgraph/dev

2.0.7 release

Author: baywet

gradle.properties

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

readme.md

@@ -22,7 +22,7 @@ repositories {
 
 dependencies {
     // Include the sdk as a dependency
-    implementation 'com.microsoft.graph:microsoft-graph-core:2.0.6'
+    implementation 'com.microsoft.graph:microsoft-graph-core:2.0.7'
     // 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.6</version>
+    <version>2.0.7</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/BaseCollectionResponse.java

@@ -59,7 +59,7 @@ public String nextLink() {
     public final AdditionalDataManager additionalDataManager() {
         return additionalDataManager;
     }
-
+    private static final String VALUE_JSON_KEY = "value";
 	/**
      * Sets the raw JSON object
      *
@@ -69,9 +69,9 @@ public final AdditionalDataManager additionalDataManager() {
     public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
         Objects.requireNonNull(serializer, "parameter serializer cannot be null");
         Objects.requireNonNull(json, "parameter json cannot be null");
-        if (json.has("value")) {
-            final JsonArray array = json.getAsJsonArray("value");
-            for (int i = 0; i < array.size(); i++) {
+        if (json.has(VALUE_JSON_KEY) && value != null && !value.isEmpty()) {
+            final JsonArray array = json.getAsJsonArray(VALUE_JSON_KEY);
+            for (int i = 0; i < array.size() && i < value.size(); i++) {
 				final Object targetObject = value.get(i);
 				if(targetObject instanceof IJsonBackedObject && array.get(i).isJsonObject()) {
 					((IJsonBackedObject)targetObject).setRawObject(serializer, array.get(i).getAsJsonObject());

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.6";
+    public static final String VERSION = "v2.0.7";
     /**
      * Verion prefix
      */

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

@@ -33,6 +33,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
 import com.microsoft.graph.http.BaseCollectionResponse;
 import com.microsoft.graph.logger.ILogger;
 
@@ -96,6 +97,14 @@ public static <T1> BaseCollectionResponse<T1> deserialize(@Nonnull final JsonEle
                     final T1 targetObject = (T1)serializer.deserializeObject(sourceObject, entityClass);
                     ((IJsonBackedObject)targetObject).setRawObject(serializer, sourceObject);
                     list.add(targetObject);
+                } else if (sourceElement.isJsonPrimitive()) {
+                    final JsonPrimitive primitiveValue = sourceElement.getAsJsonPrimitive();
+                    if(primitiveValue.isString())
+                        list.add((T1)primitiveValue.getAsString());
+                    else if(primitiveValue.isBoolean())
+                        list.add((T1) Boolean.valueOf(primitiveValue.getAsBoolean()));
+                    else if(primitiveValue.isNumber())
+                        list.add((T1) Long.valueOf(primitiveValue.getAsLong()));
                 }
             }
             final BaseCollectionResponse<T1> response = (BaseCollectionResponse<T1>)responseClass.getConstructor().newInstance();

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

@@ -0,0 +1,7 @@
+package com.microsoft.graph.serializer;
+
+import com.microsoft.graph.http.BaseCollectionResponse;
+
+public class CollectionResponseOfBoolean extends BaseCollectionResponse<Boolean> {
+
+}

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

@@ -0,0 +1,7 @@
+package com.microsoft.graph.serializer;
+
+import com.microsoft.graph.http.BaseCollectionResponse;
+
+public class CollectionResponseOfLong extends BaseCollectionResponse<Long> {
+
+}

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

@@ -0,0 +1,41 @@
+package com.microsoft.graph.serializer;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
+
+import com.microsoft.graph.logger.ILogger;
+
+import org.junit.jupiter.api.Test;
+
+class CollectionResponseOfPrimitivesTests {
+    @Test
+    void DeserializesCollectionOfStrings() {
+        final var serializer = new DefaultSerializer(mock(ILogger.class));
+        final var serializedValue = "{\"@odata.context\": \"https://graph.microsoft.com/v1.0/$metadata#Collection(Edm.String)\",\"value\": [\"b72e90c8-3d3a-457e-8ca0-0fdde204d320\"]}";
+        final var result = serializer.deserializeObject(serializedValue, CollectionResponseOfString.class);
+        assertNotNull(result);
+        assertNotNull(result.value);
+        assertNotNull(result.additionalDataManager());
+        assertEquals("https://graph.microsoft.com/v1.0/$metadata#Collection(Edm.String)", result.additionalDataManager().get("@odata.context").getAsString());
+        assertEquals(1, result.value.size());
+    }
+    @Test
+    void DeserializesCollectionOfBooleans() {
+        final var serializer = new DefaultSerializer(mock(ILogger.class));
+        final var serializedValue = "{\"@odata.context\": \"https://graph.microsoft.com/v1.0/$metadata#Collection(Edm.Boolean)\",\"value\": [true]}";
+        final var result = serializer.deserializeObject(serializedValue, CollectionResponseOfBoolean.class);
+        assertNotNull(result);
+        assertNotNull(result.value);
+        assertEquals(1, result.value.size());
+    }
+    @Test
+    void DeserializesCollectionOfLongs() {
+        final var serializer = new DefaultSerializer(mock(ILogger.class));
+        final var serializedValue = "{\"@odata.context\": \"https://graph.microsoft.com/v1.0/$metadata#Collection(Edm.Long)\",\"value\": [42]}";
+        final var result = serializer.deserializeObject(serializedValue, CollectionResponseOfLong.class);
+        assertNotNull(result);
+        assertNotNull(result.value);
+        assertEquals(1, result.value.size());
+    }
+}

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

@@ -0,0 +1,6 @@
+package com.microsoft.graph.serializer;
+
+import com.microsoft.graph.http.BaseCollectionResponse;
+
+public class CollectionResponseOfString extends BaseCollectionResponse<String> {
+}