Merge pull request #236 from microsoftgraph/dev

baywet · web-flow · commit 7ecd612a170e · 2021-06-14T15:07:17.000-04:00
release 2.0.5
diff --git a/.github/workflows/api-level-lint.yml b/.github/workflows/api-level-lint.yml
@@ -1,6 +1,7 @@
 name: "Checks the SDK only using APIs from the targeted API level"
 
-on: 
+on:
+  workflow_dispatch:
   push:
     branches:
       - dev
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -1,6 +1,7 @@
 name: "CodeQL"
 
 on:
+  workflow_dispatch:
   push:
     branches: [dev, master]
   pull_request:
diff --git a/.github/workflows/conflicting-pr-label.yml b/.github/workflows/conflicting-pr-label.yml
@@ -5,6 +5,7 @@ name: PullRequestConflicting
 # Controls when the action will run. Triggers the workflow on push or pull request
 # events but only for the master branch
 on:
+  workflow_dispatch:
   push:
     branches: [ master, dev ]
   pull_request:
diff --git a/.github/workflows/sample-build-check.yml b/.github/workflows/sample-build-check.yml
@@ -1,6 +1,7 @@
 name: "samples build check"
 
 on:
+  workflow_dispatch:
   push:
     paths:
       - '**/*.java'
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -1,5 +1,6 @@
 name: Static analysis with SonarCloud
 on:
+  workflow_dispatch:
   push:
     branches:
       - master
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ plugins {
     id 'signing'
     id 'jacoco'
     id 'com.github.spotbugs' version '4.7.1'
-    id "org.sonarqube" version "3.2.0"
+    id "org.sonarqube" version "3.3"
 }
 
 java {
@@ -91,8 +91,8 @@ def pomConfig = {
 
 sonarqube {
   properties {
-    property "sonar.projectKey", "msgraph-sdk-java-core"
-    property "sonar.organization", "microsoftgraph"
+    property "sonar.projectKey", "microsoftgraph_msgraph-sdk-java-core"
+    property "sonar.organization", "microsoftgraph2"
     property "sonar.host.url", "https://sonarcloud.io"
   }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -25,7 +25,7 @@ mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph-core
 mavenMajorVersion    = 2
 mavenMinorVersion    = 0
-mavenPatchVersion    = 4
+mavenPatchVersion    = 5
 mavenArtifactSuffix = 
 
 #These values are used to run functional tests
diff --git a/gradle/dependencies.gradle b/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.10.0'
+    testImplementation 'org.mockito:mockito-inline:3.11.1'
     
     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.16.0'
+    api 'com.azure:azure-core:1.17.0'
 }
diff --git a/pom.xml b/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-core</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>
-            <version>3.10.0</version>
+            <version>3.11.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/readme.md b/readme.md
@@ -22,9 +22,9 @@ repositories {
 
 dependencies {
     // Include the sdk as a dependency
-    implementation 'com.microsoft.graph:microsoft-graph-core:2.0.4'
+    implementation 'com.microsoft.graph:microsoft-graph-core:2.0.5'
     // This dependency is only needed if you are using the TokenCrendentialAuthProvider
-    implementation 'com.azure:azure-identity:1.2.5'
+    implementation 'com.azure:azure-identity:1.3.1'
 }
 ```
 
@@ -37,11 +37,11 @@ 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.4</version>
+    <version>2.0.5</version>
     <!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.2.5</version>
+    <version>1.3.1</version>
 </dependency>
 ```
 
diff --git a/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java b/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java
@@ -25,7 +25,7 @@ public class TelemetryHandler implements Interceptor{
     /**
      * Current SDK version
      */
-    public static final String VERSION = "v2.0.4";
+    public static final String VERSION = "v2.0.5";
     /**
      * Verion prefix
      */
diff --git a/src/main/java/com/microsoft/graph/serializer/AdditionalDataManager.java b/src/main/java/com/microsoft/graph/serializer/AdditionalDataManager.java
@@ -1,16 +1,16 @@
 // ------------------------------------------------------------------------------
 // Copyright (c) 2017 Microsoft Corporation
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -38,12 +38,12 @@
 public class AdditionalDataManager extends HashMap<String, JsonElement> {
 
     private static final long serialVersionUID = 8641634955796941429L;
-    
+
     private final transient IJsonBackedObject jsonBackedObject;
 
     /**
      * Instanciates a new additional data manager from the json backed object
-     * 
+     *
      * @param jsonBackedObject the object to read values from
      */
     public AdditionalDataManager(@Nullable final IJsonBackedObject jsonBackedObject) {
@@ -56,15 +56,15 @@ public AdditionalDataManager(@Nullable final IJsonBackedObject jsonBackedObject)
      *
      * @param json the raw JSON to set as additionalData
      */
-    final void setAdditionalData(JsonObject json) {
+    final void setAdditionalData(final JsonObject json) {
         // Get the names of all the fields on this object's hierarchy
-        Set<String> objectFields = getFields();
+        final Set<String> objectFields = getFields();
 
         // Get the keys on this JSON
-        Set<String> jsonKeys = getJsonKeys(json);
+        final Set<String> jsonKeys = getJsonKeys(json);
 
         // Get all keys present in JSON and *NOT* present in fields
-        Set<String> additionalDataKeys = new HashSet<>(jsonKeys);
+        final Set<String> additionalDataKeys = new HashSet<>(jsonKeys);
         additionalDataKeys.removeAll(objectFields);
 
         // set the additionalData
@@ -73,23 +73,25 @@ final void setAdditionalData(JsonObject json) {
         }
     }
 
-    private Set<String> getJsonKeys(JsonObject json) {
-        Set<String> keys = new HashSet<>();
-        Set<Map.Entry<String, JsonElement>> entries = json.entrySet();
+    private Set<String> getJsonKeys(final JsonObject json) {
+        final Set<String> keys = new HashSet<>();
+        final Set<Map.Entry<String, JsonElement>> entries = json.entrySet();
         for (Map.Entry<String, JsonElement> entry : entries) {
             keys.add(entry.getKey());
         }
         return keys;
     }
 
     private Set<String> getFields() {
-        Field[] fields = jsonBackedObject.getClass().getFields();
-        Set<String> serializingFields = new HashSet<>();
-        for (Field field : fields) {
-            SerializedName serializedName;
-            if (null != (serializedName = field.getAnnotation(SerializedName.class))
-                    && null != field.getAnnotation(Expose.class)) {
-                serializingFields.add(serializedName.value());
+        final Set<String> serializingFields = new HashSet<>();
+        if(jsonBackedObject != null ) {
+            final Field[] fields = jsonBackedObject.getClass().getFields();
+            for (Field field : fields) {
+                final SerializedName serializedName = field.getAnnotation(SerializedName.class);
+                if (null != serializedName
+                        && null != field.getAnnotation(Expose.class)) {
+                    serializingFields.add(serializedName.value());
+                }
             }
         }
         return serializingFields;
diff --git a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
@@ -223,109 +223,74 @@ else if (fieldObject instanceof IJsonBackedObject) {
 	public <T> String serializeObject(@Nonnull final T serializableObject) {
         Objects.requireNonNull(serializableObject, "parameter serializableObject cannot be null");
         logger.logDebug("Serializing type " + serializableObject.getClass().getSimpleName());
-		JsonElement outJsonTree = gson.toJsonTree(serializableObject);
-
-		if (serializableObject instanceof IJsonBackedObject) {
-			outJsonTree = getDataFromAdditionalDataManager(outJsonTree, serializableObject);
-		} else if (outJsonTree.isJsonObject()) {
-			final Field[] fields = serializableObject.getClass().getDeclaredFields();
-			JsonObject outJson = outJsonTree.getAsJsonObject();
-			for(Field field : fields) {
-				if(outJson.has(field.getName())) {
-					final Type[] interfaces = field.getType().getGenericInterfaces();
-					for(Type interfaceType : interfaces) {
-						if(interfaceType == IJsonBackedObject.class && outJson.get(field.getName()).isJsonObject()) {
-							try {
-								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());
-							}
-							break;
-						}
-					}
-				}
-			}
-		}
-
-		return outJsonTree.toString();
-	}
-	private <T> JsonElement getDataFromAdditionalDataManager(JsonElement outJsonTree, final T serializableObject) {
-		final IJsonBackedObject serializableJsonObject = (IJsonBackedObject) serializableObject;
-		final AdditionalDataManager additionalData = serializableJsonObject.additionalDataManager();
-
-		// If the item is a valid Graph object, add its additional data
-		if (outJsonTree.isJsonObject()) {
-			final JsonObject outJson = outJsonTree.getAsJsonObject();
-
-			addAdditionalDataFromManagerToJson(additionalData, outJson);
-			getChildAdditionalData(serializableJsonObject, outJson);
-
-			return outJson;
-		} else {
-			return outJsonTree;
+		final JsonElement outJsonTree = gson.toJsonTree(serializableObject);
+		if(outJsonTree != null) {
+            getChildAdditionalData(serializableObject, outJsonTree);
+			return outJsonTree.toString();
 		}
+        return "";
 	}
-
 	/**
 	 * Recursively populates additional data for each child object
 	 *
 	 * @param serializableObject the child to get additional data for
 	 * @param outJson			the serialized output JSON to add to
 	 */
 	@SuppressWarnings("unchecked")
-	private void getChildAdditionalData(final IJsonBackedObject serializableObject, final JsonObject outJson) {
-		if(outJson == null)
-			return;
-		// Use reflection to iterate through fields for eligible Graph children
-		for (java.lang.reflect.Field field : serializableObject.getClass().getFields()) {
-			try {
-				final Object fieldObject = field.get(serializableObject);
-				final JsonElement fieldJsonElement = outJson.get(field.getName());
-				if(fieldObject == null || fieldJsonElement == null)
-					continue;
-
-				// If the object is a HashMap, iterate through its children
-				if (fieldObject instanceof Map && fieldJsonElement.isJsonObject()) {
-					final Map<String, Object> serializableChildren = (Map<String, Object>) fieldObject;
-					final Iterator<Entry<String, Object>> it = serializableChildren.entrySet().iterator();
-					final JsonObject fieldJsonObject = fieldJsonElement.getAsJsonObject();
-
-					while (it.hasNext()) {
-						final Map.Entry<String, Object> pair = (Map.Entry<String, Object>)it.next();
-						final Object child = pair.getValue();
-						final JsonElement childJsonElement = fieldJsonObject.get(pair.getKey().toString());
-						// If the item is a valid Graph object, add its additional data
-						addAdditionalDataFromJsonElementToJson(child, childJsonElement);
-					}
-				}
-				// If the object is a list of Graph objects, iterate through elements
-				else if (fieldObject instanceof List && fieldJsonElement.isJsonArray()) {
-					final JsonArray fieldArrayValue = fieldJsonElement.getAsJsonArray();
-					final List<?> fieldObjectList = (List<?>) fieldObject;
-					for (int index = 0; index < fieldObjectList.size(); index++) {
-						final Object item = fieldObjectList.get(index);
-						final JsonElement itemJsonElement = fieldArrayValue.get(index);
-						addAdditionalDataFromJsonElementToJson(item, itemJsonElement);
-					}
-				}
-				// If the object is a valid Graph object, add its additional data
-				addAdditionalDataFromJsonElementToJson(fieldObject, fieldJsonElement);
-			} catch (IllegalArgumentException | IllegalAccessException e) {
-				logger.logError("Unable to access child fields of " + serializableObject.getClass().getSimpleName(), e);
-			}
-		}
-	}
+    private void getChildAdditionalData(final Object serializableObject, final JsonElement outJson) {
+        if(outJson == null || serializableObject == null || !outJson.isJsonObject())
+            return;
+        final JsonObject outJsonObject = outJson.getAsJsonObject();
+        // Use reflection to iterate through fields for eligible Graph children
+        for (java.lang.reflect.Field field : serializableObject.getClass().getFields()) {
+            try {
+                final Object fieldObject = field.get(serializableObject);
+                final JsonElement fieldJsonElement = outJsonObject.get(field.getName());
+                if(fieldObject == null || fieldJsonElement == null)
+                    continue;
+
+                // If the object is a HashMap, iterate through its children
+                if (fieldObject instanceof Map && fieldJsonElement.isJsonObject()) {
+                    final Map<String, Object> serializableChildren = (Map<String, Object>) fieldObject;
+                    final Iterator<Entry<String, Object>> it = serializableChildren.entrySet().iterator();
+                    final JsonObject fieldJsonObject = fieldJsonElement.getAsJsonObject();
+
+                    while (it.hasNext()) {
+                        final Map.Entry<String, Object> pair = (Map.Entry<String, Object>)it.next();
+                        final Object child = pair.getValue();
+                        final JsonElement childJsonElement = fieldJsonObject.get(pair.getKey().toString());
+                        // If the item is a valid Graph object, add its additional data
+                        getChildAdditionalData(child, childJsonElement);
+                    }
+                }
+                // If the object is a list of Graph objects, iterate through elements
+                else if (fieldObject instanceof List && fieldJsonElement.isJsonArray()) {
+                    final JsonArray fieldArrayValue = fieldJsonElement.getAsJsonArray();
+                    final List<?> fieldObjectList = (List<?>) fieldObject;
+                    for (int index = 0; index < fieldObjectList.size(); index++) {
+                        final Object item = fieldObjectList.get(index);
+                        final JsonElement itemJsonElement = fieldArrayValue.get(index);
+                        getChildAdditionalData(item, itemJsonElement);
+                    }
+                } else if(fieldJsonElement.isJsonObject()) {
+                    // If the object is a valid Graph object, add its additional data
+                    final JsonObject fieldJsonObject = fieldJsonElement.getAsJsonObject();
+                    addAdditionalDataFromJsonObjectToJson(fieldObject, fieldJsonObject);
+                }
+            } catch (IllegalArgumentException | IllegalAccessException e) {
+                logger.logError("Unable to access child fields of " + serializableObject.getClass().getSimpleName(), e);
+            }
+        }
+    }
 
 	/**
 	 * Add each non-transient additional data property to the given JSON node
 	 *
 	 * @param item the object containing additional data
-	 * @param itemJsonElement	   the JSON node to add the additional data properties to
+	 * @param itemJsonObject	   the JSON node to add the additional data properties to
 	 */
-	private void addAdditionalDataFromJsonElementToJson (final Object item, final JsonElement itemJsonElement) {
-		if (item instanceof IJsonBackedObject && itemJsonElement.isJsonObject()) {
-			final JsonObject itemJsonObject = itemJsonElement.getAsJsonObject();
+	private void addAdditionalDataFromJsonObjectToJson (final Object item, final JsonObject itemJsonObject) {
+		if (item instanceof IJsonBackedObject && itemJsonObject != null) {
 			final IJsonBackedObject serializableItem = (IJsonBackedObject) item;
 			final AdditionalDataManager itemAdditionalData = serializableItem.additionalDataManager();
 			addAdditionalDataFromManagerToJson(itemAdditionalData, itemJsonObject);
diff --git a/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java b/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java
diff --git a/src/test/java/com/microsoft/graph/content/BatchRequestTestBody.java b/src/test/java/com/microsoft/graph/content/BatchRequestTestBody.java

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ plugins {`
`15`	`15`	`id 'signing'`
`16`	`16`	`id 'jacoco'`
`17`	`17`	`id 'com.github.spotbugs' version '4.7.1'`
`18`		`- id "org.sonarqube" version "3.2.0"`
	`18`	`+ id "org.sonarqube" version "3.3"`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`java {`
`@@ -91,8 +91,8 @@ def pomConfig = {`
`91`	`91`
`92`	`92`	`sonarqube {`
`93`	`93`	`properties {`
`94`		`- property "sonar.projectKey", "msgraph-sdk-java-core"`
`95`		`- property "sonar.organization", "microsoftgraph"`
	`94`	`+ property "sonar.projectKey", "microsoftgraph_msgraph-sdk-java-core"`
	`95`	`+ property "sonar.organization", "microsoftgraph2"`
`96`	`96`	`property "sonar.host.url", "https://sonarcloud.io"`
`97`	`97`	`}`
`98`	`98`	`}`